[GitHub] [tomcat] michael-o commented on a diff in pull request #631: Bug 66665: Provide option to supply role mapping from a properties file
michael-o commented on code in PR #631:
URL: https://github.com/apache/tomcat/pull/631#discussion_r1246201219
##
java/org/apache/catalina/core/PropertiesRoleMappingListener.java:
##
@@ -0,0 +1,165 @@
+/*
+ * 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.catalina.core;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Map.Entry;
+import java.util.Objects;
+import java.util.Properties;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.Lifecycle;
+import org.apache.catalina.LifecycleEvent;
+import org.apache.catalina.LifecycleListener;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.res.StringManager;
+
+/**
+ * Implementation of {@code LifecycleListener} that will populate the
context's role mapping from a properties file.
+ *
+ * This listener must only be nested within {@link Context} elements.
+ *
+ * The keys represent application roles (e.g., admin, user, uservisor, etc.)
while the values represent technical roles
+ * (e.g., DNs, SIDs, UUIDs, etc.). A key can also be prefixed if, e.g., the
properties file contains generic
+ * application configuration as well: {@code app-roles.}.
+ *
+ * Note: The default value for the {@code roleMappingFile} is {@code
webapp:/WEB-INF/role-mapping.properties}.
+ */
+public class PropertiesRoleMappingListener implements LifecycleListener {
+
+private static final String WEBAPP_RESOURCE_PREFIX = "webapp:";
+private static final String CLASSPATH_RESOURCE_PREFIX = "classpath:";
+
Review Comment:
Great, then I will proceed with the merge and start working on the draft.
--
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-native] branch main updated: Bug 66666: Remove non-reachable functions from ssl.c
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
The following commit(s) were added to refs/heads/main by this push:
new 2e865ff87 Bug 6: Remove non-reachable functions from ssl.c
2e865ff87 is described below
commit 2e865ff8788b3c738170713771ba5a2ec0e2e364
Author: Michael Osipov
AuthorDate: Fri Jun 23 11:09:58 2023 +0200
Bug 6: Remove non-reachable functions from ssl.c
---
native/include/ssl_private.h | 1 -
native/src/ssl.c | 156 +-
native/src/sslutils.c | 27 +--
xdocs/miscellaneous/changelog.xml | 3 +
4 files changed, 8 insertions(+), 179 deletions(-)
diff --git a/native/include/ssl_private.h b/native/include/ssl_private.h
index 242ab4dd4..6c5c9d297 100644
--- a/native/include/ssl_private.h
+++ b/native/include/ssl_private.h
@@ -232,7 +232,6 @@ typedef struct tcn_ssl_ctxt_t tcn_ssl_ctxt_t;
typedef struct {
charpassword[SSL_MAX_PASSWORD_LEN];
const char *prompt;
-tcn_callback_t cb;
} tcn_pass_cb_t;
extern tcn_pass_cb_t tcn_password_callback;
diff --git a/native/src/ssl.c b/native/src/ssl.c
index 53ae4b4a9..a1ab58fa0 100644
--- a/native/src/ssl.c
+++ b/native/src/ssl.c
@@ -45,8 +45,7 @@ static jclass stringClass;
/*
* supported_ssl_opts is a bitmask that contains all supported SSL_OP_*
- * options at compile-time. This is used in hasOp to determine which
- * SSL_OP_* options are available at runtime.
+ * options at compile-time.
*
* Note that at least up through OpenSSL 0.9.8o, checking SSL_OP_ALL will
* return JNI_FALSE because SSL_OP_ALL is a mask that covers all bug
@@ -301,13 +300,6 @@ static apr_status_t ssl_init_cleanup(void *data)
return APR_SUCCESS;
ssl_initialized = 0;
-if (tcn_password_callback.cb.obj) {
-JNIEnv *env;
-tcn_get_java_env(&env);
-TCN_UNLOAD_CLASS(env,
- tcn_password_callback.cb.obj);
-}
-
free_bio_methods();
free_dh_params();
@@ -600,37 +592,6 @@ TCN_IMPLEMENT_CALL(jint, SSL, initialize)(TCN_STDARGS,
jstring engine)
return (jint)APR_SUCCESS;
}
-TCN_IMPLEMENT_CALL(jboolean, SSL, randLoad)(TCN_STDARGS, jstring file)
-{
-TCN_ALLOC_CSTRING(file);
-int r;
-UNREFERENCED(o);
-r = SSL_rand_seed(J2S(file));
-TCN_FREE_CSTRING(file);
-return r ? JNI_TRUE : JNI_FALSE;
-}
-
-TCN_IMPLEMENT_CALL(jboolean, SSL, randSave)(TCN_STDARGS, jstring file)
-{
-TCN_ALLOC_CSTRING(file);
-int r;
-UNREFERENCED(o);
-r = ssl_rand_save_file(J2S(file));
-TCN_FREE_CSTRING(file);
-return r ? JNI_TRUE : JNI_FALSE;
-}
-
-TCN_IMPLEMENT_CALL(jboolean, SSL, randMake)(TCN_STDARGS, jstring file,
-jint length, jboolean base64)
-{
-TCN_ALLOC_CSTRING(file);
-int r;
-UNREFERENCED(o);
-r = ssl_rand_make(J2S(file), length, base64);
-TCN_FREE_CSTRING(file);
-return r ? JNI_TRUE : JNI_FALSE;
-}
-
TCN_IMPLEMENT_CALL(void, SSL, randSet)(TCN_STDARGS, jstring file)
{
TCN_ALLOC_CSTRING(file);
@@ -894,96 +855,6 @@ static BIO_METHOD *BIO_jbs()
return jbs_methods;
}
-TCN_IMPLEMENT_CALL(jlong, SSL, newBIO)(TCN_STDARGS, jlong pool,
- jobject callback)
-{
-BIO *bio = NULL;
-BIO_JAVA *j;
-jclass cls;
-
-UNREFERENCED(o);
-
-if ((bio = BIO_new(BIO_jbs())) == NULL) {
-tcn_ThrowException(e, "Create BIO failed");
-goto init_failed;
-}
-j = (BIO_JAVA *)BIO_get_data(bio);
-if (j == NULL) {
-tcn_ThrowException(e, "Create BIO failed");
-goto init_failed;
-}
-j->pool = J2P(pool, apr_pool_t *);
-if (j->pool) {
-apr_pool_cleanup_register(j->pool, (const void *)bio,
- generic_bio_cleanup,
- apr_pool_cleanup_null);
-}
-
-cls = (*e)->GetObjectClass(e, callback);
-j->cb.mid[0] = (*e)->GetMethodID(e, cls, "write", "([B)I");
-j->cb.mid[1] = (*e)->GetMethodID(e, cls, "read", "([B)I");
-j->cb.mid[2] = (*e)->GetMethodID(e, cls, "puts", "(Ljava/lang/String;)I");
-j->cb.mid[3] = (*e)->GetMethodID(e, cls, "gets", "(I)Ljava/lang/String;");
-/* TODO: Check if method id's are valid */
-j->cb.obj= (*e)->NewGlobalRef(e, callback);
-
-BIO_set_init(bio, 1);
-BIO_set_flags(bio, SSL_BIO_FLAG_CALLBACK);
-return P2J(bio);
-init_failed:
-return 0;
-}
-
-TCN_IMPLEMENT_CALL(jint, SSL, closeBIO)(TCN_STDARGS, jlong bio)
-{
-BIO *b = J2P(bio, BIO *);
-UNREFERENCED_STDARGS;
-SSL_BIO_close(b);
-return APR_SUCCESS;
-}
-
-TCN_IMPLEMENT_CALL(void, SSL, setPasswordCallback)(TCN_STDARGS,
- jobject callback)
-{
-jclass cls;
-
-UNREFERENCED(o);
-if (tcn_password_callback.cb.obj) {
-
[GitHub] [tomcat-native] asfgit merged pull request #19: Bug 66666: Remove non-reachable functions from ssl.c
asfgit merged PR #19: URL: https://github.com/apache/tomcat-native/pull/19 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 66666] Remove non-reachable functions from ssl.c
https://bz.apache.org/bugzilla/show_bug.cgi?id=6 Michael Osipov changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #9 from Michael Osipov --- Fixed in: - main for 2.0.5 and onwards -- 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] 01/02: Add BZ issue ID
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git commit ecca27f193585ff7b4bd17a1739fa0d59138b02c Author: Michael Osipov AuthorDate: Thu Jun 29 11:22:38 2023 +0200 Add BZ issue ID --- webapps/docs/changelog.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 537749e57a..dd909b6b1a 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -108,7 +108,8 @@ -Add org.apache.catalina.core.ContextNamingInfoListener, +59232: Add +org.apache.catalina.core.ContextNamingInfoListener, a listener which creates context naming information environment entries. (michaelo) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated (d1f0c34b18 -> c8adc4c486)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git from d1f0c34b18 Pull up as default method since it avoids API compatibility issues new ecca27f193 Add BZ issue ID new c8adc4c486 Bug 5: Provide option to supply role mapping from a properties file 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: .../apache/catalina/core/LocalStrings.properties | 7 + .../core/PropertiesRoleMappingListener.java| 168 + .../core/TestPropertiesRoleMappingListener.java| 168 + .../com/example/prefixed-role-mapping.properties | 2 + .../classes/com/example/role-mapping.properties| 2 + .../WEB-INF/prefixed-role-mapping.properties | 2 + .../WEB-INF/role-mapping.properties| 2 + test/webapp-role-mapping/admin | 1 + test/webapp-role-mapping/unmapped | 1 + test/webapp-role-mapping/user | 1 + webapps/docs/changelog.xml | 9 +- webapps/docs/config/listeners.xml | 31 12 files changed, 393 insertions(+), 1 deletion(-) create mode 100644 java/org/apache/catalina/core/PropertiesRoleMappingListener.java create mode 100644 test/org/apache/catalina/core/TestPropertiesRoleMappingListener.java create mode 100644 test/webapp-role-mapping/WEB-INF/classes/com/example/prefixed-role-mapping.properties create mode 100644 test/webapp-role-mapping/WEB-INF/classes/com/example/role-mapping.properties create mode 100644 test/webapp-role-mapping/WEB-INF/prefixed-role-mapping.properties create mode 100644 test/webapp-role-mapping/WEB-INF/role-mapping.properties create mode 100644 test/webapp-role-mapping/admin create mode 100644 test/webapp-role-mapping/unmapped create mode 100644 test/webapp-role-mapping/user - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Bug 66665: Provide option to supply role mapping from a properties file
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit c8adc4c4869f432b900606ae52a89e54c324f3dd
Author: Michael Osipov
AuthorDate: Fri Jun 23 15:07:25 2023 +0200
Bug 5: Provide option to supply role mapping from a properties file
---
.../apache/catalina/core/LocalStrings.properties | 7 +
.../core/PropertiesRoleMappingListener.java| 168 +
.../core/TestPropertiesRoleMappingListener.java| 168 +
.../com/example/prefixed-role-mapping.properties | 2 +
.../classes/com/example/role-mapping.properties| 2 +
.../WEB-INF/prefixed-role-mapping.properties | 2 +
.../WEB-INF/role-mapping.properties| 2 +
test/webapp-role-mapping/admin | 1 +
test/webapp-role-mapping/unmapped | 1 +
test/webapp-role-mapping/user | 1 +
webapps/docs/changelog.xml | 6 +
webapps/docs/config/listeners.xml | 31
12 files changed, 391 insertions(+)
diff --git a/java/org/apache/catalina/core/LocalStrings.properties
b/java/org/apache/catalina/core/LocalStrings.properties
index 66e5067aac..aa6e810ba7 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -164,6 +164,13 @@ noPluggabilityServletContext.notAllowed=Section 4.4 of the
Servlet 3.0 specifica
pushBuilder.noPath=It is illegal to call push() before setting a path
+propertiesRoleMappingListener.roleMappingFileNull=Role mapping file cannot be
null
+propertiesRoleMappingListener.roleMappingFileEmpty=Role mapping file cannot be
empty
+propertiesRoleMappingListener.roleMappingFileNotFound=Role mapping file [{0}]
not found
+propertiesRoleMappingListener.roleMappingFileFail=Failed to load role mapping
file [{0}]
+propertiesRoleMappingListener.linkedRole=Successfully linked application role
[{0}] to technical role [{1}]
+propertiesRoleMappingListener.linkedRoleCount=Linked [{0}] application roles
to technical roles
+
standardContext.applicationListener=Error configuring application listener of
class [{0}]
standardContext.applicationSkipped=Skipped installing application listeners
due to previous error(s)
standardContext.backgroundProcess.instanceManager=Exception processing
instance manager [{0}] background process
diff --git a/java/org/apache/catalina/core/PropertiesRoleMappingListener.java
b/java/org/apache/catalina/core/PropertiesRoleMappingListener.java
new file mode 100644
index 00..60b135d27f
--- /dev/null
+++ b/java/org/apache/catalina/core/PropertiesRoleMappingListener.java
@@ -0,0 +1,168 @@
+/*
+ * 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.catalina.core;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Map.Entry;
+import java.util.Objects;
+import java.util.Properties;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.Lifecycle;
+import org.apache.catalina.LifecycleEvent;
+import org.apache.catalina.LifecycleListener;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.file.ConfigFileLoader;
+import org.apache.tomcat.util.res.StringManager;
+
+/**
+ * Implementation of {@code LifecycleListener} that will populate the
context's role mapping from a properties file.
+ *
+ * This listener must only be nested within {@link Context} elements.
+ *
+ * The keys represent application roles (e.g., admin, user, uservisor, etc.)
while the values represent technical roles
+ * (e.g., DNs, SIDs, UUIDs, etc.). A key can also be prefixed if, e.g., the
properties file contains generic
+ * application configuration as well: {@code app-roles.}.
+ *
+ * Note: The default value for the {@code roleMappingFile} is {@code
webapp:/WEB-INF/role-mapping.properties}.
+ */
+public class PropertiesRoleMappingListener implements LifecycleListener {
+
+private static final String WEBAPP_PROTOCOL = "webapp:";
+
+private static final Log log =
LogFacto
[tomcat] 02/02: Bug 66665: Provide option to supply role mapping from a properties file
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 6cb448a3f2ac4d936a01098fb032f32cac9960e4
Author: Michael Osipov
AuthorDate: Fri Jun 23 15:07:25 2023 +0200
Bug 5: Provide option to supply role mapping from a properties file
---
.../apache/catalina/core/LocalStrings.properties | 7 +
.../core/PropertiesRoleMappingListener.java| 168 +
.../core/TestPropertiesRoleMappingListener.java| 168 +
.../com/example/prefixed-role-mapping.properties | 2 +
.../classes/com/example/role-mapping.properties| 2 +
.../WEB-INF/prefixed-role-mapping.properties | 2 +
.../WEB-INF/role-mapping.properties| 2 +
test/webapp-role-mapping/admin | 1 +
test/webapp-role-mapping/unmapped | 1 +
test/webapp-role-mapping/user | 1 +
webapps/docs/changelog.xml | 6 +
webapps/docs/config/listeners.xml | 31
12 files changed, 391 insertions(+)
diff --git a/java/org/apache/catalina/core/LocalStrings.properties
b/java/org/apache/catalina/core/LocalStrings.properties
index c5ab4a3506..7e419226f0 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -164,6 +164,13 @@ noPluggabilityServletContext.notAllowed=Section 4.4 of the
Servlet 3.0 specifica
pushBuilder.noPath=It is illegal to call push() before setting a path
+propertiesRoleMappingListener.roleMappingFileNull=Role mapping file cannot be
null
+propertiesRoleMappingListener.roleMappingFileEmpty=Role mapping file cannot be
empty
+propertiesRoleMappingListener.roleMappingFileNotFound=Role mapping file [{0}]
not found
+propertiesRoleMappingListener.roleMappingFileFail=Failed to load role mapping
file [{0}]
+propertiesRoleMappingListener.linkedRole=Successfully linked application role
[{0}] to technical role [{1}]
+propertiesRoleMappingListener.linkedRoleCount=Linked [{0}] application roles
to technical roles
+
standardContext.applicationListener=Error configuring application listener of
class [{0}]
standardContext.applicationSkipped=Skipped installing application listeners
due to previous error(s)
standardContext.backgroundProcess.instanceManager=Exception processing
instance manager [{0}] background process
diff --git a/java/org/apache/catalina/core/PropertiesRoleMappingListener.java
b/java/org/apache/catalina/core/PropertiesRoleMappingListener.java
new file mode 100644
index 00..60b135d27f
--- /dev/null
+++ b/java/org/apache/catalina/core/PropertiesRoleMappingListener.java
@@ -0,0 +1,168 @@
+/*
+ * 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.catalina.core;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Map.Entry;
+import java.util.Objects;
+import java.util.Properties;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.Lifecycle;
+import org.apache.catalina.LifecycleEvent;
+import org.apache.catalina.LifecycleListener;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.file.ConfigFileLoader;
+import org.apache.tomcat.util.res.StringManager;
+
+/**
+ * Implementation of {@code LifecycleListener} that will populate the
context's role mapping from a properties file.
+ *
+ * This listener must only be nested within {@link Context} elements.
+ *
+ * The keys represent application roles (e.g., admin, user, uservisor, etc.)
while the values represent technical roles
+ * (e.g., DNs, SIDs, UUIDs, etc.). A key can also be prefixed if, e.g., the
properties file contains generic
+ * application configuration as well: {@code app-roles.}.
+ *
+ * Note: The default value for the {@code roleMappingFile} is {@code
webapp:/WEB-INF/role-mapping.properties}.
+ */
+public class PropertiesRoleMappingListener implements LifecycleListener {
+
+private static final String WEBAPP_PROTOCOL = "webapp:";
+
+private static final Log log =
LogFac
[tomcat] branch 10.1.x updated (26555450d3 -> 6cb448a3f2)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from 26555450d3 Improve Javadoc new 6e435d8ae4 Add BZ issue ID new 6cb448a3f2 Bug 5: Provide option to supply role mapping from a properties file 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: .../apache/catalina/core/LocalStrings.properties | 7 + .../core/PropertiesRoleMappingListener.java| 168 + .../core/TestPropertiesRoleMappingListener.java| 168 + .../com/example/prefixed-role-mapping.properties | 2 + .../classes/com/example/role-mapping.properties| 2 + .../WEB-INF/prefixed-role-mapping.properties | 2 + .../WEB-INF/role-mapping.properties| 2 + test/webapp-role-mapping/admin | 1 + test/webapp-role-mapping/unmapped | 1 + test/webapp-role-mapping/user | 1 + webapps/docs/changelog.xml | 9 +- webapps/docs/config/listeners.xml | 31 12 files changed, 393 insertions(+), 1 deletion(-) create mode 100644 java/org/apache/catalina/core/PropertiesRoleMappingListener.java create mode 100644 test/org/apache/catalina/core/TestPropertiesRoleMappingListener.java create mode 100644 test/webapp-role-mapping/WEB-INF/classes/com/example/prefixed-role-mapping.properties create mode 100644 test/webapp-role-mapping/WEB-INF/classes/com/example/role-mapping.properties create mode 100644 test/webapp-role-mapping/WEB-INF/prefixed-role-mapping.properties create mode 100644 test/webapp-role-mapping/WEB-INF/role-mapping.properties create mode 100644 test/webapp-role-mapping/admin create mode 100644 test/webapp-role-mapping/unmapped create mode 100644 test/webapp-role-mapping/user - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Add BZ issue ID
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 6e435d8ae45fbf9f35845173eddf58228153575c Author: Michael Osipov AuthorDate: Thu Jun 29 11:22:38 2023 +0200 Add BZ issue ID --- webapps/docs/changelog.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 751a70e277..6d65651c81 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -108,7 +108,8 @@ -Add org.apache.catalina.core.ContextNamingInfoListener, +59232: Add +org.apache.catalina.core.ContextNamingInfoListener, a listener which creates context naming information environment entries. (michaelo) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Bug 66665: Provide option to supply role mapping from a properties file
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit e393ce35cb769c3e54d0904db3ec349efb53ffbc
Author: Michael Osipov
AuthorDate: Fri Jun 23 15:07:25 2023 +0200
Bug 5: Provide option to supply role mapping from a properties file
---
.../apache/catalina/core/LocalStrings.properties | 7 +
.../core/PropertiesRoleMappingListener.java| 168 +
.../core/TestPropertiesRoleMappingListener.java| 168 +
.../com/example/prefixed-role-mapping.properties | 2 +
.../classes/com/example/role-mapping.properties| 2 +
.../WEB-INF/prefixed-role-mapping.properties | 2 +
.../WEB-INF/role-mapping.properties| 2 +
test/webapp-role-mapping/admin | 1 +
test/webapp-role-mapping/unmapped | 1 +
test/webapp-role-mapping/user | 1 +
webapps/docs/changelog.xml | 6 +
webapps/docs/config/listeners.xml | 31
12 files changed, 391 insertions(+)
diff --git a/java/org/apache/catalina/core/LocalStrings.properties
b/java/org/apache/catalina/core/LocalStrings.properties
index d1a5762c84..744a93b31b 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -170,6 +170,13 @@ noPluggabilityServletContext.notAllowed=Section 4.4 of the
Servlet 3.0 specifica
pushBuilder.noPath=It is illegal to call push() before setting a path
+propertiesRoleMappingListener.roleMappingFileNull=Role mapping file cannot be
null
+propertiesRoleMappingListener.roleMappingFileEmpty=Role mapping file cannot be
empty
+propertiesRoleMappingListener.roleMappingFileNotFound=Role mapping file [{0}]
not found
+propertiesRoleMappingListener.roleMappingFileFail=Failed to load role mapping
file [{0}]
+propertiesRoleMappingListener.linkedRole=Successfully linked application role
[{0}] to technical role [{1}]
+propertiesRoleMappingListener.linkedRoleCount=Linked [{0}] application roles
to technical roles
+
standardContext.applicationListener=Error configuring application listener of
class [{0}]
standardContext.applicationSkipped=Skipped installing application listeners
due to previous error(s)
standardContext.backgroundProcess.instanceManager=Exception processing
instance manager [{0}] background process
diff --git a/java/org/apache/catalina/core/PropertiesRoleMappingListener.java
b/java/org/apache/catalina/core/PropertiesRoleMappingListener.java
new file mode 100644
index 00..60b135d27f
--- /dev/null
+++ b/java/org/apache/catalina/core/PropertiesRoleMappingListener.java
@@ -0,0 +1,168 @@
+/*
+ * 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.catalina.core;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Map.Entry;
+import java.util.Objects;
+import java.util.Properties;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.Lifecycle;
+import org.apache.catalina.LifecycleEvent;
+import org.apache.catalina.LifecycleListener;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.file.ConfigFileLoader;
+import org.apache.tomcat.util.res.StringManager;
+
+/**
+ * Implementation of {@code LifecycleListener} that will populate the
context's role mapping from a properties file.
+ *
+ * This listener must only be nested within {@link Context} elements.
+ *
+ * The keys represent application roles (e.g., admin, user, uservisor, etc.)
while the values represent technical roles
+ * (e.g., DNs, SIDs, UUIDs, etc.). A key can also be prefixed if, e.g., the
properties file contains generic
+ * application configuration as well: {@code app-roles.}.
+ *
+ * Note: The default value for the {@code roleMappingFile} is {@code
webapp:/WEB-INF/role-mapping.properties}.
+ */
+public class PropertiesRoleMappingListener implements LifecycleListener {
+
+private static final String WEBAPP_PROTOCOL = "webapp:";
+
+private static final Log log =
LogFact
[tomcat] branch 9.0.x updated (b00c5c80b4 -> e393ce35cb)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from b00c5c80b4 Improve Javadoc new 4480ff33ff Add BZ issue ID new e393ce35cb Bug 5: Provide option to supply role mapping from a properties file 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: .../apache/catalina/core/LocalStrings.properties | 7 + .../core/PropertiesRoleMappingListener.java| 168 + .../core/TestPropertiesRoleMappingListener.java| 168 + .../com/example/prefixed-role-mapping.properties | 2 + .../classes/com/example/role-mapping.properties| 2 + .../WEB-INF/prefixed-role-mapping.properties | 2 + .../WEB-INF/role-mapping.properties| 2 + test/webapp-role-mapping/admin | 1 + test/webapp-role-mapping/unmapped | 1 + test/webapp-role-mapping/user | 1 + webapps/docs/changelog.xml | 9 +- webapps/docs/config/listeners.xml | 31 12 files changed, 393 insertions(+), 1 deletion(-) create mode 100644 java/org/apache/catalina/core/PropertiesRoleMappingListener.java create mode 100644 test/org/apache/catalina/core/TestPropertiesRoleMappingListener.java create mode 100644 test/webapp-role-mapping/WEB-INF/classes/com/example/prefixed-role-mapping.properties create mode 100644 test/webapp-role-mapping/WEB-INF/classes/com/example/role-mapping.properties create mode 100644 test/webapp-role-mapping/WEB-INF/prefixed-role-mapping.properties create mode 100644 test/webapp-role-mapping/WEB-INF/role-mapping.properties create mode 100644 test/webapp-role-mapping/admin create mode 100644 test/webapp-role-mapping/unmapped create mode 100644 test/webapp-role-mapping/user - 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 (54ff8b3240 -> 5ae93dda3d)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from 54ff8b3240 Improve Javadoc new d936b70589 Add BZ issue ID new 5ae93dda3d Bug 5: Provide option to supply role mapping from a properties file 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: .../apache/catalina/core/LocalStrings.properties | 7 + .../core/PropertiesRoleMappingListener.java| 168 + .../core/TestPropertiesRoleMappingListener.java| 168 + .../com/example/prefixed-role-mapping.properties | 2 + .../classes/com/example/role-mapping.properties| 2 + .../WEB-INF/prefixed-role-mapping.properties | 2 + .../WEB-INF/role-mapping.properties| 2 + test/webapp-role-mapping/admin | 1 + test/webapp-role-mapping/unmapped | 1 + test/webapp-role-mapping/user | 1 + webapps/docs/changelog.xml | 9 +- webapps/docs/config/listeners.xml | 31 12 files changed, 393 insertions(+), 1 deletion(-) create mode 100644 java/org/apache/catalina/core/PropertiesRoleMappingListener.java create mode 100644 test/org/apache/catalina/core/TestPropertiesRoleMappingListener.java create mode 100644 test/webapp-role-mapping/WEB-INF/classes/com/example/prefixed-role-mapping.properties create mode 100644 test/webapp-role-mapping/WEB-INF/classes/com/example/role-mapping.properties create mode 100644 test/webapp-role-mapping/WEB-INF/prefixed-role-mapping.properties create mode 100644 test/webapp-role-mapping/WEB-INF/role-mapping.properties create mode 100644 test/webapp-role-mapping/admin create mode 100644 test/webapp-role-mapping/unmapped create mode 100644 test/webapp-role-mapping/user - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Bug 66665: Provide option to supply role mapping from a properties file
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 5ae93dda3d7e2834666f9c223dcf90db830c2193
Author: Michael Osipov
AuthorDate: Fri Jun 23 15:07:25 2023 +0200
Bug 5: Provide option to supply role mapping from a properties file
---
.../apache/catalina/core/LocalStrings.properties | 7 +
.../core/PropertiesRoleMappingListener.java| 168 +
.../core/TestPropertiesRoleMappingListener.java| 168 +
.../com/example/prefixed-role-mapping.properties | 2 +
.../classes/com/example/role-mapping.properties| 2 +
.../WEB-INF/prefixed-role-mapping.properties | 2 +
.../WEB-INF/role-mapping.properties| 2 +
test/webapp-role-mapping/admin | 1 +
test/webapp-role-mapping/unmapped | 1 +
test/webapp-role-mapping/user | 1 +
webapps/docs/changelog.xml | 6 +
webapps/docs/config/listeners.xml | 31
12 files changed, 391 insertions(+)
diff --git a/java/org/apache/catalina/core/LocalStrings.properties
b/java/org/apache/catalina/core/LocalStrings.properties
index 98accac8e3..47ccb88279 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -173,6 +173,13 @@ noPluggabilityServletContext.notAllowed=Section 4.4 of the
Servlet 3.0 specifica
pushBuilder.noPath=It is illegal to call push() before setting a path
+propertiesRoleMappingListener.roleMappingFileNull=Role mapping file cannot be
null
+propertiesRoleMappingListener.roleMappingFileEmpty=Role mapping file cannot be
empty
+propertiesRoleMappingListener.roleMappingFileNotFound=Role mapping file [{0}]
not found
+propertiesRoleMappingListener.roleMappingFileFail=Failed to load role mapping
file [{0}]
+propertiesRoleMappingListener.linkedRole=Successfully linked application role
[{0}] to technical role [{1}]
+propertiesRoleMappingListener.linkedRoleCount=Linked [{0}] application roles
to technical roles
+
standardContext.applicationListener=Error configuring application listener of
class [{0}]
standardContext.applicationSkipped=Skipped installing application listeners
due to previous error(s)
standardContext.backgroundProcess.instanceManager=Exception processing
instance manager [{0}] background process
diff --git a/java/org/apache/catalina/core/PropertiesRoleMappingListener.java
b/java/org/apache/catalina/core/PropertiesRoleMappingListener.java
new file mode 100644
index 00..60b135d27f
--- /dev/null
+++ b/java/org/apache/catalina/core/PropertiesRoleMappingListener.java
@@ -0,0 +1,168 @@
+/*
+ * 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.catalina.core;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Map.Entry;
+import java.util.Objects;
+import java.util.Properties;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.Lifecycle;
+import org.apache.catalina.LifecycleEvent;
+import org.apache.catalina.LifecycleListener;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.file.ConfigFileLoader;
+import org.apache.tomcat.util.res.StringManager;
+
+/**
+ * Implementation of {@code LifecycleListener} that will populate the
context's role mapping from a properties file.
+ *
+ * This listener must only be nested within {@link Context} elements.
+ *
+ * The keys represent application roles (e.g., admin, user, uservisor, etc.)
while the values represent technical roles
+ * (e.g., DNs, SIDs, UUIDs, etc.). A key can also be prefixed if, e.g., the
properties file contains generic
+ * application configuration as well: {@code app-roles.}.
+ *
+ * Note: The default value for the {@code roleMappingFile} is {@code
webapp:/WEB-INF/role-mapping.properties}.
+ */
+public class PropertiesRoleMappingListener implements LifecycleListener {
+
+private static final String WEBAPP_PROTOCOL = "webapp:";
+
+private static final Log log =
LogFact
[tomcat] 01/02: Add BZ issue ID
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit d936b7058990a749414161fb38250cca9593669e Author: Michael Osipov AuthorDate: Thu Jun 29 11:22:38 2023 +0200 Add BZ issue ID --- webapps/docs/changelog.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index a47a8898d1..e8934b7e27 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -108,7 +108,8 @@ -Add org.apache.catalina.core.ContextNamingInfoListener, +59232: Add +org.apache.catalina.core.ContextNamingInfoListener, a listener which creates context naming information environment entries. (michaelo) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Add BZ issue ID
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 4480ff33ff30413993c2773564164f72ae07b76d Author: Michael Osipov AuthorDate: Thu Jun 29 11:22:38 2023 +0200 Add BZ issue ID --- webapps/docs/changelog.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index e28909a12b..605533ba40 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -108,7 +108,8 @@ -Add org.apache.catalina.core.ContextNamingInfoListener, +59232: Add +org.apache.catalina.core.ContextNamingInfoListener, a listener which creates context naming information environment entries. (michaelo) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 66665] Provide option to supply role mapping from a properties file
https://bz.apache.org/bugzilla/show_bug.cgi?id=5 Michael Osipov changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #2 from Michael Osipov --- Fixed in: - main for 11.0.0-M8 and onwards - 10.1.x for 10.1.11 and onwards - 9.0.x for 9.0.77 and onwards - 8.5.x for 8.5.91 and onwards -- 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
[GitHub] [tomcat] michael-o commented on pull request #631: Bug 66665: Provide option to supply role mapping from a properties file
michael-o commented on PR #631: URL: https://github.com/apache/tomcat/pull/631#issuecomment-1612776954 Merged manually. -- 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] michael-o closed pull request #631: Bug 66665: Provide option to supply role mapping from a properties file
michael-o closed pull request #631: Bug 5: Provide option to supply role mapping from a properties file URL: https://github.com/apache/tomcat/pull/631 -- 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 9.0.x updated: Fix an IDE warning
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 7c9bc19f1a Fix an IDE warning
7c9bc19f1a is described below
commit 7c9bc19f1a85252c4b5a9efc6f9ce27a65e28f08
Author: Mark Thomas
AuthorDate: Thu Jun 29 11:19:58 2023 +0100
Fix an IDE warning
---
.../src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
index bc77a3d085..06989ab807 100644
---
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
+++
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
@@ -113,7 +113,7 @@ public class ConnectionPool {
/**
* Executor service used to cancel Futures
*/
-private ThreadPoolExecutor cancellator = new
ThreadPoolExecutor(0,1,1000,TimeUnit.MILLISECONDS,new
LinkedBlockingQueue());
+private ThreadPoolExecutor cancellator = new
ThreadPoolExecutor(0,1,1000,TimeUnit.MILLISECONDS,new LinkedBlockingQueue<>());
/**
* reference to the JMX mbean
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix various Checkstyle and IDE warnings
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 430ae2ec0a Fix various Checkstyle and IDE warnings
430ae2ec0a is described below
commit 430ae2ec0a6c8de79a883bdbcab0b7f19e5b0a36
Author: Mark Thomas
AuthorDate: Thu Jun 29 11:27:20 2023 +0100
Fix various Checkstyle and IDE warnings
---
.../catalina/core/PropertiesRoleMappingListener.java | 2 +-
.../catalina/core/TestPropertiesRoleMappingListener.java | 9 +
.../classes/com/example/prefixed-role-mapping.properties | 15 +++
.../WEB-INF/classes/com/example/role-mapping.properties | 15 +++
.../WEB-INF/prefixed-role-mapping.properties | 15 +++
test/webapp-role-mapping/WEB-INF/role-mapping.properties | 15 +++
6 files changed, 66 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/catalina/core/PropertiesRoleMappingListener.java
b/java/org/apache/catalina/core/PropertiesRoleMappingListener.java
index 60b135d27f..10a5d7215c 100644
--- a/java/org/apache/catalina/core/PropertiesRoleMappingListener.java
+++ b/java/org/apache/catalina/core/PropertiesRoleMappingListener.java
@@ -160,7 +160,7 @@ public class PropertiesRoleMappingListener implements
LifecycleListener {
}
if (log.isDebugEnabled()) {
-
log.debug(sm.getString("propertiesRoleMappingListener.linkedRoleCount",
linkCount));
+
log.debug(sm.getString("propertiesRoleMappingListener.linkedRoleCount",
Integer.valueOf(linkCount)));
}
}
}
diff --git
a/test/org/apache/catalina/core/TestPropertiesRoleMappingListener.java
b/test/org/apache/catalina/core/TestPropertiesRoleMappingListener.java
index 9ba4fa38ce..04d0ed18c4 100644
--- a/test/org/apache/catalina/core/TestPropertiesRoleMappingListener.java
+++ b/test/org/apache/catalina/core/TestPropertiesRoleMappingListener.java
@@ -25,6 +25,11 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import jakarta.servlet.http.HttpServletRequest;
+
+import org.junit.Assert;
+import org.junit.Test;
+
import org.apache.catalina.Context;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.authenticator.BasicAuthenticator;
@@ -37,10 +42,6 @@ import org.apache.tomcat.util.codec.binary.Base64;
import org.apache.tomcat.util.descriptor.web.LoginConfig;
import org.apache.tomcat.util.descriptor.web.SecurityCollection;
import org.apache.tomcat.util.descriptor.web.SecurityConstraint;
-import org.junit.Assert;
-import org.junit.Test;
-
-import jakarta.servlet.http.HttpServletRequest;
public class TestPropertiesRoleMappingListener extends TomcatBaseTest {
diff --git
a/test/webapp-role-mapping/WEB-INF/classes/com/example/prefixed-role-mapping.properties
b/test/webapp-role-mapping/WEB-INF/classes/com/example/prefixed-role-mapping.properties
index f2510d7841..2758c7fef2 100644
---
a/test/webapp-role-mapping/WEB-INF/classes/com/example/prefixed-role-mapping.properties
+++
b/test/webapp-role-mapping/WEB-INF/classes/com/example/prefixed-role-mapping.properties
@@ -1,2 +1,17 @@
+# 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.
+
app-roles.admin=de25f8f5-e534-4980-9351-e316384b1127
app-roles.user=13f6b886-cba8-4b5b-9a1b-06a6fe533356
diff --git
a/test/webapp-role-mapping/WEB-INF/classes/com/example/role-mapping.properties
b/test/webapp-role-mapping/WEB-INF/classes/com/example/role-mapping.properties
index b186493cf5..5091905865 100644
---
a/test/webapp-role-mapping/WEB-INF/classes/com/example/role-mapping.properties
+++
b/test/webapp-role-mapping/WEB-INF/classes/com/example/role-mapping.properties
@@ -1,2 +1,17 @@
+# 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 Licens
[tomcat] branch 10.1.x updated: Fix various Checkstyle and IDE warnings
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new e68619ed6f Fix various Checkstyle and IDE warnings
e68619ed6f is described below
commit e68619ed6fc01aebbb575a516702a86dae64412a
Author: Mark Thomas
AuthorDate: Thu Jun 29 11:27:20 2023 +0100
Fix various Checkstyle and IDE warnings
---
.../catalina/core/PropertiesRoleMappingListener.java | 2 +-
.../catalina/core/TestPropertiesRoleMappingListener.java | 9 +
.../classes/com/example/prefixed-role-mapping.properties | 15 +++
.../WEB-INF/classes/com/example/role-mapping.properties | 15 +++
.../WEB-INF/prefixed-role-mapping.properties | 15 +++
test/webapp-role-mapping/WEB-INF/role-mapping.properties | 15 +++
6 files changed, 66 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/catalina/core/PropertiesRoleMappingListener.java
b/java/org/apache/catalina/core/PropertiesRoleMappingListener.java
index 60b135d27f..10a5d7215c 100644
--- a/java/org/apache/catalina/core/PropertiesRoleMappingListener.java
+++ b/java/org/apache/catalina/core/PropertiesRoleMappingListener.java
@@ -160,7 +160,7 @@ public class PropertiesRoleMappingListener implements
LifecycleListener {
}
if (log.isDebugEnabled()) {
-
log.debug(sm.getString("propertiesRoleMappingListener.linkedRoleCount",
linkCount));
+
log.debug(sm.getString("propertiesRoleMappingListener.linkedRoleCount",
Integer.valueOf(linkCount)));
}
}
}
diff --git
a/test/org/apache/catalina/core/TestPropertiesRoleMappingListener.java
b/test/org/apache/catalina/core/TestPropertiesRoleMappingListener.java
index 9ba4fa38ce..04d0ed18c4 100644
--- a/test/org/apache/catalina/core/TestPropertiesRoleMappingListener.java
+++ b/test/org/apache/catalina/core/TestPropertiesRoleMappingListener.java
@@ -25,6 +25,11 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import jakarta.servlet.http.HttpServletRequest;
+
+import org.junit.Assert;
+import org.junit.Test;
+
import org.apache.catalina.Context;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.authenticator.BasicAuthenticator;
@@ -37,10 +42,6 @@ import org.apache.tomcat.util.codec.binary.Base64;
import org.apache.tomcat.util.descriptor.web.LoginConfig;
import org.apache.tomcat.util.descriptor.web.SecurityCollection;
import org.apache.tomcat.util.descriptor.web.SecurityConstraint;
-import org.junit.Assert;
-import org.junit.Test;
-
-import jakarta.servlet.http.HttpServletRequest;
public class TestPropertiesRoleMappingListener extends TomcatBaseTest {
diff --git
a/test/webapp-role-mapping/WEB-INF/classes/com/example/prefixed-role-mapping.properties
b/test/webapp-role-mapping/WEB-INF/classes/com/example/prefixed-role-mapping.properties
index f2510d7841..2758c7fef2 100644
---
a/test/webapp-role-mapping/WEB-INF/classes/com/example/prefixed-role-mapping.properties
+++
b/test/webapp-role-mapping/WEB-INF/classes/com/example/prefixed-role-mapping.properties
@@ -1,2 +1,17 @@
+# 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.
+
app-roles.admin=de25f8f5-e534-4980-9351-e316384b1127
app-roles.user=13f6b886-cba8-4b5b-9a1b-06a6fe533356
diff --git
a/test/webapp-role-mapping/WEB-INF/classes/com/example/role-mapping.properties
b/test/webapp-role-mapping/WEB-INF/classes/com/example/role-mapping.properties
index b186493cf5..5091905865 100644
---
a/test/webapp-role-mapping/WEB-INF/classes/com/example/role-mapping.properties
+++
b/test/webapp-role-mapping/WEB-INF/classes/com/example/role-mapping.properties
@@ -1,2 +1,17 @@
+# 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 Li
[tomcat] branch 8.5.x updated: Align PropertiesRoleMappingListener for API difference
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new d79954dfc7 Align PropertiesRoleMappingListener for API difference
d79954dfc7 is described below
commit d79954dfc7171417231eaaa0ec6586e50f69f8e6
Author: Michael Osipov
AuthorDate: Thu Jun 29 12:27:59 2023 +0200
Align PropertiesRoleMappingListener for API difference
---
java/org/apache/catalina/core/PropertiesRoleMappingListener.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/core/PropertiesRoleMappingListener.java
b/java/org/apache/catalina/core/PropertiesRoleMappingListener.java
index 60b135d27f..2dc44e9adb 100644
--- a/java/org/apache/catalina/core/PropertiesRoleMappingListener.java
+++ b/java/org/apache/catalina/core/PropertiesRoleMappingListener.java
@@ -115,7 +115,7 @@ public class PropertiesRoleMappingListener implements
LifecycleListener {
is = context.getServletContext().getResourceAsStream(path);
} else {
try {
-is =
ConfigFileLoader.getSource().getResource(roleMappingFile).getInputStream();
+is = ConfigFileLoader.getInputStream(roleMappingFile);
} catch (FileNotFoundException e1) {
is = null;
} catch (IOException e2) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix various Checkstyle and IDE warnings
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 9075b4b5ed Fix various Checkstyle and IDE warnings
9075b4b5ed is described below
commit 9075b4b5ed603066532f061afeba953a2044feea
Author: Mark Thomas
AuthorDate: Thu Jun 29 11:27:20 2023 +0100
Fix various Checkstyle and IDE warnings
---
.../catalina/core/PropertiesRoleMappingListener.java | 2 +-
.../catalina/core/TestPropertiesRoleMappingListener.java | 5 +++--
.../classes/com/example/prefixed-role-mapping.properties | 15 +++
.../WEB-INF/classes/com/example/role-mapping.properties | 15 +++
.../WEB-INF/prefixed-role-mapping.properties | 15 +++
test/webapp-role-mapping/WEB-INF/role-mapping.properties | 15 +++
6 files changed, 64 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/core/PropertiesRoleMappingListener.java
b/java/org/apache/catalina/core/PropertiesRoleMappingListener.java
index 60b135d27f..10a5d7215c 100644
--- a/java/org/apache/catalina/core/PropertiesRoleMappingListener.java
+++ b/java/org/apache/catalina/core/PropertiesRoleMappingListener.java
@@ -160,7 +160,7 @@ public class PropertiesRoleMappingListener implements
LifecycleListener {
}
if (log.isDebugEnabled()) {
-
log.debug(sm.getString("propertiesRoleMappingListener.linkedRoleCount",
linkCount));
+
log.debug(sm.getString("propertiesRoleMappingListener.linkedRoleCount",
Integer.valueOf(linkCount)));
}
}
}
diff --git
a/test/org/apache/catalina/core/TestPropertiesRoleMappingListener.java
b/test/org/apache/catalina/core/TestPropertiesRoleMappingListener.java
index ac247d24b6..292483a6fd 100644
--- a/test/org/apache/catalina/core/TestPropertiesRoleMappingListener.java
+++ b/test/org/apache/catalina/core/TestPropertiesRoleMappingListener.java
@@ -27,6 +27,9 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
+import org.junit.Assert;
+import org.junit.Test;
+
import org.apache.catalina.Context;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.authenticator.BasicAuthenticator;
@@ -39,8 +42,6 @@ import org.apache.tomcat.util.codec.binary.Base64;
import org.apache.tomcat.util.descriptor.web.LoginConfig;
import org.apache.tomcat.util.descriptor.web.SecurityCollection;
import org.apache.tomcat.util.descriptor.web.SecurityConstraint;
-import org.junit.Assert;
-import org.junit.Test;
public class TestPropertiesRoleMappingListener extends TomcatBaseTest {
diff --git
a/test/webapp-role-mapping/WEB-INF/classes/com/example/prefixed-role-mapping.properties
b/test/webapp-role-mapping/WEB-INF/classes/com/example/prefixed-role-mapping.properties
index f2510d7841..2758c7fef2 100644
---
a/test/webapp-role-mapping/WEB-INF/classes/com/example/prefixed-role-mapping.properties
+++
b/test/webapp-role-mapping/WEB-INF/classes/com/example/prefixed-role-mapping.properties
@@ -1,2 +1,17 @@
+# 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.
+
app-roles.admin=de25f8f5-e534-4980-9351-e316384b1127
app-roles.user=13f6b886-cba8-4b5b-9a1b-06a6fe533356
diff --git
a/test/webapp-role-mapping/WEB-INF/classes/com/example/role-mapping.properties
b/test/webapp-role-mapping/WEB-INF/classes/com/example/role-mapping.properties
index b186493cf5..5091905865 100644
---
a/test/webapp-role-mapping/WEB-INF/classes/com/example/role-mapping.properties
+++
b/test/webapp-role-mapping/WEB-INF/classes/com/example/role-mapping.properties
@@ -1,2 +1,17 @@
+# 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
[tomcat] branch 8.5.x updated: Fix various Checkstyle and IDE warnings
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 ced38015ff Fix various Checkstyle and IDE warnings
ced38015ff is described below
commit ced38015fff60f3734b6e40f790bca608f81d459
Author: Mark Thomas
AuthorDate: Thu Jun 29 11:27:20 2023 +0100
Fix various Checkstyle and IDE warnings
---
.../catalina/core/PropertiesRoleMappingListener.java | 2 +-
.../catalina/core/TestPropertiesRoleMappingListener.java | 5 +++--
.../classes/com/example/prefixed-role-mapping.properties | 15 +++
.../WEB-INF/classes/com/example/role-mapping.properties | 15 +++
.../WEB-INF/prefixed-role-mapping.properties | 15 +++
test/webapp-role-mapping/WEB-INF/role-mapping.properties | 15 +++
6 files changed, 64 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/core/PropertiesRoleMappingListener.java
b/java/org/apache/catalina/core/PropertiesRoleMappingListener.java
index 2dc44e9adb..796b06e9b8 100644
--- a/java/org/apache/catalina/core/PropertiesRoleMappingListener.java
+++ b/java/org/apache/catalina/core/PropertiesRoleMappingListener.java
@@ -160,7 +160,7 @@ public class PropertiesRoleMappingListener implements
LifecycleListener {
}
if (log.isDebugEnabled()) {
-
log.debug(sm.getString("propertiesRoleMappingListener.linkedRoleCount",
linkCount));
+
log.debug(sm.getString("propertiesRoleMappingListener.linkedRoleCount",
Integer.valueOf(linkCount)));
}
}
}
diff --git
a/test/org/apache/catalina/core/TestPropertiesRoleMappingListener.java
b/test/org/apache/catalina/core/TestPropertiesRoleMappingListener.java
index ac247d24b6..292483a6fd 100644
--- a/test/org/apache/catalina/core/TestPropertiesRoleMappingListener.java
+++ b/test/org/apache/catalina/core/TestPropertiesRoleMappingListener.java
@@ -27,6 +27,9 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
+import org.junit.Assert;
+import org.junit.Test;
+
import org.apache.catalina.Context;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.authenticator.BasicAuthenticator;
@@ -39,8 +42,6 @@ import org.apache.tomcat.util.codec.binary.Base64;
import org.apache.tomcat.util.descriptor.web.LoginConfig;
import org.apache.tomcat.util.descriptor.web.SecurityCollection;
import org.apache.tomcat.util.descriptor.web.SecurityConstraint;
-import org.junit.Assert;
-import org.junit.Test;
public class TestPropertiesRoleMappingListener extends TomcatBaseTest {
diff --git
a/test/webapp-role-mapping/WEB-INF/classes/com/example/prefixed-role-mapping.properties
b/test/webapp-role-mapping/WEB-INF/classes/com/example/prefixed-role-mapping.properties
index f2510d7841..2758c7fef2 100644
---
a/test/webapp-role-mapping/WEB-INF/classes/com/example/prefixed-role-mapping.properties
+++
b/test/webapp-role-mapping/WEB-INF/classes/com/example/prefixed-role-mapping.properties
@@ -1,2 +1,17 @@
+# 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.
+
app-roles.admin=de25f8f5-e534-4980-9351-e316384b1127
app-roles.user=13f6b886-cba8-4b5b-9a1b-06a6fe533356
diff --git
a/test/webapp-role-mapping/WEB-INF/classes/com/example/role-mapping.properties
b/test/webapp-role-mapping/WEB-INF/classes/com/example/role-mapping.properties
index b186493cf5..5091905865 100644
---
a/test/webapp-role-mapping/WEB-INF/classes/com/example/role-mapping.properties
+++
b/test/webapp-role-mapping/WEB-INF/classes/com/example/role-mapping.properties
@@ -1,2 +1,17 @@
+# 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
[tomcat] branch main updated: This API should actually not return null
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 341ee31c3a This API should actually not return null
341ee31c3a is described below
commit 341ee31c3ad0717081715b351a5fbcee6b122753
Author: remm
AuthorDate: Thu Jun 29 13:20:30 2023 +0200
This API should actually not return null
---
java/org/apache/catalina/Context.java | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/Context.java
b/java/org/apache/catalina/Context.java
index 30f9f3016d..4be9f8f72c 100644
--- a/java/org/apache/catalina/Context.java
+++ b/java/org/apache/catalina/Context.java
@@ -1989,7 +1989,7 @@ public interface Context extends Container, ContextBind {
if (name.startsWith(WEBAPP_PROTOCOL)) {
String path = name.substring(WEBAPP_PROTOCOL.length());
WebResource resource = getResources().getResource(path);
-if (resource.canRead()) {
+if (resource.canRead() && resource.isFile()) {
InputStream stream = resource.getInputStream();
try {
return new Resource(stream, resource.getURL().toURI());
@@ -1997,10 +1997,8 @@ public interface Context extends Container, ContextBind {
stream.close();
}
}
-return null;
-} else {
-return ConfigFileLoader.getSource().getResource(name);
}
+return ConfigFileLoader.getSource().getResource(name);
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/04: Remove translation that needs updating
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 25bf456bedd1dd6e3826f7be59c3b232ce0cc1ab Author: Mark Thomas AuthorDate: Thu Jun 29 14:20:42 2023 +0100 Remove translation that needs updating --- java/org/apache/catalina/valves/LocalStrings_es.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/java/org/apache/catalina/valves/LocalStrings_es.properties b/java/org/apache/catalina/valves/LocalStrings_es.properties index 93b988fd0f..d1ca0032ed 100644 --- a/java/org/apache/catalina/valves/LocalStrings_es.properties +++ b/java/org/apache/catalina/valves/LocalStrings_es.properties @@ -31,7 +31,6 @@ errorReportValve.statusReport=Informe de estado errorReportValve.type=Tipo http.400.desc=El requerimiento enviado por el cliente era sintácticamente incorrecto. -http.401.desc=Este requerimiento requiere autenticación HTTP. http.401.reason=No autorizado http.402.desc=Este código de estado está reservado para uso futuro. http.403.desc=El acceso al recurso especificado ha sido prohibido. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated (341ee31c3a -> 493a6fe56e)
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 341ee31c3a This API should actually not return null new 25bf456bed Remove translation that needs updating new 6e3fa956ba Further improvements to French translations new 1e516e2679 Improvements to Japanese translations new 493a6fe56e Fix quoting The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: java/org/apache/catalina/core/LocalStrings_ja.properties| 2 ++ java/org/apache/catalina/filters/LocalStrings_ja.properties | 3 +++ java/org/apache/catalina/storeconfig/LocalStrings_ja.properties | 2 +- java/org/apache/catalina/util/LocalStrings_ja.properties| 2 ++ java/org/apache/catalina/valves/LocalStrings_es.properties | 1 - java/org/apache/coyote/http11/LocalStrings_ja.properties| 1 + java/org/apache/tomcat/util/net/LocalStrings_fr.properties | 1 + java/org/apache/tomcat/util/net/LocalStrings_ja.properties | 3 +++ webapps/docs/changelog.xml | 3 +++ 9 files changed, 16 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/04: Further 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
commit 6e3fa956ba1b52499fbd697854e995bb6fb0cc78
Author: Mark Thomas
AuthorDate: Thu Jun 29 14:22:45 2023 +0100
Further improvements to French translations
---
java/org/apache/tomcat/util/net/LocalStrings_fr.properties | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
b/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
index e8eb7d3569..25f39b7b12 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
@@ -117,7 +117,8 @@ endpoint.timeout.err=Erreur en traitant le dépassement de
temps d'attente du so
endpoint.tls.cert.encodingError=Les empreintes du certificat ne sont pas
disponibles
endpoint.tls.cert.noCerts=Les détails du certificat ne sont pas disponibles
car la chaîne de certificats retournée par le SSLContext est vide
endpoint.tls.info=Connecteur [{0}], hôte virtuel TLS [{1}], type de certificat
[{2}] configuré depuis {3} et la trust store [{4}]
-endpoint.tls.info.cert.keystore=[{0}] avec l''alias [{1}]
+endpoint.tls.info.cert.keystore=[{0}] avec lalias [{1}]
+endpoint.tls.info.cert.pem=clé [{0}], certificat [{1}] et chaîne de
certificats [{2}]
endpoint.unknownSslHostName=Le nom d''hôte SSL [{0}] n''est pas reconnu pour
cette terminaison
endpoint.warn.executorShutdown=L''exécuteur associé au pool de threads [{0}]
n''est pas complètement arrêté, certains threads d''application peuvent
toujours être en cours d''exécution
endpoint.warn.incorrectConnectionCount=Le décompte du nombre de connections
est incorrect, la méthode de fermeture d'un même socket a été appelée plusieurs
fois
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 04/04: Fix quoting
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 493a6fe56e71c5b9176dd840eac3ac7da530a5c1
Author: Mark Thomas
AuthorDate: Thu Jun 29 14:43:10 2023 +0100
Fix quoting
---
java/org/apache/tomcat/util/net/LocalStrings_fr.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
b/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
index 25f39b7b12..6ebb8bb69e 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
@@ -117,7 +117,7 @@ endpoint.timeout.err=Erreur en traitant le dépassement de
temps d'attente du so
endpoint.tls.cert.encodingError=Les empreintes du certificat ne sont pas
disponibles
endpoint.tls.cert.noCerts=Les détails du certificat ne sont pas disponibles
car la chaîne de certificats retournée par le SSLContext est vide
endpoint.tls.info=Connecteur [{0}], hôte virtuel TLS [{1}], type de certificat
[{2}] configuré depuis {3} et la trust store [{4}]
-endpoint.tls.info.cert.keystore=[{0}] avec lalias [{1}]
+endpoint.tls.info.cert.keystore=[{0}] avec l''alias [{1}]
endpoint.tls.info.cert.pem=clé [{0}], certificat [{1}] et chaîne de
certificats [{2}]
endpoint.unknownSslHostName=Le nom d''hôte SSL [{0}] n''est pas reconnu pour
cette terminaison
endpoint.warn.executorShutdown=L''exécuteur associé au pool de threads [{0}]
n''est pas complètement arrêté, certains threads d''application peuvent
toujours être en cours d''exécution
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/03: Back-port Japanese translations
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 7c6ad9e0b17074727e75ad6bcc4f35c6e02106dd
Author: Mark Thomas
AuthorDate: Thu Jun 29 14:45:03 2023 +0100
Back-port Japanese translations
---
java/org/apache/catalina/core/LocalStrings_ja.properties| 2 ++
java/org/apache/catalina/filters/LocalStrings_ja.properties | 2 ++
java/org/apache/catalina/util/LocalStrings_ja.properties| 2 ++
java/org/apache/coyote/http11/LocalStrings_ja.properties| 1 +
java/org/apache/tomcat/util/net/LocalStrings_ja.properties | 3 +++
webapps/docs/changelog.xml | 3 +++
6 files changed, 13 insertions(+)
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index 34ad99ebcb..ad23006ede 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -281,6 +281,8 @@ standardService.stop.name=サービス [{0}] を停止します
standardThreadExecutor.notStarted=エグゼキュターは開始ししていません。
+standardVirtualThreadExecutor.notStarted=エグゼキュータが起動されていません
+
standardWrapper.allocate=サーブレットインスタンスを割り当て中のエラーです
standardWrapper.allocateException=サーブレット [{0}] に例外を割り当てます
standardWrapper.deallocateException=サーブレット [{0}] に対する例外の割り当てを解除します
diff --git a/java/org/apache/catalina/filters/LocalStrings_ja.properties
b/java/org/apache/catalina/filters/LocalStrings_ja.properties
index cff0e91340..dc4ebcae7b 100644
--- a/java/org/apache/catalina/filters/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/filters/LocalStrings_ja.properties
@@ -52,6 +52,8 @@ http.403=指定されたリソース [{0}] へのアクセスは拒否されま
httpHeaderSecurityFilter.clickjack.invalid=クリックジャッキングヘッダーに無効な値 [{0}] が指定されました
httpHeaderSecurityFilter.committed=HTTP
ヘッダーセキュリティフィルターへの入力時に既に応答がコミットされているため、HTTP ヘッダーを追加できません
+rateLimitFilter.maxRequestsExceeded=[{0}] [{1}] [{2}] からのリクエストが、[{4}]
秒のウィンドウで許可される最大値 [{3}] を超えました。
+
remoteCidrFilter.invalid=[{0}] に不正な値が指定されました。詳細は直前のメッセージを参照してください。
remoteCidrFilter.noRemoteIp=クライアントは IP アドレスを持っていません。リクエストを拒否します。
diff --git a/java/org/apache/catalina/util/LocalStrings_ja.properties
b/java/org/apache/catalina/util/LocalStrings_ja.properties
index 3cefbd2408..f3851dba01 100644
--- a/java/org/apache/catalina/util/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/util/LocalStrings_ja.properties
@@ -48,3 +48,5 @@ sessionIdGeneratorBase.noSHA1PRNG=SecureRandom の既定の SHA1PRNG
アルゴ
sessionIdGeneratorBase.random=クラス [{0}] の乱数発生器の初期化の例外です
sessionIdGeneratorBase.randomAlgorithm=アルゴリズム [{0}] を使用して乱数ジェネレータを初期化する際の例外
sessionIdGeneratorBase.randomProvider=プロバイダ [{0}] を使用して乱数ジェネレータを初期化中に例外が発生しました
+
+timebucket.maintenance.error=定期メンテナンスの処理中にエラーが発生しました
diff --git a/java/org/apache/coyote/http11/LocalStrings_ja.properties
b/java/org/apache/coyote/http11/LocalStrings_ja.properties
index c77d8069aa..1b29ac7586 100644
--- a/java/org/apache/coyote/http11/LocalStrings_ja.properties
+++ b/java/org/apache/coyote/http11/LocalStrings_ja.properties
@@ -47,6 +47,7 @@ iib.invalidHttpProtocol=HTTPプロトコルで無効な文字が見つかりま
iib.invalidPhase=リクエスト行の解析フェーズ [{0}] は無効です
iib.invalidRequestTarget=リクエストの宛先 [{0}] に無効な文字が含まれています。利用可能な文字は RFC 7230 および
RFC 3986 に定義されています。
iib.invalidheader=HTTP ヘッダー行 [{0}]は RFC 7230 に適合しないため無視します。
+iib.invalidheader.reject=HTTP ヘッダーの [{0}] 行目は RFC 7230 に準拠していません。リクエストは拒否されました。
iib.invalidmethod=HTTP メソッド名 [{0}] に無効な文字が含まれています。HTTP
メソッド名は決められたトークンでなければなりません
iib.parseheaders.ise.error=予期しない状態：ヘッダがすでに解析されています。バッファが未回収ですか？
iib.readtimeout=ソケットからデータを読み取ろうとしている際のタイムアウト
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
b/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
index 9cb9d5f74a..895d87b1b3 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
@@ -116,6 +116,9 @@ endpoint.socketOptionsError=ソケットオプション設定中のエラー
endpoint.timeout.err=ソケットタイムアウト処理中のエラー
endpoint.tls.cert.encodingError=証明書のフィンガープリントが利用できません
endpoint.tls.cert.noCerts=SSLContext から返された証明書チェーンが空だったため、証明書の詳細を利用できません
+endpoint.tls.info=トラストストア [{4}] を使用して {3} から構成されたコネクタ [{0}]、TLS 仮想ホスト
[{1}]、および証明書タイプ [{2}]
+endpoint.tls.info.cert.keystore=エイリアス [{1}] を使用したキーストア [{0}]
+endpoint.tls.info.cert.pem=キー [{0}]、証明書 [{1}]、および証明書チェーン [{2}]
endpoint.unknownSslHostName=SSL ホスト名 [{0}] はこのエンドポイントから認識されていません。
endpoint.warn.executorShutdown=スレッドプール [{0}]
と関連付けられたエグゼキューターは完全に停止できませんでした。いくつかのアプリケーションスレッドはまだ動作し続けている可能性があります。
endpoint.warn.incorrectConnectionCount=不正なコネクション数。複数のsocket.closeが同じソケットで呼び出されました。
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5d35fd0d9a..b444044e79 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -179,6 +179,9 @@
Improvements to French translations. (remm)
+
+Improvements to J
[tomcat] branch 10.1.x updated (e68619ed6f -> 7c6ad9e0b1)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from e68619ed6f Fix various Checkstyle and IDE warnings new 9946338ad5 Fix ordering, formatting and spelling new 0674e9b29a Back-port French translations new 7c6ad9e0b1 Back-port Japanese translations The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: java/jakarta/el/LocalStrings_de.properties | 2 +- java/jakarta/el/LocalStrings_pt_BR.properties| 2 +- .../org/apache/catalina/core/LocalStrings.properties | 14 +++--- .../apache/catalina/core/LocalStrings_es.properties | 2 +- .../apache/catalina/core/LocalStrings_fr.properties | 2 ++ .../apache/catalina/core/LocalStrings_ja.properties | 2 ++ .../catalina/core/LocalStrings_zh_CN.properties | 4 ++-- .../apache/catalina/filters/LocalStrings.properties | 2 +- .../catalina/filters/LocalStrings_fr.properties | 2 ++ .../catalina/filters/LocalStrings_ja.properties | 2 ++ .../catalina/filters/LocalStrings_zh_CN.properties | 4 ++-- .../catalina/manager/LocalStrings_zh_CN.properties | 2 +- .../catalina/manager/host/LocalStrings_ru.properties | 2 +- .../catalina/mapper/LocalStrings_zh_CN.properties| 8 .../apache/catalina/realm/LocalStrings_fr.properties | 2 +- .../catalina/realm/LocalStrings_pt_BR.properties | 2 +- .../catalina/realm/LocalStrings_zh_CN.properties | 2 +- .../catalina/security/LocalStrings_fr.properties | 4 ++-- .../catalina/servlets/LocalStrings_zh_CN.properties | 2 +- .../catalina/session/LocalStrings_zh_CN.properties | 4 ++-- .../catalina/startup/LocalStrings_ja.properties | 2 +- .../catalina/storeconfig/LocalStrings_ja.properties | 2 +- .../tribes/transport/LocalStrings_zh_CN.properties | 2 +- .../apache/catalina/util/LocalStrings_fr.properties | 2 ++ .../apache/catalina/util/LocalStrings_ja.properties | 2 ++ .../catalina/util/LocalStrings_zh_CN.properties | 4 ++-- .../catalina/valves/LocalStrings_fr.properties | 2 +- .../catalina/valves/LocalStrings_zh_CN.properties| 6 +++--- .../webresources/LocalStrings_zh_CN.properties | 2 +- .../apache/coyote/http11/LocalStrings_fr.properties | 1 + .../apache/coyote/http11/LocalStrings_ja.properties | 1 + .../coyote/http2/LocalStrings_zh_CN.properties | 20 ++-- java/org/apache/el/LocalStrings_zh_CN.properties | 2 +- .../jasper/resources/LocalStrings_zh_CN.properties | 20 ++-- .../descriptor/web/LocalStrings_zh_CN.properties | 4 ++-- .../tomcat/util/digester/LocalStrings_de.properties | 2 +- .../tomcat/util/digester/LocalStrings_ko.properties | 2 +- .../apache/tomcat/util/net/LocalStrings.properties | 2 +- .../tomcat/util/net/LocalStrings_fr.properties | 1 + .../tomcat/util/net/LocalStrings_ja.properties | 3 +++ .../tomcat/util/net/LocalStrings_zh_CN.properties| 2 +- .../tomcat/websocket/LocalStrings_zh_CN.properties | 2 +- .../websocket/pojo/LocalStrings_zh_CN.properties | 2 +- webapps/docs/changelog.xml | 6 ++ 44 files changed, 92 insertions(+), 68 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/03: Fix ordering, formatting and spelling
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 9946338ad5ced73c30a66a34c50f9ccbba5143c6
Author: Mark Thomas
AuthorDate: Thu Jun 29 14:41:28 2023 +0100
Fix ordering, formatting and spelling
---
java/jakarta/el/LocalStrings_de.properties | 2 +-
java/jakarta/el/LocalStrings_pt_BR.properties| 2 +-
.../org/apache/catalina/core/LocalStrings.properties | 14 +++---
.../apache/catalina/core/LocalStrings_es.properties | 2 +-
.../catalina/core/LocalStrings_zh_CN.properties | 4 ++--
.../apache/catalina/filters/LocalStrings.properties | 2 +-
.../catalina/filters/LocalStrings_zh_CN.properties | 4 ++--
.../catalina/manager/LocalStrings_zh_CN.properties | 2 +-
.../catalina/manager/host/LocalStrings_ru.properties | 2 +-
.../catalina/mapper/LocalStrings_zh_CN.properties| 8
.../apache/catalina/realm/LocalStrings_fr.properties | 2 +-
.../catalina/realm/LocalStrings_pt_BR.properties | 2 +-
.../catalina/realm/LocalStrings_zh_CN.properties | 2 +-
.../catalina/security/LocalStrings_fr.properties | 4 ++--
.../catalina/servlets/LocalStrings_zh_CN.properties | 2 +-
.../catalina/session/LocalStrings_zh_CN.properties | 4 ++--
.../catalina/startup/LocalStrings_ja.properties | 2 +-
.../catalina/storeconfig/LocalStrings_ja.properties | 2 +-
.../tribes/transport/LocalStrings_zh_CN.properties | 2 +-
.../catalina/util/LocalStrings_zh_CN.properties | 4 ++--
.../catalina/valves/LocalStrings_fr.properties | 2 +-
.../catalina/valves/LocalStrings_zh_CN.properties| 6 +++---
.../webresources/LocalStrings_zh_CN.properties | 2 +-
.../coyote/http2/LocalStrings_zh_CN.properties | 20 ++--
java/org/apache/el/LocalStrings_zh_CN.properties | 2 +-
.../jasper/resources/LocalStrings_zh_CN.properties | 20 ++--
.../descriptor/web/LocalStrings_zh_CN.properties | 4 ++--
.../tomcat/util/digester/LocalStrings_de.properties | 2 +-
.../tomcat/util/digester/LocalStrings_ko.properties | 2 +-
.../apache/tomcat/util/net/LocalStrings.properties | 2 +-
.../tomcat/util/net/LocalStrings_zh_CN.properties| 2 +-
.../tomcat/websocket/LocalStrings_zh_CN.properties | 2 +-
.../websocket/pojo/LocalStrings_zh_CN.properties | 2 +-
33 files changed, 68 insertions(+), 68 deletions(-)
diff --git a/java/jakarta/el/LocalStrings_de.properties
b/java/jakarta/el/LocalStrings_de.properties
index 62668d0aa1..dfa2c0bafa 100644
--- a/java/jakarta/el/LocalStrings_de.properties
+++ b/java/jakarta/el/LocalStrings_de.properties
@@ -26,7 +26,7 @@ expressionFactory.cannotCreate=Die Ausdruckfactory vom Typ
[{0}] konnte nicht er
expressionFactory.cannotFind=Die Ausdruckfactory vom Typ [{0}] konnte nicht
gefunden werden.
expressionFactory.readFailed=Fehler beim Lesen von [{0}]
-importHandler.ambiguousImport=Die Klasse {0}] konnte nicht importiert werden,
weil sie mit dem bereits durchgeführten Import von [{1}] in Konflikt steht.
+importHandler.ambiguousImport=Die Klasse [{0}] konnte nicht importiert werden,
weil sie mit dem bereits durchgeführten Import von [{1}] in Konflikt steht.
importHandler.ambiguousStaticImport=Der statische Import [{0}] konnte nicht
verarbeitet werden, weil er mit dem bereits durchgeführten Import von [{1}] in
Konflikt steht.
importHandler.classNotFound=Die Klasse [{0}] konnte nicht importiert werden,
weil sie nicht gefunden wurde.
importHandler.invalidClass=Die Klasse [{0}] muss eine öffentliche, in einem
exportierten Paket (für Java 9+), nicht abstrakte Klasse und darf keine
Schnittstelle sein.
diff --git a/java/jakarta/el/LocalStrings_pt_BR.properties
b/java/jakarta/el/LocalStrings_pt_BR.properties
index a9ccd089dd..5dd86ddea7 100644
--- a/java/jakarta/el/LocalStrings_pt_BR.properties
+++ b/java/jakarta/el/LocalStrings_pt_BR.properties
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-beanNameELResolver.beanReadOnly=O nome do bean {0}] é somente leitura
+beanNameELResolver.beanReadOnly=O nome do bean [{0}] é somente leitura
elProcessor.defineFunctionInvalidClass=A classe [{0}] não é pública
elProcessor.defineFunctionInvalidMethod=O método [{0}] na classe [{1}] não é
um método estático público
diff --git a/java/org/apache/catalina/core/LocalStrings.properties
b/java/org/apache/catalina/core/LocalStrings.properties
index 7e419226f0..a45cfbff54 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -162,14 +162,14 @@ naming.wsdlFailed=Failed to find wsdl file: [{0}]
noPluggabilityServletContext.notAllowed=Section 4.4 of the Servlet 3.0
specification does not permit this method to be called from a
ServletContextListener that was not defined in web.xml, a
[tomcat] 02/03: Back-port French translations
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 0674e9b29a1604cce14d6de3143bc086abe87b31
Author: Mark Thomas
AuthorDate: Thu Jun 29 14:44:44 2023 +0100
Back-port French translations
---
java/org/apache/catalina/core/LocalStrings_fr.properties| 2 ++
java/org/apache/catalina/filters/LocalStrings_fr.properties | 2 ++
java/org/apache/catalina/util/LocalStrings_fr.properties| 2 ++
java/org/apache/coyote/http11/LocalStrings_fr.properties| 1 +
java/org/apache/tomcat/util/net/LocalStrings_fr.properties | 1 +
webapps/docs/changelog.xml | 3 +++
6 files changed, 11 insertions(+)
diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index 670d5961cb..026c10fd56 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -281,6 +281,8 @@ standardService.stop.name=Arrêt du service [{0}]
standardThreadExecutor.notStarted=L'exécuteur n'a pas encore été démarré
+standardVirtualThreadExecutor.notStarted=L'executeur n'a pas été démarré
+
standardWrapper.allocate=Erreur d'allocation à une instance de servlet
standardWrapper.allocateException=Exception lors de l''allocation pour la
servlet [{0}]
standardWrapper.deallocateException=Exception à la désallocation pour la
servlet [{0}]
diff --git a/java/org/apache/catalina/filters/LocalStrings_fr.properties
b/java/org/apache/catalina/filters/LocalStrings_fr.properties
index bfc46ebc6f..e66f39e8bb 100644
--- a/java/org/apache/catalina/filters/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/filters/LocalStrings_fr.properties
@@ -52,6 +52,8 @@ http.403=L''accès à la ressource demandée [{0}] a été
interdit.
httpHeaderSecurityFilter.clickjack.invalid=Une valeur invalide [{0}] a été
spécifiée pour le header "anti click-jacking"
httpHeaderSecurityFilter.committed=Impossible d'ajouter les en-têtes HTTP car
la réponse a déjà été envoyée avant l'invocation du filtre de sécurité des
en-têtes
+rateLimitFilter.maxRequestsExceeded=[{0}] [{1}] requêtes de [{2}] ont excédé
le maximum autorisé de [{3}] pour une période de [{4}] secondes.
+
remoteCidrFilter.invalid=Une configuration invalide a été fournie pour [{0}],
voir les précédents messages pour les détails
remoteCidrFilter.noRemoteIp=Le client n'a pas d'adresse IP. Requête rejetée.
diff --git a/java/org/apache/catalina/util/LocalStrings_fr.properties
b/java/org/apache/catalina/util/LocalStrings_fr.properties
index d39cffd672..0b3b860b4b 100644
--- a/java/org/apache/catalina/util/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/util/LocalStrings_fr.properties
@@ -48,3 +48,5 @@ sessionIdGeneratorBase.noSHA1PRNG=L'algorithme SHA1PRNG par
défaut de SecureRan
sessionIdGeneratorBase.random=Exception durant l''initialisation de la classe
du générateur de nombre aléatoire [{0}]
sessionIdGeneratorBase.randomAlgorithm=Erreur lors de l''initialisation du
générateur de nombres aléatoires en utilisant l''algorithme [{0}]
sessionIdGeneratorBase.randomProvider=Exception lors de l''initialisation du
générateur de nombres aléatoires utilisant le fournisseur [{0}]
+
+timebucket.maintenance.error=Erreur lors du traitement de la maintenance
périodique
diff --git a/java/org/apache/coyote/http11/LocalStrings_fr.properties
b/java/org/apache/coyote/http11/LocalStrings_fr.properties
index 16453c4c91..1c419a6139 100644
--- a/java/org/apache/coyote/http11/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/http11/LocalStrings_fr.properties
@@ -47,6 +47,7 @@ iib.invalidHttpProtocol=Un caractère invalide a été trouvé
dans le protocole
iib.invalidPhase=Etape invalide de traitement [{0}] de la ligne de requête
iib.invalidRequestTarget=Un caractère invalide a été trouvé dans la cible de
la requête, les caractères valides sont définis dans RFC 7230 et RFC 3986
iib.invalidheader=La ligne d''en-être HTTP [{0}] n''est pas conforme à la RFC
7230 et a été ignorée
+iib.invalidheader.reject=La ligne d''en-tête HTTP [{0}] ne respecte pas la RFC
7230. La requête a été rejetée.
iib.invalidmethod=Caractère invalide trouvé dans le nom de méthode. Les noms
HTTP doivent être des "token".
iib.parseheaders.ise.error=Etat inattendu, les en-êtres ont déjà été traités,
il est possible que le buffer n'ait pas été recyclé
iib.readtimeout=Délai d'attente dépassé en lisant des données du socket
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
b/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
index e8eb7d3569..6ebb8bb69e 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
@@ -118,6 +118,7 @@ endpoint.tls.cert.encodingError=Les empreintes du
certificat ne sont pas disponi
end
[tomcat] 03/03: Back-port improvements to Japanese translations
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 414a10f7978669e85da563c58f43ee377da3a83c
Author: Mark Thomas
AuthorDate: Thu Jun 29 14:49:52 2023 +0100
Back-port improvements to Japanese translations
---
java/org/apache/catalina/core/LocalStrings_ja.properties| 2 ++
java/org/apache/catalina/filters/LocalStrings_ja.properties | 2 ++
java/org/apache/catalina/util/LocalStrings_ja.properties| 2 ++
java/org/apache/coyote/http11/LocalStrings_ja.properties| 1 +
java/org/apache/tomcat/util/net/LocalStrings_ja.properties | 3 +++
webapps/docs/changelog.xml | 3 +++
6 files changed, 13 insertions(+)
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index c03d538b3a..5aeca8720d 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -288,6 +288,8 @@ standardService.stop.name=サービス [{0}] を停止します
standardThreadExecutor.notStarted=エグゼキュターは開始ししていません。
+standardVirtualThreadExecutor.notStarted=エグゼキュータが起動されていません
+
standardWrapper.allocate=サーブレットインスタンスを割り当て中のエラーです
standardWrapper.allocateException=サーブレット [{0}] に例外を割り当てます
standardWrapper.deallocateException=サーブレット [{0}] に対する例外の割り当てを解除します
diff --git a/java/org/apache/catalina/filters/LocalStrings_ja.properties
b/java/org/apache/catalina/filters/LocalStrings_ja.properties
index cff0e91340..dc4ebcae7b 100644
--- a/java/org/apache/catalina/filters/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/filters/LocalStrings_ja.properties
@@ -52,6 +52,8 @@ http.403=指定されたリソース [{0}] へのアクセスは拒否されま
httpHeaderSecurityFilter.clickjack.invalid=クリックジャッキングヘッダーに無効な値 [{0}] が指定されました
httpHeaderSecurityFilter.committed=HTTP
ヘッダーセキュリティフィルターへの入力時に既に応答がコミットされているため、HTTP ヘッダーを追加できません
+rateLimitFilter.maxRequestsExceeded=[{0}] [{1}] [{2}] からのリクエストが、[{4}]
秒のウィンドウで許可される最大値 [{3}] を超えました。
+
remoteCidrFilter.invalid=[{0}] に不正な値が指定されました。詳細は直前のメッセージを参照してください。
remoteCidrFilter.noRemoteIp=クライアントは IP アドレスを持っていません。リクエストを拒否します。
diff --git a/java/org/apache/catalina/util/LocalStrings_ja.properties
b/java/org/apache/catalina/util/LocalStrings_ja.properties
index 729a3b0492..f24fbbf936 100644
--- a/java/org/apache/catalina/util/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/util/LocalStrings_ja.properties
@@ -53,3 +53,5 @@ sessionIdGeneratorBase.noSHA1PRNG=SecureRandom の既定の SHA1PRNG
アルゴ
sessionIdGeneratorBase.random=クラス [{0}] の乱数発生器の初期化の例外です
sessionIdGeneratorBase.randomAlgorithm=アルゴリズム [{0}] を使用して乱数ジェネレータを初期化する際の例外
sessionIdGeneratorBase.randomProvider=プロバイダ [{0}] を使用して乱数ジェネレータを初期化中に例外が発生しました
+
+timebucket.maintenance.error=定期メンテナンスの処理中にエラーが発生しました
diff --git a/java/org/apache/coyote/http11/LocalStrings_ja.properties
b/java/org/apache/coyote/http11/LocalStrings_ja.properties
index c77d8069aa..1b29ac7586 100644
--- a/java/org/apache/coyote/http11/LocalStrings_ja.properties
+++ b/java/org/apache/coyote/http11/LocalStrings_ja.properties
@@ -47,6 +47,7 @@ iib.invalidHttpProtocol=HTTPプロトコルで無効な文字が見つかりま
iib.invalidPhase=リクエスト行の解析フェーズ [{0}] は無効です
iib.invalidRequestTarget=リクエストの宛先 [{0}] に無効な文字が含まれています。利用可能な文字は RFC 7230 および
RFC 3986 に定義されています。
iib.invalidheader=HTTP ヘッダー行 [{0}]は RFC 7230 に適合しないため無視します。
+iib.invalidheader.reject=HTTP ヘッダーの [{0}] 行目は RFC 7230 に準拠していません。リクエストは拒否されました。
iib.invalidmethod=HTTP メソッド名 [{0}] に無効な文字が含まれています。HTTP
メソッド名は決められたトークンでなければなりません
iib.parseheaders.ise.error=予期しない状態：ヘッダがすでに解析されています。バッファが未回収ですか？
iib.readtimeout=ソケットからデータを読み取ろうとしている際のタイムアウト
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
b/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
index d2277b2307..1a1544a1e3 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
@@ -131,6 +131,9 @@ endpoint.socketOptionsError=ソケットオプション設定中のエラー
endpoint.timeout.err=ソケットタイムアウト処理中のエラー
endpoint.tls.cert.encodingError=証明書のフィンガープリントが利用できません
endpoint.tls.cert.noCerts=SSLContext から返された証明書チェーンが空だったため、証明書の詳細を利用できません
+endpoint.tls.info=トラストストア [{4}] を使用して {3} から構成されたコネクタ [{0}]、TLS 仮想ホスト
[{1}]、および証明書タイプ [{2}]
+endpoint.tls.info.cert.keystore=エイリアス [{1}] を使用したキーストア [{0}]
+endpoint.tls.info.cert.pem=キー [{0}]、証明書 [{1}]、および証明書チェーン [{2}]
endpoint.unknownSslHostName=SSL ホスト名 [{0}] はこのエンドポイントから認識されていません。
endpoint.warn.executorShutdown=スレッドプール [{0}]
と関連付けられたエグゼキューターは完全に停止できませんでした。いくつかのアプリケーションスレッドはまだ動作し続けている可能性があります。
endpoint.warn.incorrectConnectionCount=不正なコネクション数。複数のsocket.closeが同じソケットで呼び出されました。
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0980679854..43ef25d42d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -179,6 +179,9 @@
Improvements to French translations. (remm)
+
+Im
[tomcat] branch 9.0.x updated (9075b4b5ed -> 414a10f797)
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 9075b4b5ed Fix various Checkstyle and IDE warnings new e2e05fb5ba Fix ordering, formatting and spelling new 71f33ee25f Back-port improvements to French translations new 414a10f797 Back-port improvements to Japanese translations The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: java/javax/el/LocalStrings_de.properties | 2 +- java/javax/el/LocalStrings_pt_BR.properties | 2 +- .../org/apache/catalina/core/LocalStrings.properties | 14 +++--- .../apache/catalina/core/LocalStrings_es.properties | 2 +- .../apache/catalina/core/LocalStrings_fr.properties | 2 ++ .../apache/catalina/core/LocalStrings_ja.properties | 2 ++ .../catalina/core/LocalStrings_zh_CN.properties | 4 ++-- .../apache/catalina/filters/LocalStrings.properties | 2 +- .../catalina/filters/LocalStrings_fr.properties | 2 ++ .../catalina/filters/LocalStrings_ja.properties | 2 ++ .../catalina/filters/LocalStrings_zh_CN.properties | 4 ++-- .../catalina/manager/LocalStrings_zh_CN.properties | 2 +- .../catalina/manager/host/LocalStrings_ru.properties | 2 +- .../catalina/mapper/LocalStrings_zh_CN.properties| 8 .../apache/catalina/realm/LocalStrings_fr.properties | 2 +- .../catalina/realm/LocalStrings_pt_BR.properties | 2 +- .../catalina/realm/LocalStrings_zh_CN.properties | 2 +- .../catalina/security/LocalStrings_fr.properties | 4 ++-- .../catalina/servlets/LocalStrings_zh_CN.properties | 2 +- .../catalina/session/LocalStrings_zh_CN.properties | 4 ++-- .../catalina/startup/LocalStrings_ja.properties | 2 +- .../catalina/storeconfig/LocalStrings_ja.properties | 2 +- .../tribes/transport/LocalStrings_zh_CN.properties | 2 +- .../apache/catalina/util/LocalStrings_fr.properties | 2 ++ .../apache/catalina/util/LocalStrings_ja.properties | 2 ++ .../catalina/util/LocalStrings_zh_CN.properties | 4 ++-- .../catalina/valves/LocalStrings_fr.properties | 2 +- .../catalina/valves/LocalStrings_zh_CN.properties| 6 +++--- .../webresources/LocalStrings_zh_CN.properties | 2 +- .../apache/coyote/http11/LocalStrings_fr.properties | 1 + .../apache/coyote/http11/LocalStrings_ja.properties | 1 + .../coyote/http2/LocalStrings_zh_CN.properties | 20 ++-- .../jasper/resources/LocalStrings_zh_CN.properties | 20 ++-- .../tomcat/util/compat/LocalStrings.properties | 2 +- .../descriptor/web/LocalStrings_zh_CN.properties | 4 ++-- .../tomcat/util/digester/LocalStrings_de.properties | 2 +- .../tomcat/util/digester/LocalStrings_ko.properties | 2 +- .../apache/tomcat/util/net/LocalStrings.properties | 2 +- .../tomcat/util/net/LocalStrings_fr.properties | 1 + .../tomcat/util/net/LocalStrings_ja.properties | 3 +++ .../tomcat/util/net/LocalStrings_zh_CN.properties| 2 +- .../websocket/pojo/LocalStrings_zh_CN.properties | 2 +- webapps/docs/changelog.xml | 6 ++ 43 files changed, 91 insertions(+), 67 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/03: Back-port improvements to French translations
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 71f33ee25f5cf41f96dae1d49120b94c188ca15d
Author: Mark Thomas
AuthorDate: Thu Jun 29 14:49:31 2023 +0100
Back-port improvements to French translations
---
java/org/apache/catalina/core/LocalStrings_fr.properties| 2 ++
java/org/apache/catalina/filters/LocalStrings_fr.properties | 2 ++
java/org/apache/catalina/util/LocalStrings_fr.properties| 2 ++
java/org/apache/coyote/http11/LocalStrings_fr.properties| 1 +
java/org/apache/tomcat/util/net/LocalStrings_fr.properties | 1 +
webapps/docs/changelog.xml | 3 +++
6 files changed, 11 insertions(+)
diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index 22b4d50783..3dd8b98b19 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -288,6 +288,8 @@ standardService.stop.name=Arrêt du service [{0}]
standardThreadExecutor.notStarted=L'exécuteur n'a pas encore été démarré
+standardVirtualThreadExecutor.notStarted=L'executeur n'a pas été démarré
+
standardWrapper.allocate=Erreur d'allocation à une instance de servlet
standardWrapper.allocateException=Exception lors de l''allocation pour la
servlet [{0}]
standardWrapper.deallocateException=Exception à la désallocation pour la
servlet [{0}]
diff --git a/java/org/apache/catalina/filters/LocalStrings_fr.properties
b/java/org/apache/catalina/filters/LocalStrings_fr.properties
index bfc46ebc6f..e66f39e8bb 100644
--- a/java/org/apache/catalina/filters/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/filters/LocalStrings_fr.properties
@@ -52,6 +52,8 @@ http.403=L''accès à la ressource demandée [{0}] a été
interdit.
httpHeaderSecurityFilter.clickjack.invalid=Une valeur invalide [{0}] a été
spécifiée pour le header "anti click-jacking"
httpHeaderSecurityFilter.committed=Impossible d'ajouter les en-têtes HTTP car
la réponse a déjà été envoyée avant l'invocation du filtre de sécurité des
en-têtes
+rateLimitFilter.maxRequestsExceeded=[{0}] [{1}] requêtes de [{2}] ont excédé
le maximum autorisé de [{3}] pour une période de [{4}] secondes.
+
remoteCidrFilter.invalid=Une configuration invalide a été fournie pour [{0}],
voir les précédents messages pour les détails
remoteCidrFilter.noRemoteIp=Le client n'a pas d'adresse IP. Requête rejetée.
diff --git a/java/org/apache/catalina/util/LocalStrings_fr.properties
b/java/org/apache/catalina/util/LocalStrings_fr.properties
index 04dfd8765e..0a6fd3a143 100644
--- a/java/org/apache/catalina/util/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/util/LocalStrings_fr.properties
@@ -53,3 +53,5 @@ sessionIdGeneratorBase.noSHA1PRNG=L'algorithme SHA1PRNG par
défaut de SecureRan
sessionIdGeneratorBase.random=Exception durant l''initialisation de la classe
du générateur de nombre aléatoire [{0}]
sessionIdGeneratorBase.randomAlgorithm=Erreur lors de l''initialisation du
générateur de nombres aléatoires en utilisant l''algorithme [{0}]
sessionIdGeneratorBase.randomProvider=Exception lors de l''initialisation du
générateur de nombres aléatoires utilisant le fournisseur [{0}]
+
+timebucket.maintenance.error=Erreur lors du traitement de la maintenance
périodique
diff --git a/java/org/apache/coyote/http11/LocalStrings_fr.properties
b/java/org/apache/coyote/http11/LocalStrings_fr.properties
index 16453c4c91..1c419a6139 100644
--- a/java/org/apache/coyote/http11/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/http11/LocalStrings_fr.properties
@@ -47,6 +47,7 @@ iib.invalidHttpProtocol=Un caractère invalide a été trouvé
dans le protocole
iib.invalidPhase=Etape invalide de traitement [{0}] de la ligne de requête
iib.invalidRequestTarget=Un caractère invalide a été trouvé dans la cible de
la requête, les caractères valides sont définis dans RFC 7230 et RFC 3986
iib.invalidheader=La ligne d''en-être HTTP [{0}] n''est pas conforme à la RFC
7230 et a été ignorée
+iib.invalidheader.reject=La ligne d''en-tête HTTP [{0}] ne respecte pas la RFC
7230. La requête a été rejetée.
iib.invalidmethod=Caractère invalide trouvé dans le nom de méthode. Les noms
HTTP doivent être des "token".
iib.parseheaders.ise.error=Etat inattendu, les en-êtres ont déjà été traités,
il est possible que le buffer n'ait pas été recyclé
iib.readtimeout=Délai d'attente dépassé en lisant des données du socket
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
b/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
index 876b855671..40665ea38d 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
@@ -133,6 +133,7 @@ endpoint.tls.cert.encodingError=Les empreintes du
certificat ne sont p
[tomcat] 01/03: Fix ordering, formatting and spelling
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit e2e05fb5babb7b4df6031f14772ec9a88101e1c2
Author: Mark Thomas
AuthorDate: Thu Jun 29 14:48:32 2023 +0100
Fix ordering, formatting and spelling
---
java/javax/el/LocalStrings_de.properties | 2 +-
java/javax/el/LocalStrings_pt_BR.properties | 2 +-
.../org/apache/catalina/core/LocalStrings.properties | 14 +++---
.../apache/catalina/core/LocalStrings_es.properties | 2 +-
.../catalina/core/LocalStrings_zh_CN.properties | 4 ++--
.../apache/catalina/filters/LocalStrings.properties | 2 +-
.../catalina/filters/LocalStrings_zh_CN.properties | 4 ++--
.../catalina/manager/LocalStrings_zh_CN.properties | 2 +-
.../catalina/manager/host/LocalStrings_ru.properties | 2 +-
.../catalina/mapper/LocalStrings_zh_CN.properties| 8
.../apache/catalina/realm/LocalStrings_fr.properties | 2 +-
.../catalina/realm/LocalStrings_pt_BR.properties | 2 +-
.../catalina/realm/LocalStrings_zh_CN.properties | 2 +-
.../catalina/security/LocalStrings_fr.properties | 4 ++--
.../catalina/servlets/LocalStrings_zh_CN.properties | 2 +-
.../catalina/session/LocalStrings_zh_CN.properties | 4 ++--
.../catalina/startup/LocalStrings_ja.properties | 2 +-
.../catalina/storeconfig/LocalStrings_ja.properties | 2 +-
.../tribes/transport/LocalStrings_zh_CN.properties | 2 +-
.../catalina/util/LocalStrings_zh_CN.properties | 4 ++--
.../catalina/valves/LocalStrings_fr.properties | 2 +-
.../catalina/valves/LocalStrings_zh_CN.properties| 6 +++---
.../webresources/LocalStrings_zh_CN.properties | 2 +-
.../coyote/http2/LocalStrings_zh_CN.properties | 20 ++--
.../jasper/resources/LocalStrings_zh_CN.properties | 20 ++--
.../tomcat/util/compat/LocalStrings.properties | 2 +-
.../descriptor/web/LocalStrings_zh_CN.properties | 4 ++--
.../tomcat/util/digester/LocalStrings_de.properties | 2 +-
.../tomcat/util/digester/LocalStrings_ko.properties | 2 +-
.../apache/tomcat/util/net/LocalStrings.properties | 2 +-
.../tomcat/util/net/LocalStrings_zh_CN.properties| 2 +-
.../websocket/pojo/LocalStrings_zh_CN.properties | 2 +-
32 files changed, 67 insertions(+), 67 deletions(-)
diff --git a/java/javax/el/LocalStrings_de.properties
b/java/javax/el/LocalStrings_de.properties
index 16fe8c0f89..68613c42f1 100644
--- a/java/javax/el/LocalStrings_de.properties
+++ b/java/javax/el/LocalStrings_de.properties
@@ -26,7 +26,7 @@ expressionFactory.cannotCreate=Die Ausdruckfactory vom Typ
[{0}] konnte nicht er
expressionFactory.cannotFind=Die Ausdruckfactory vom Typ [{0}] konnte nicht
gefunden werden.
expressionFactory.readFailed=Fehler beim Lesen von [{0}]
-importHandler.ambiguousImport=Die Klasse {0}] konnte nicht importiert werden,
weil sie mit dem bereits durchgeführten Import von [{1}] in Konflikt steht.
+importHandler.ambiguousImport=Die Klasse [{0}] konnte nicht importiert werden,
weil sie mit dem bereits durchgeführten Import von [{1}] in Konflikt steht.
importHandler.ambiguousStaticImport=Der statische Import [{0}] konnte nicht
verarbeitet werden, weil er mit dem bereits durchgeführten Import von [{1}] in
Konflikt steht.
importHandler.classNotFound=Die Klasse [{0}] konnte nicht importiert werden,
weil sie nicht gefunden wurde.
importHandler.invalidClassName=Der Name der zu importierenden Klasse [{0}]
muss ein Paket enthalten.
diff --git a/java/javax/el/LocalStrings_pt_BR.properties
b/java/javax/el/LocalStrings_pt_BR.properties
index e270c49038..06eb816d0d 100644
--- a/java/javax/el/LocalStrings_pt_BR.properties
+++ b/java/javax/el/LocalStrings_pt_BR.properties
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-beanNameELResolver.beanReadOnly=O nome do bean {0}] é somente leitura
+beanNameELResolver.beanReadOnly=O nome do bean [{0}] é somente leitura
elProcessor.defineFunctionInvalidClass=A classe [{0}] não é pública
elProcessor.defineFunctionInvalidMethod=O método [{0}] na classe [{1}] não é
um método estático público
diff --git a/java/org/apache/catalina/core/LocalStrings.properties
b/java/org/apache/catalina/core/LocalStrings.properties
index 744a93b31b..8f71f2d9b6 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -168,14 +168,14 @@ naming.wsdlFailed=Failed to find wsdl file: [{0}]
noPluggabilityServletContext.notAllowed=Section 4.4 of the Servlet 3.0
specification does not permit this method to be called from a
ServletContextListener that was not defined in web.xml, a web-fragment.xml file
nor annotated with @WebListener
-pushBuilder.noPath=It is illegal to call push() before setting a path
-
-propertiesRoleMa
[tomcat] branch main updated: Simplify
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 6391070013 Simplify
6391070013 is described below
commit 6391070013753c73e2019badb55a3ee2a59b9946
Author: remm
AuthorDate: Thu Jun 29 15:54:17 2023 +0200
Simplify
Also avoid falling back always to getSource().getResource since it will
produce a misleading error when actually using the prefix (which looks
like a uri).
---
java/org/apache/catalina/Context.java | 2 ++
.../core/PropertiesRoleMappingListener.java| 31 +++---
2 files changed, 6 insertions(+), 27 deletions(-)
diff --git a/java/org/apache/catalina/Context.java
b/java/org/apache/catalina/Context.java
index 4be9f8f72c..243be85ea7 100644
--- a/java/org/apache/catalina/Context.java
+++ b/java/org/apache/catalina/Context.java
@@ -16,6 +16,7 @@
*/
package org.apache.catalina;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.net.URISyntaxException;
@@ -1997,6 +1998,7 @@ public interface Context extends Container, ContextBind {
stream.close();
}
}
+throw new FileNotFoundException(name);
}
return ConfigFileLoader.getSource().getResource(name);
}
diff --git a/java/org/apache/catalina/core/PropertiesRoleMappingListener.java
b/java/org/apache/catalina/core/PropertiesRoleMappingListener.java
index 10a5d7215c..00ddc5b4af 100644
--- a/java/org/apache/catalina/core/PropertiesRoleMappingListener.java
+++ b/java/org/apache/catalina/core/PropertiesRoleMappingListener.java
@@ -16,9 +16,7 @@
*/
package org.apache.catalina.core;
-import java.io.FileNotFoundException;
import java.io.IOException;
-import java.io.InputStream;
import java.util.Map.Entry;
import java.util.Objects;
import java.util.Properties;
@@ -30,6 +28,7 @@ import org.apache.catalina.LifecycleListener;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.file.ConfigFileLoader;
+import org.apache.tomcat.util.file.ConfigurationSource.Resource;
import org.apache.tomcat.util.res.StringManager;
/**
@@ -107,32 +106,10 @@ public class PropertiesRoleMappingListener implements
LifecycleListener {
log.warn(sm.getString("listener.notContext",
event.getLifecycle().getClass().getSimpleName()));
return;
}
-Context context = (Context) event.getLifecycle();
-
-InputStream is;
-if (roleMappingFile.startsWith(WEBAPP_PROTOCOL)) {
-String path =
roleMappingFile.substring(WEBAPP_PROTOCOL.length());
-is = context.getServletContext().getResourceAsStream(path);
-} else {
-try {
-is =
ConfigFileLoader.getSource().getResource(roleMappingFile).getInputStream();
-} catch (FileNotFoundException e1) {
-is = null;
-} catch (IOException e2) {
-throw new IllegalStateException(
-
sm.getString("propertiesRoleMappingListener.roleMappingFileFail",
roleMappingFile), e2);
-}
-}
-
-if (is == null) {
-throw new IllegalStateException(
-
sm.getString("propertiesRoleMappingListener.roleMappingFileNotFound",
roleMappingFile));
-}
-
Properties props = new Properties();
-
-try (InputStream _is = is) {
-props.load(_is);
+Context context = (Context) event.getLifecycle();
+try (Resource resource =
context.findConfigFileResource(roleMappingFile)) {
+props.load(resource.getInputStream());
} catch (IOException e) {
throw new IllegalStateException(
sm.getString("propertiesRoleMappingListener.roleMappingFileFail",
roleMappingFile), e);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Add utlity config file resource lookup
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new c2b225297e Add utlity config file resource lookup
c2b225297e is described below
commit c2b225297e16d019c26f7fb99ac32baa9bae757d
Author: remm
AuthorDate: Thu Jun 29 15:59:36 2023 +0200
Add utlity config file resource lookup
Located on Context to allow looking up resources from the webapp
(prefixed with "webapp:") and make the resource lookup API more visible.
---
java/org/apache/catalina/Context.java | 40 +++
webapps/docs/changelog.xml| 6 ++
2 files changed, 46 insertions(+)
diff --git a/java/org/apache/catalina/Context.java
b/java/org/apache/catalina/Context.java
index d8b286b358..f9ebfe3340 100644
--- a/java/org/apache/catalina/Context.java
+++ b/java/org/apache/catalina/Context.java
@@ -16,6 +16,10 @@
*/
package org.apache.catalina;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URISyntaxException;
import java.net.URL;
import java.util.Locale;
import java.util.Map;
@@ -38,6 +42,8 @@ import org.apache.tomcat.util.descriptor.web.FilterDef;
import org.apache.tomcat.util.descriptor.web.FilterMap;
import org.apache.tomcat.util.descriptor.web.LoginConfig;
import org.apache.tomcat.util.descriptor.web.SecurityConstraint;
+import org.apache.tomcat.util.file.ConfigFileLoader;
+import org.apache.tomcat.util.file.ConfigurationSource.Resource;
import org.apache.tomcat.util.http.CookieProcessor;
/**
@@ -84,6 +90,12 @@ public interface Context extends Container, ContextBind {
String CHANGE_SESSION_ID_EVENT = "changeSessionId";
+/**
+ * Prefix for resource lookup.
+ */
+String WEBAPP_PROTOCOL = "webapp:";
+
+
// - Properties
/**
@@ -1955,6 +1967,34 @@ public interface Context extends Container, ContextBind {
void setDispatcherWrapsSameObject(boolean dispatcherWrapsSameObject);
+/**
+ * Find configuration file with the specified path, first looking into the
+ * webapp resources, then delegating to
+ * ConfigFileLoader.getSource().getResource. The
+ * WEBAPP_PROTOCOL constant prefix is used to denote webapp
+ * resources.
+ * @param name The resource name
+ * @return the resource
+ * @throws IOException if an error occurs or if the resource does not exist
+ */
+default Resource findConfigFileResource(String name) throws IOException {
+if (name.startsWith(WEBAPP_PROTOCOL)) {
+String path = name.substring(WEBAPP_PROTOCOL.length());
+WebResource resource = getResources().getResource(path);
+if (resource.canRead() && resource.isFile()) {
+InputStream stream = resource.getInputStream();
+try {
+return new Resource(stream, resource.getURL().toURI());
+} catch (URISyntaxException e) {
+stream.close();
+}
+}
+throw new FileNotFoundException(name);
+}
+return ConfigFileLoader.getSource().getResource(name);
+}
+
+
/**
* @return true if the resources archive lookup will
* use a bloom filter.
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b444044e79..4690a18e38 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -124,6 +124,12 @@
if the web applications were deliberately crafted to allow it even when
allowLinking was set to false. (markt)
+
+Add utlity config file resource lookup on Context to allow
+looking up resources from the webapp (prefixed with
+webapp:) and make the resource lookup API more visible.
+(remm)
+
-
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: Add utlity config file resource lookup
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 f3d7b7a829 Add utlity config file resource lookup
f3d7b7a829 is described below
commit f3d7b7a8291f43cf5bd925efce6e5eb4889abf40
Author: remm
AuthorDate: Thu Jun 29 15:59:36 2023 +0200
Add utlity config file resource lookup
Located on Context to allow looking up resources from the webapp
(prefixed with "webapp:") and make the resource lookup API more visible.
---
java/org/apache/catalina/Context.java | 40 +++
webapps/docs/changelog.xml| 6 ++
2 files changed, 46 insertions(+)
diff --git a/java/org/apache/catalina/Context.java
b/java/org/apache/catalina/Context.java
index 4b35db7291..484fb582ae 100644
--- a/java/org/apache/catalina/Context.java
+++ b/java/org/apache/catalina/Context.java
@@ -16,6 +16,10 @@
*/
package org.apache.catalina;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URISyntaxException;
import java.net.URL;
import java.util.Locale;
import java.util.Map;
@@ -38,6 +42,8 @@ import org.apache.tomcat.util.descriptor.web.FilterDef;
import org.apache.tomcat.util.descriptor.web.FilterMap;
import org.apache.tomcat.util.descriptor.web.LoginConfig;
import org.apache.tomcat.util.descriptor.web.SecurityConstraint;
+import org.apache.tomcat.util.file.ConfigFileLoader;
+import org.apache.tomcat.util.file.ConfigurationSource.Resource;
import org.apache.tomcat.util.http.CookieProcessor;
/**
@@ -84,6 +90,12 @@ public interface Context extends Container, ContextBind {
String CHANGE_SESSION_ID_EVENT = "changeSessionId";
+/**
+ * Prefix for resource lookup.
+ */
+String WEBAPP_PROTOCOL = "webapp:";
+
+
// - Properties
/**
@@ -1928,6 +1940,34 @@ public interface Context extends Container, ContextBind {
boolean getCreateUploadTargets();
+/**
+ * Find configuration file with the specified path, first looking into the
+ * webapp resources, then delegating to
+ * ConfigFileLoader.getSource().getResource. The
+ * WEBAPP_PROTOCOL constant prefix is used to denote webapp
+ * resources.
+ * @param name The resource name
+ * @return the resource
+ * @throws IOException if an error occurs or if the resource does not exist
+ */
+default Resource findConfigFileResource(String name) throws IOException {
+if (name.startsWith(WEBAPP_PROTOCOL)) {
+String path = name.substring(WEBAPP_PROTOCOL.length());
+WebResource resource = getResources().getResource(path);
+if (resource.canRead() && resource.isFile()) {
+InputStream stream = resource.getInputStream();
+try {
+return new Resource(stream, resource.getURL().toURI());
+} catch (URISyntaxException e) {
+stream.close();
+}
+}
+throw new FileNotFoundException(name);
+}
+return ConfigFileLoader.getSource().getResource(name);
+}
+
+
/**
* @return true if the resources archive lookup will
* use a bloom filter.
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 43ef25d42d..ef9cc26b8c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -124,6 +124,12 @@
if the web applications were deliberately crafted to allow it even when
allowLinking was set to false. (markt)
+
+Add utlity config file resource lookup on Context to allow
+looking up resources from the webapp (prefixed with
+webapp:) and make the resource lookup API more visible.
+(remm)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Simplify
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 437b57f30e Simplify
437b57f30e is described below
commit 437b57f30e999c813e09268d3435543c06afd361
Author: remm
AuthorDate: Thu Jun 29 15:54:17 2023 +0200
Simplify
Also avoid falling back always to getSource().getResource since it will
produce a misleading error when actually using the prefix (which looks
like a uri).
---
.../core/PropertiesRoleMappingListener.java| 31 +++---
1 file changed, 4 insertions(+), 27 deletions(-)
diff --git a/java/org/apache/catalina/core/PropertiesRoleMappingListener.java
b/java/org/apache/catalina/core/PropertiesRoleMappingListener.java
index 10a5d7215c..00ddc5b4af 100644
--- a/java/org/apache/catalina/core/PropertiesRoleMappingListener.java
+++ b/java/org/apache/catalina/core/PropertiesRoleMappingListener.java
@@ -16,9 +16,7 @@
*/
package org.apache.catalina.core;
-import java.io.FileNotFoundException;
import java.io.IOException;
-import java.io.InputStream;
import java.util.Map.Entry;
import java.util.Objects;
import java.util.Properties;
@@ -30,6 +28,7 @@ import org.apache.catalina.LifecycleListener;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.file.ConfigFileLoader;
+import org.apache.tomcat.util.file.ConfigurationSource.Resource;
import org.apache.tomcat.util.res.StringManager;
/**
@@ -107,32 +106,10 @@ public class PropertiesRoleMappingListener implements
LifecycleListener {
log.warn(sm.getString("listener.notContext",
event.getLifecycle().getClass().getSimpleName()));
return;
}
-Context context = (Context) event.getLifecycle();
-
-InputStream is;
-if (roleMappingFile.startsWith(WEBAPP_PROTOCOL)) {
-String path =
roleMappingFile.substring(WEBAPP_PROTOCOL.length());
-is = context.getServletContext().getResourceAsStream(path);
-} else {
-try {
-is =
ConfigFileLoader.getSource().getResource(roleMappingFile).getInputStream();
-} catch (FileNotFoundException e1) {
-is = null;
-} catch (IOException e2) {
-throw new IllegalStateException(
-
sm.getString("propertiesRoleMappingListener.roleMappingFileFail",
roleMappingFile), e2);
-}
-}
-
-if (is == null) {
-throw new IllegalStateException(
-
sm.getString("propertiesRoleMappingListener.roleMappingFileNotFound",
roleMappingFile));
-}
-
Properties props = new Properties();
-
-try (InputStream _is = is) {
-props.load(_is);
+Context context = (Context) event.getLifecycle();
+try (Resource resource =
context.findConfigFileResource(roleMappingFile)) {
+props.load(resource.getInputStream());
} catch (IOException e) {
throw new IllegalStateException(
sm.getString("propertiesRoleMappingListener.roleMappingFileFail",
roleMappingFile), e);
-
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: Simplify
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 2f6e965b11 Simplify
2f6e965b11 is described below
commit 2f6e965b1142236407c34ea12cb94ad5d62b8745
Author: remm
AuthorDate: Thu Jun 29 15:54:17 2023 +0200
Simplify
Also avoid falling back always to getSource().getResource since it will
produce a misleading error when actually using the prefix (which looks
like a uri).
---
.../core/PropertiesRoleMappingListener.java| 31 +++---
1 file changed, 4 insertions(+), 27 deletions(-)
diff --git a/java/org/apache/catalina/core/PropertiesRoleMappingListener.java
b/java/org/apache/catalina/core/PropertiesRoleMappingListener.java
index 10a5d7215c..00ddc5b4af 100644
--- a/java/org/apache/catalina/core/PropertiesRoleMappingListener.java
+++ b/java/org/apache/catalina/core/PropertiesRoleMappingListener.java
@@ -16,9 +16,7 @@
*/
package org.apache.catalina.core;
-import java.io.FileNotFoundException;
import java.io.IOException;
-import java.io.InputStream;
import java.util.Map.Entry;
import java.util.Objects;
import java.util.Properties;
@@ -30,6 +28,7 @@ import org.apache.catalina.LifecycleListener;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.file.ConfigFileLoader;
+import org.apache.tomcat.util.file.ConfigurationSource.Resource;
import org.apache.tomcat.util.res.StringManager;
/**
@@ -107,32 +106,10 @@ public class PropertiesRoleMappingListener implements
LifecycleListener {
log.warn(sm.getString("listener.notContext",
event.getLifecycle().getClass().getSimpleName()));
return;
}
-Context context = (Context) event.getLifecycle();
-
-InputStream is;
-if (roleMappingFile.startsWith(WEBAPP_PROTOCOL)) {
-String path =
roleMappingFile.substring(WEBAPP_PROTOCOL.length());
-is = context.getServletContext().getResourceAsStream(path);
-} else {
-try {
-is =
ConfigFileLoader.getSource().getResource(roleMappingFile).getInputStream();
-} catch (FileNotFoundException e1) {
-is = null;
-} catch (IOException e2) {
-throw new IllegalStateException(
-
sm.getString("propertiesRoleMappingListener.roleMappingFileFail",
roleMappingFile), e2);
-}
-}
-
-if (is == null) {
-throw new IllegalStateException(
-
sm.getString("propertiesRoleMappingListener.roleMappingFileNotFound",
roleMappingFile));
-}
-
Properties props = new Properties();
-
-try (InputStream _is = is) {
-props.load(_is);
+Context context = (Context) event.getLifecycle();
+try (Resource resource =
context.findConfigFileResource(roleMappingFile)) {
+props.load(resource.getInputStream());
} catch (IOException e) {
throw new IllegalStateException(
sm.getString("propertiesRoleMappingListener.roleMappingFileFail",
roleMappingFile), e);
-
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: Fix ordering, formatting and spelling
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 cb54037d0d Fix ordering, formatting and spelling
cb54037d0d is described below
commit cb54037d0d1c19c2fd8f61645a78b34c574b7a02
Author: Mark Thomas
AuthorDate: Thu Jun 29 15:11:13 2023 +0100
Fix ordering, formatting and spelling
---
java/javax/el/LocalStrings_de.properties | 2 +-
.../org/apache/catalina/core/LocalStrings.properties | 14 +++---
.../apache/catalina/core/LocalStrings_es.properties | 2 +-
.../catalina/core/LocalStrings_zh_CN.properties | 13 +++--
.../apache/catalina/filters/LocalStrings.properties | 2 +-
.../catalina/filters/LocalStrings_zh_CN.properties | 4 ++--
.../catalina/manager/LocalStrings_zh_CN.properties | 2 +-
.../catalina/manager/host/LocalStrings_ru.properties | 2 +-
.../catalina/mapper/LocalStrings_zh_CN.properties| 6 +++---
.../apache/catalina/realm/LocalStrings_fr.properties | 2 +-
.../catalina/realm/LocalStrings_zh_CN.properties | 2 +-
.../catalina/security/LocalStrings_fr.properties | 4 ++--
.../catalina/servlets/LocalStrings_zh_CN.properties | 2 +-
.../catalina/session/LocalStrings_zh_CN.properties | 4 ++--
.../catalina/startup/LocalStrings_ja.properties | 2 +-
.../tribes/transport/LocalStrings_zh_CN.properties | 2 +-
.../catalina/util/LocalStrings_zh_CN.properties | 4 ++--
.../catalina/valves/LocalStrings_fr.properties | 2 +-
.../catalina/valves/LocalStrings_zh_CN.properties| 6 +++---
.../webresources/LocalStrings_zh_CN.properties | 2 +-
.../coyote/http2/LocalStrings_zh_CN.properties | 20 ++--
.../jasper/resources/LocalStrings_zh_CN.properties | 20 ++--
.../tomcat/util/compat/LocalStrings.properties | 2 +-
.../descriptor/web/LocalStrings_zh_CN.properties | 4 ++--
.../tomcat/util/digester/LocalStrings_de.properties | 2 +-
.../apache/tomcat/util/net/LocalStrings.properties | 2 +-
.../tomcat/util/net/LocalStrings_zh_CN.properties| 2 +-
.../websocket/pojo/LocalStrings_zh_CN.properties | 2 +-
28 files changed, 71 insertions(+), 62 deletions(-)
diff --git a/java/javax/el/LocalStrings_de.properties
b/java/javax/el/LocalStrings_de.properties
index 16fe8c0f89..68613c42f1 100644
--- a/java/javax/el/LocalStrings_de.properties
+++ b/java/javax/el/LocalStrings_de.properties
@@ -26,7 +26,7 @@ expressionFactory.cannotCreate=Die Ausdruckfactory vom Typ
[{0}] konnte nicht er
expressionFactory.cannotFind=Die Ausdruckfactory vom Typ [{0}] konnte nicht
gefunden werden.
expressionFactory.readFailed=Fehler beim Lesen von [{0}]
-importHandler.ambiguousImport=Die Klasse {0}] konnte nicht importiert werden,
weil sie mit dem bereits durchgeführten Import von [{1}] in Konflikt steht.
+importHandler.ambiguousImport=Die Klasse [{0}] konnte nicht importiert werden,
weil sie mit dem bereits durchgeführten Import von [{1}] in Konflikt steht.
importHandler.ambiguousStaticImport=Der statische Import [{0}] konnte nicht
verarbeitet werden, weil er mit dem bereits durchgeführten Import von [{1}] in
Konflikt steht.
importHandler.classNotFound=Die Klasse [{0}] konnte nicht importiert werden,
weil sie nicht gefunden wurde.
importHandler.invalidClassName=Der Name der zu importierenden Klasse [{0}]
muss ein Paket enthalten.
diff --git a/java/org/apache/catalina/core/LocalStrings.properties
b/java/org/apache/catalina/core/LocalStrings.properties
index 47ccb88279..8c7c099c5b 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -171,14 +171,14 @@ naming.wsdlFailed=Failed to find wsdl file: [{0}]
noPluggabilityServletContext.notAllowed=Section 4.4 of the Servlet 3.0
specification does not permit this method to be called from a
ServletContextListener that was not defined in web.xml, a web-fragment.xml file
nor annotated with @WebListener
-pushBuilder.noPath=It is illegal to call push() before setting a path
-
-propertiesRoleMappingListener.roleMappingFileNull=Role mapping file cannot be
null
-propertiesRoleMappingListener.roleMappingFileEmpty=Role mapping file cannot be
empty
-propertiesRoleMappingListener.roleMappingFileNotFound=Role mapping file [{0}]
not found
-propertiesRoleMappingListener.roleMappingFileFail=Failed to load role mapping
file [{0}]
propertiesRoleMappingListener.linkedRole=Successfully linked application role
[{0}] to technical role [{1}]
propertiesRoleMappingListener.linkedRoleCount=Linked [{0}] application roles
to technical roles
+propertiesRoleMappingListener.roleMappingFileEmpty=Role mapping file cannot be
empty
+propertiesRoleMappingListener.roleMappingFileFail=Failed to load role mapping
file [{0}]
+propertiesRoleMappingListener.roleMappingFil
[tomcat] branch 8.5.x updated: Back-port improvements to French translations
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 6acd86e146 Back-port improvements to French translations
6acd86e146 is described below
commit 6acd86e1468d4d97ace07ebe09e4fda0684aca46
Author: Mark Thomas
AuthorDate: Thu Jun 29 15:11:52 2023 +0100
Back-port improvements to French translations
---
java/org/apache/catalina/core/LocalStrings_fr.properties| 2 ++
java/org/apache/catalina/filters/LocalStrings_fr.properties | 2 ++
java/org/apache/coyote/http11/LocalStrings_fr.properties| 1 +
java/org/apache/tomcat/util/net/LocalStrings_fr.properties | 1 +
webapps/docs/changelog.xml | 3 +++
5 files changed, 9 insertions(+)
diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index 9383eaab32..74d85ff818 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -289,6 +289,8 @@ standardService.stop.name=Arrêt du service [{0}]
standardThreadExecutor.notStarted=L'exécuteur n'a pas encore été démarré
+standardVirtualThreadExecutor.notStarted=L'executeur n'a pas été démarré
+
standardWrapper.allocate=Erreur d'allocation à une instance de servlet
standardWrapper.allocateException=Exception lors de l''allocation pour la
servlet [{0}]
standardWrapper.deallocateException=Exception à la désallocation pour la
servlet [{0}]
diff --git a/java/org/apache/catalina/filters/LocalStrings_fr.properties
b/java/org/apache/catalina/filters/LocalStrings_fr.properties
index bfc46ebc6f..e66f39e8bb 100644
--- a/java/org/apache/catalina/filters/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/filters/LocalStrings_fr.properties
@@ -52,6 +52,8 @@ http.403=L''accès à la ressource demandée [{0}] a été
interdit.
httpHeaderSecurityFilter.clickjack.invalid=Une valeur invalide [{0}] a été
spécifiée pour le header "anti click-jacking"
httpHeaderSecurityFilter.committed=Impossible d'ajouter les en-têtes HTTP car
la réponse a déjà été envoyée avant l'invocation du filtre de sécurité des
en-têtes
+rateLimitFilter.maxRequestsExceeded=[{0}] [{1}] requêtes de [{2}] ont excédé
le maximum autorisé de [{3}] pour une période de [{4}] secondes.
+
remoteCidrFilter.invalid=Une configuration invalide a été fournie pour [{0}],
voir les précédents messages pour les détails
remoteCidrFilter.noRemoteIp=Le client n'a pas d'adresse IP. Requête rejetée.
diff --git a/java/org/apache/coyote/http11/LocalStrings_fr.properties
b/java/org/apache/coyote/http11/LocalStrings_fr.properties
index 16453c4c91..1c419a6139 100644
--- a/java/org/apache/coyote/http11/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/http11/LocalStrings_fr.properties
@@ -47,6 +47,7 @@ iib.invalidHttpProtocol=Un caractère invalide a été trouvé
dans le protocole
iib.invalidPhase=Etape invalide de traitement [{0}] de la ligne de requête
iib.invalidRequestTarget=Un caractère invalide a été trouvé dans la cible de
la requête, les caractères valides sont définis dans RFC 7230 et RFC 3986
iib.invalidheader=La ligne d''en-être HTTP [{0}] n''est pas conforme à la RFC
7230 et a été ignorée
+iib.invalidheader.reject=La ligne d''en-tête HTTP [{0}] ne respecte pas la RFC
7230. La requête a été rejetée.
iib.invalidmethod=Caractère invalide trouvé dans le nom de méthode. Les noms
HTTP doivent être des "token".
iib.parseheaders.ise.error=Etat inattendu, les en-êtres ont déjà été traités,
il est possible que le buffer n'ait pas été recyclé
iib.readtimeout=Délai d'attente dépassé en lisant des données du socket
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
b/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
index 07822afba9..7f5528a956 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
@@ -128,6 +128,7 @@ endpoint.tls.cert.encodingError=Les empreintes du
certificat ne sont pas disponi
endpoint.tls.cert.noCerts=Les détails du certificat ne sont pas disponibles
car la chaîne de certificats retournée par le SSLContext est vide
endpoint.tls.info=Connecteur [{0}], hôte virtuel TLS [{1}], type de certificat
[{2}] configuré depuis {3} et la trust store [{4}]
endpoint.tls.info.cert.keystore=[{0}] avec l''alias [{1}]
+endpoint.tls.info.cert.pem=clé [{0}], certificat [{1}] et chaîne de
certificats [{2}]
endpoint.unknownSslHostName=Le nom d''hôte SSL [{0}] n''est pas reconnu pour
cette terminaison
endpoint.warn.executorShutdown=L''exécuteur associé au pool de threads [{0}]
n''est pas complètement arrêté, certains threads d''application peuvent
toujours être en cours d''exécution
endpoint.warn.incorrectConnectionCount=Le décompte du nombre de con
[tomcat] branch 8.5.x updated: Back-port improvements to Japanese translations
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 e81fe60431 Back-port improvements to Japanese translations
e81fe60431 is described below
commit e81fe604316494605ed32e212fd69cac9be39a55
Author: Mark Thomas
AuthorDate: Thu Jun 29 15:12:12 2023 +0100
Back-port improvements to Japanese translations
---
java/org/apache/catalina/core/LocalStrings_ja.properties| 2 ++
java/org/apache/catalina/filters/LocalStrings_ja.properties | 2 ++
java/org/apache/coyote/http11/LocalStrings_ja.properties| 1 +
java/org/apache/tomcat/util/net/LocalStrings_ja.properties | 3 +++
webapps/docs/changelog.xml | 3 +++
5 files changed, 11 insertions(+)
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index dea726ccc6..e3e1e31c8f 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -289,6 +289,8 @@ standardService.stop.name=サービス [{0}] を停止します
standardThreadExecutor.notStarted=エグゼキュターは開始ししていません。
+standardVirtualThreadExecutor.notStarted=エグゼキュータが起動されていません
+
standardWrapper.allocate=サーブレットインスタンスを割り当て中のエラーです
standardWrapper.allocateException=サーブレット [{0}] に例外を割り当てます
standardWrapper.deallocateException=サーブレット [{0}] に対する例外の割り当てを解除します
diff --git a/java/org/apache/catalina/filters/LocalStrings_ja.properties
b/java/org/apache/catalina/filters/LocalStrings_ja.properties
index cff0e91340..dc4ebcae7b 100644
--- a/java/org/apache/catalina/filters/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/filters/LocalStrings_ja.properties
@@ -52,6 +52,8 @@ http.403=指定されたリソース [{0}] へのアクセスは拒否されま
httpHeaderSecurityFilter.clickjack.invalid=クリックジャッキングヘッダーに無効な値 [{0}] が指定されました
httpHeaderSecurityFilter.committed=HTTP
ヘッダーセキュリティフィルターへの入力時に既に応答がコミットされているため、HTTP ヘッダーを追加できません
+rateLimitFilter.maxRequestsExceeded=[{0}] [{1}] [{2}] からのリクエストが、[{4}]
秒のウィンドウで許可される最大値 [{3}] を超えました。
+
remoteCidrFilter.invalid=[{0}] に不正な値が指定されました。詳細は直前のメッセージを参照してください。
remoteCidrFilter.noRemoteIp=クライアントは IP アドレスを持っていません。リクエストを拒否します。
diff --git a/java/org/apache/coyote/http11/LocalStrings_ja.properties
b/java/org/apache/coyote/http11/LocalStrings_ja.properties
index c77d8069aa..1b29ac7586 100644
--- a/java/org/apache/coyote/http11/LocalStrings_ja.properties
+++ b/java/org/apache/coyote/http11/LocalStrings_ja.properties
@@ -47,6 +47,7 @@ iib.invalidHttpProtocol=HTTPプロトコルで無効な文字が見つかりま
iib.invalidPhase=リクエスト行の解析フェーズ [{0}] は無効です
iib.invalidRequestTarget=リクエストの宛先 [{0}] に無効な文字が含まれています。利用可能な文字は RFC 7230 および
RFC 3986 に定義されています。
iib.invalidheader=HTTP ヘッダー行 [{0}]は RFC 7230 に適合しないため無視します。
+iib.invalidheader.reject=HTTP ヘッダーの [{0}] 行目は RFC 7230 に準拠していません。リクエストは拒否されました。
iib.invalidmethod=HTTP メソッド名 [{0}] に無効な文字が含まれています。HTTP
メソッド名は決められたトークンでなければなりません
iib.parseheaders.ise.error=予期しない状態：ヘッダがすでに解析されています。バッファが未回収ですか？
iib.readtimeout=ソケットからデータを読み取ろうとしている際のタイムアウト
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
b/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
index 313b55fad9..05b2568158 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
@@ -126,6 +126,9 @@ endpoint.socketOptionsError=ソケットオプション設定中のエラー
endpoint.timeout.err=ソケットタイムアウト処理中のエラー
endpoint.tls.cert.encodingError=証明書のフィンガープリントが利用できません
endpoint.tls.cert.noCerts=SSLContext から返された証明書チェーンが空だったため、証明書の詳細を利用できません
+endpoint.tls.info=トラストストア [{4}] を使用して {3} から構成されたコネクタ [{0}]、TLS 仮想ホスト
[{1}]、および証明書タイプ [{2}]
+endpoint.tls.info.cert.keystore=エイリアス [{1}] を使用したキーストア [{0}]
+endpoint.tls.info.cert.pem=キー [{0}]、証明書 [{1}]、および証明書チェーン [{2}]
endpoint.unknownSslHostName=SSL ホスト名 [{0}] はこのエンドポイントから認識されていません。
endpoint.warn.executorShutdown=スレッドプール [{0}]
と関連付けられたエグゼキューターは完全に停止できませんでした。いくつかのアプリケーションスレッドはまだ動作し続けている可能性があります。
endpoint.warn.incorrectConnectionCount=不正なコネクション数。複数のsocket.closeが同じソケットで呼び出されました。
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index fa92a220d1..e9c5de3ea9 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -179,6 +179,9 @@
Improvements to French translations. (remm)
+
+Improvements to Japanese translations. Contributed by tak7iji. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated (6391070013 -> 440d4b00d1)
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 6391070013 Simplify new 6aea3680ba Update ECJ to 4.28/3.34.0 (June 2023) new 7329c7c67d Use constants available in ECJ 4.28 new 440d4b00d1 Add support for compiling JSPs targeting Java 22 The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: build.properties.default | 12 ++-- java/org/apache/jasper/compiler/JDTCompiler.java | 21 + res/maven/tomcat-embed-jasper.pom| 2 +- res/maven/tomcat-jasper.pom | 2 +- webapps/docs/changelog.xml | 10 ++ 5 files changed, 31 insertions(+), 16 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/03: Use constants available in ECJ 4.28
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 7329c7c67d8aa42062cf53bf7f1054cec971239a
Author: Mark Thomas
AuthorDate: Thu Jun 29 15:32:57 2023 +0100
Use constants available in ECJ 4.28
---
java/org/apache/jasper/compiler/JDTCompiler.java | 12 +++-
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java
b/java/org/apache/jasper/compiler/JDTCompiler.java
index 65868661e0..10c0d10bd4 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -318,10 +318,7 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
} else if (opt.equals("19")) {
settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_19);
} else if (opt.equals("20")) {
-// Constant not available in latest ECJ version shipped with
-// Tomcat. May be supported in a snapshot build.
-// This is checked against the actual version below.
-settings.put(CompilerOptions.OPTION_Source, "20");
+settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_20);
} else if (opt.equals("21")) {
// Constant not available in latest ECJ version shipped with
// Tomcat. May be supported in a snapshot build.
@@ -395,11 +392,8 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
settings.put(CompilerOptions.OPTION_TargetPlatform,
CompilerOptions.VERSION_19);
settings.put(CompilerOptions.OPTION_Compliance,
CompilerOptions.VERSION_19);
} else if (opt.equals("20")) {
-// Constant not available in latest ECJ version shipped with
-// Tomcat. May be supported in a snapshot build.
-// This is checked against the actual version below.
-settings.put(CompilerOptions.OPTION_TargetPlatform, "20");
-settings.put(CompilerOptions.OPTION_Compliance, "20");
+settings.put(CompilerOptions.OPTION_TargetPlatform,
CompilerOptions.VERSION_20);
+settings.put(CompilerOptions.OPTION_Compliance,
CompilerOptions.VERSION_20);
} else if (opt.equals("21")) {
// Constant not available in latest ECJ version shipped with
// Tomcat. May be supported in a snapshot build.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/03: Add support for compiling JSPs targeting Java 22
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 440d4b00d13b177f231421a24c129c360d0ab8d3
Author: Mark Thomas
AuthorDate: Thu Jun 29 15:35:18 2023 +0100
Add support for compiling JSPs targeting Java 22
---
java/org/apache/jasper/compiler/JDTCompiler.java | 11 +++
webapps/docs/changelog.xml | 7 +++
2 files changed, 18 insertions(+)
diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java
b/java/org/apache/jasper/compiler/JDTCompiler.java
index 10c0d10bd4..7b51b5b584 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -324,6 +324,11 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
// Tomcat. May be supported in a snapshot build.
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_Source, "21");
+} else if (opt.equals("22")) {
+// Constant not available in latest ECJ version shipped with
+// Tomcat. May be supported in a snapshot build.
+// This is checked against the actual version below.
+settings.put(CompilerOptions.OPTION_Source, "22");
} else {
log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM",
opt));
settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_11);
@@ -400,6 +405,12 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_TargetPlatform, "21");
settings.put(CompilerOptions.OPTION_Compliance, "21");
+} else if (opt.equals("22")) {
+// Constant not available in latest ECJ version shipped with
+// Tomcat. May be supported in a snapshot build.
+// This is checked against the actual version below.
+settings.put(CompilerOptions.OPTION_TargetPlatform, "22");
+settings.put(CompilerOptions.OPTION_Compliance, "22");
} else {
log.warn(Localizer.getMessage("jsp.warning.unknown.targetVM",
opt));
settings.put(CompilerOptions.OPTION_TargetPlatform,
CompilerOptions.VERSION_11);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b5bfbf2f0b..43c1dfa37b 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -156,6 +156,13 @@
of the Jakarta EL API to align with the latest proposals for the
Jakarta
EL 6.0 API. (markt)
+
+Add support for specifying Java 22 (with the value 22) as
+the compiler source and/or compiler target for JSP compilation. If used
+with an Eclipse JDT compiler version that does not support these
values,
+a warning will be logged and the default will used.
+(markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/03: Update ECJ to 4.28/3.34.0 (June 2023)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 6aea3680ba74247ff5f1a37fbe4c8db0a69790a1
Author: Mark Thomas
AuthorDate: Thu Jun 29 15:28:51 2023 +0100
Update ECJ to 4.28/3.34.0 (June 2023)
---
build.properties.default | 12 ++--
res/maven/tomcat-embed-jasper.pom | 2 +-
res/maven/tomcat-jasper.pom | 2 +-
webapps/docs/changelog.xml| 3 +++
4 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 1be6c04127..b35ea5ef7c 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -123,15 +123,15 @@ base-maven.loc=https://repo.maven.apache.org/maven2
# - Eclipse JDT, version 4.7 or later -#
# See
https://cwiki.apache.org/confluence/display/TOMCAT/Managing+Tomcat%27s+Dependency+on+the+Eclipse+JDT+Core+Batch+Compiler
#
-# Checksum is from "SHA512 Checksums for 4.27" link at
-# https://download.eclipse.org/eclipse/downloads/drops4/R-4.27-202303020300/
-#
https://download.eclipse.org/eclipse/downloads/drops4/R-4.27-202303020300/checksum/eclipse-4.27-SUMSSHA512
+# Checksum is from "SHA512 Checksums for 4.28" link at
+# https://download.eclipse.org/eclipse/downloads/drops4/R-4.28-202306050440/
+#
https://download.eclipse.org/eclipse/downloads/drops4/R-4.28-202306050440/checksum/eclipse-4.28-SUMSSHA512
#
-jdt.version=4.27
-jdt.release=R-4.27-202303020300
+jdt.version=4.28
+jdt.release=R-4.28-202306050440
jdt.checksum.enabled=true
jdt.checksum.algorithm=SHA-512
-jdt.checksum.value=69b57e12aa7f1339fe86fdb82f8fe9a104ff4d5e887448a779059e4f0626c43af0f1539569d9669c3f3add54fce6447e0bdcec93ee52ad25bf9697f7ac59ca7f
+jdt.checksum.value=84a59a52bf7e010a96a38a3ac7a2bc5524b5e3408d90f66c07230cd6c87bc127cd8a2bcfdf66b73c881648bcf1aa4b20d39337f92f84c9767e6816ccedbb35af
jdt.home=${base.path}/ecj-${jdt.version}
jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
# The download will be moved to the archive area eventually. We are taking
care of that in advance.
diff --git a/res/maven/tomcat-embed-jasper.pom
b/res/maven/tomcat-embed-jasper.pom
index 72a85db2a7..d38543e4b5 100644
--- a/res/maven/tomcat-embed-jasper.pom
+++ b/res/maven/tomcat-embed-jasper.pom
@@ -48,7 +48,7 @@
org.eclipse.jdt
ecj
- 3.33.0
+ 3.34.0
diff --git a/res/maven/tomcat-jasper.pom b/res/maven/tomcat-jasper.pom
index 264cb80777..86cee1f4a3 100644
--- a/res/maven/tomcat-jasper.pom
+++ b/res/maven/tomcat-jasper.pom
@@ -60,7 +60,7 @@
org.eclipse.jdt
ecj
- 3.33.0
+ 3.34.0
org.apache.tomcat
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ef22482ca0..b5bfbf2f0b 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -208,6 +208,9 @@
Improvements to Japanese translations. Contributed by tak7iji. (markt)
+
+Update to the Eclipse JDT compiler 4.28. (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 UnboundID to 6.0.9
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 5e82c5d964 Update UnboundID to 6.0.9
5e82c5d964 is described below
commit 5e82c5d96458dd317a660cdf46ad6637f169ce7f
Author: Mark Thomas
AuthorDate: Thu Jun 29 16:25:07 2023 +0100
Update UnboundID to 6.0.9
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index b35ea5ef7c..093d5dcdac 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -244,10 +244,10 @@
objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/objenesis-${objenesis.version}.jar
# - UnboundID, used by unit tests, version 5.1.4 or later -
-unboundid.version=6.0.8
+unboundid.version=6.0.9
unboundid.checksum.enabled=true
unboundid.checksum.algorithm=SHA-512
-unboundid.checksum.value=815a51737cc2508641fb5e13ceeba31ce95d5cc6d0faaeec026c7b6a20f5da7379ecae251637bdff8b0994e489919d2784601ac73abc46c6424ffb5b8364690b
+unboundid.checksum.value=38bfe6f69e5b2778ae1a5aae23799b8d8168b11dc571035a7ac96ebbaee1e628f4cae028cd0e4fc227fcf39e4d0e7b60761631f89c392d76460bb93e52a77858
unboundid.home=${base.path}/unboundid-${unboundid.version}
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 43c1dfa37b..0944011fd7 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -218,6 +218,9 @@
Update to the Eclipse JDT compiler 4.28. (markt)
+
+Update UnboundID to 6.0.9. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Update UnboundID to 6.0.9
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 569bed8049 Update UnboundID to 6.0.9
569bed8049 is described below
commit 569bed804921178a601e25adb43a8c64c1886990
Author: Mark Thomas
AuthorDate: Thu Jun 29 16:25:07 2023 +0100
Update UnboundID to 6.0.9
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index f09773e627..bf939470e2 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -265,10 +265,10 @@
objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/objenesis-${objenesis.version}.jar
# - UnboundID, used by unit tests, version 5.1.4 or later -
-unboundid.version=6.0.8
+unboundid.version=6.0.9
unboundid.checksum.enabled=true
unboundid.checksum.algorithm=SHA-512
-unboundid.checksum.value=815a51737cc2508641fb5e13ceeba31ce95d5cc6d0faaeec026c7b6a20f5da7379ecae251637bdff8b0994e489919d2784601ac73abc46c6424ffb5b8364690b
+unboundid.checksum.value=38bfe6f69e5b2778ae1a5aae23799b8d8168b11dc571035a7ac96ebbaee1e628f4cae028cd0e4fc227fcf39e4d0e7b60761631f89c392d76460bb93e52a77858
unboundid.home=${base.path}/unboundid-${unboundid.version}
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4690a18e38..3a4a3a3065 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -188,6 +188,9 @@
Improvements to Japanese translations. Contributed by tak7iji. (markt)
+
+Update UnboundID to 6.0.9. (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 UnboundID to 6.0.9
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 b104d18771 Update UnboundID to 6.0.9
b104d18771 is described below
commit b104d187717ea894d0c312394d67bc78da231236
Author: Mark Thomas
AuthorDate: Thu Jun 29 16:25:07 2023 +0100
Update UnboundID to 6.0.9
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index a0b7aa4602..fb6f14dcfe 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -267,10 +267,10 @@
objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/objenesis-${objenesis.version}.jar
# - UnboundID, used by unit tests, version 5.1.4 or later -
-unboundid.version=6.0.8
+unboundid.version=6.0.9
unboundid.checksum.enabled=true
unboundid.checksum.algorithm=SHA-512
-unboundid.checksum.value=815a51737cc2508641fb5e13ceeba31ce95d5cc6d0faaeec026c7b6a20f5da7379ecae251637bdff8b0994e489919d2784601ac73abc46c6424ffb5b8364690b
+unboundid.checksum.value=38bfe6f69e5b2778ae1a5aae23799b8d8168b11dc571035a7ac96ebbaee1e628f4cae028cd0e4fc227fcf39e4d0e7b60761631f89c392d76460bb93e52a77858
unboundid.home=${base.path}/unboundid-${unboundid.version}
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ef9cc26b8c..0dffa414da 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -188,6 +188,9 @@
Improvements to Japanese translations. Contributed by tak7iji. (markt)
+
+Update UnboundID to 6.0.9. (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 UnboundID to 6.0.9
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 ad803758b7 Update UnboundID to 6.0.9
ad803758b7 is described below
commit ad803758b75683e628b9171ea6122ec5e5f38eda
Author: Mark Thomas
AuthorDate: Thu Jun 29 16:25:07 2023 +0100
Update UnboundID to 6.0.9
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 6cdff599c8..6d6f1f0b02 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -271,10 +271,10 @@
objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/objenesis-${objenesis.version}.jar
# - UnboundID, used by unit tests, version 5.1.4 or later -
-unboundid.version=6.0.8
+unboundid.version=6.0.9
unboundid.checksum.enabled=true
unboundid.checksum.algorithm=SHA-512
-unboundid.checksum.value=815a51737cc2508641fb5e13ceeba31ce95d5cc6d0faaeec026c7b6a20f5da7379ecae251637bdff8b0994e489919d2784601ac73abc46c6424ffb5b8364690b
+unboundid.checksum.value=38bfe6f69e5b2778ae1a5aae23799b8d8168b11dc571035a7ac96ebbaee1e628f4cae028cd0e4fc227fcf39e4d0e7b60761631f89c392d76460bb93e52a77858
unboundid.home=${base.path}/unboundid-${unboundid.version}
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e9c5de3ea9..4cc04abf48 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -182,6 +182,9 @@
Improvements to Japanese translations. Contributed by tak7iji. (markt)
+
+Update UnboundID to 6.0.9. (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 Checkstyle to 10.12.1
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 254d55025e Update Checkstyle to 10.12.1
254d55025e is described below
commit 254d55025e70ce3c139b16da70b5ca601544d694
Author: Mark Thomas
AuthorDate: Thu Jun 29 16:29:20 2023 +0100
Update Checkstyle to 10.12.1
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 093d5dcdac..eeeb3caddc 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -253,10 +253,10 @@
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
# - Checkstyle, version 6.16 or later -
-checkstyle.version=10.12.0
+checkstyle.version=10.12.1
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=bba7ae7542414a265b80a024c3b698ab963e58c9569c139995a7f993f1fa915b6bbe5a3fbefd2821ae68c84bf00dab0f66b07e16ccf08b8d5b8ea2533b031ada
+checkstyle.checksum.value=0c5a68e86c5a330e4b76b3c6afd931d3d71195a58a11d42ef009bf2c96f3e8616429709dc1bd9d38b7eafbdb4e18c7a6443320d9f4666520b5d07a645cb7632f
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0944011fd7..2c2d09e96b 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -221,6 +221,9 @@
Update UnboundID to 6.0.9. (markt)
+
+Update Checkstyle to 10.12.1. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Update Checkstyle to 10.12.1
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 1e3067ed2d Update Checkstyle to 10.12.1
1e3067ed2d is described below
commit 1e3067ed2df5ae91a73de143282483f60a3d894a
Author: Mark Thomas
AuthorDate: Thu Jun 29 16:29:20 2023 +0100
Update Checkstyle to 10.12.1
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index bf939470e2..b4cae9b01f 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -274,10 +274,10 @@
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
# - Checkstyle, version 6.16 or later -
-checkstyle.version=10.12.0
+checkstyle.version=10.12.1
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=bba7ae7542414a265b80a024c3b698ab963e58c9569c139995a7f993f1fa915b6bbe5a3fbefd2821ae68c84bf00dab0f66b07e16ccf08b8d5b8ea2533b031ada
+checkstyle.checksum.value=0c5a68e86c5a330e4b76b3c6afd931d3d71195a58a11d42ef009bf2c96f3e8616429709dc1bd9d38b7eafbdb4e18c7a6443320d9f4666520b5d07a645cb7632f
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 3a4a3a3065..c05702e79c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -191,6 +191,9 @@
Update UnboundID to 6.0.9. (markt)
+
+Update Checkstyle to 10.12.1. (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 Checkstyle to 10.12.1
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 4ee3215f71 Update Checkstyle to 10.12.1
4ee3215f71 is described below
commit 4ee3215f71857e9838cea1afcd551e25fc44f17c
Author: Mark Thomas
AuthorDate: Thu Jun 29 16:29:20 2023 +0100
Update Checkstyle to 10.12.1
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index fb6f14dcfe..59440af87f 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -276,10 +276,10 @@
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
# - Checkstyle, version 6.16 or later -
-checkstyle.version=10.12.0
+checkstyle.version=10.12.1
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=bba7ae7542414a265b80a024c3b698ab963e58c9569c139995a7f993f1fa915b6bbe5a3fbefd2821ae68c84bf00dab0f66b07e16ccf08b8d5b8ea2533b031ada
+checkstyle.checksum.value=0c5a68e86c5a330e4b76b3c6afd931d3d71195a58a11d42ef009bf2c96f3e8616429709dc1bd9d38b7eafbdb4e18c7a6443320d9f4666520b5d07a645cb7632f
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0dffa414da..2fb2d61e5f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -191,6 +191,9 @@
Update UnboundID to 6.0.9. (markt)
+
+Update Checkstyle to 10.12.1. (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 Checkstyle to 10.12.1
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 ccf5efc12f Update Checkstyle to 10.12.1
ccf5efc12f is described below
commit ccf5efc12f5359a75f7d0eb4d080e242819aa456
Author: Mark Thomas
AuthorDate: Thu Jun 29 16:29:20 2023 +0100
Update Checkstyle to 10.12.1
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 6d6f1f0b02..ce24aeb59c 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -280,10 +280,10 @@
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
# - Checkstyle, version 6.16 or later -
-checkstyle.version=10.12.0
+checkstyle.version=10.12.1
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=bba7ae7542414a265b80a024c3b698ab963e58c9569c139995a7f993f1fa915b6bbe5a3fbefd2821ae68c84bf00dab0f66b07e16ccf08b8d5b8ea2533b031ada
+checkstyle.checksum.value=0c5a68e86c5a330e4b76b3c6afd931d3d71195a58a11d42ef009bf2c96f3e8616429709dc1bd9d38b7eafbdb4e18c7a6443320d9f4666520b5d07a645cb7632f
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4cc04abf48..b28428b7b8 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -185,6 +185,9 @@
Update UnboundID to 6.0.9. (markt)
+
+Update Checkstyle to 10.12.1. (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 BND to 6.4.1
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 f369bf87bd Update BND to 6.4.1
f369bf87bd is described below
commit f369bf87bded9be9d8984b1b0684948c27c02737
Author: Mark Thomas
AuthorDate: Thu Jun 29 16:34:09 2023 +0100
Update BND to 6.4.1
---
build.properties.default | 6 +++---
webapps/docs/changelog.xml | 3 +++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index eeeb3caddc..d9b4d7d734 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -281,12 +281,12 @@
spotbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${spotbugs.version}/
# - bnd, version 6.3.0 or later -
# - provides OSGI metadata for JARs -
-bnd.version=6.4.0
+bnd.version=6.4.1
-# checksums for biz.aQute.bnd-6.4.0.jar
+# checksums for biz.aQute.bnd-6.4.1.jar
bnd.checksum.enabled=true
bnd.checksum.algorithm=MD5|SHA-1
-bnd.checksum.value=a812b31a81f05767ea11896a81cd8eab|8a359edbb02aad9138b7824a0d7bbe22f02cf990
+bnd.checksum.value=78a21ab586850832a78342b8d0a99f64|91f28d145a1284f270a3d2cdc886863460c89833
bnd.home=${base.path}/bnd-${bnd.version}
bnd.jar=${bnd.home}/biz.aQute.bnd-${bnd.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2c2d09e96b..2f481c7d21 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -224,6 +224,9 @@
Update Checkstyle to 10.12.1. (markt)
+
+Update BND to 6.4.1. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Update BND to 6.4.1
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 5e92be8d3c Update BND to 6.4.1
5e92be8d3c is described below
commit 5e92be8d3c3a31f1752bbc11ed6e638c2948d2f1
Author: Mark Thomas
AuthorDate: Thu Jun 29 16:34:09 2023 +0100
Update BND to 6.4.1
---
build.properties.default | 6 +++---
webapps/docs/changelog.xml | 3 +++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index b4cae9b01f..390e7247e0 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -302,12 +302,12 @@
spotbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${spotbugs.version}/
# - bnd, version 6.3.0 or later -
# - provides OSGI metadata for JARs -
-bnd.version=6.4.0
+bnd.version=6.4.1
-# checksums for biz.aQute.bnd-6.4.0.jar
+# checksums for biz.aQute.bnd-6.4.1.jar
bnd.checksum.enabled=true
bnd.checksum.algorithm=MD5|SHA-1
-bnd.checksum.value=a812b31a81f05767ea11896a81cd8eab|8a359edbb02aad9138b7824a0d7bbe22f02cf990
+bnd.checksum.value=78a21ab586850832a78342b8d0a99f64|91f28d145a1284f270a3d2cdc886863460c89833
bnd.home=${base.path}/bnd-${bnd.version}
bnd.jar=${bnd.home}/biz.aQute.bnd-${bnd.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c05702e79c..da302851c0 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -194,6 +194,9 @@
Update Checkstyle to 10.12.1. (markt)
+
+Update BND to 6.4.1. (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 BND to 6.4.1
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 c90a7f38b9 Update BND to 6.4.1
c90a7f38b9 is described below
commit c90a7f38b9876a5825fe86f47311ca7640d94529
Author: Mark Thomas
AuthorDate: Thu Jun 29 16:34:09 2023 +0100
Update BND to 6.4.1
---
build.properties.default | 6 +++---
webapps/docs/changelog.xml | 3 +++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 59440af87f..172a08a083 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -304,12 +304,12 @@
spotbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${spotbugs.version}/
# - bnd, version 6.3.0 or later -
# - provides OSGI metadata for JARs -
-bnd.version=6.4.0
+bnd.version=6.4.1
-# checksums for biz.aQute.bnd-6.4.0.jar
+# checksums for biz.aQute.bnd-6.4.1.jar
bnd.checksum.enabled=true
bnd.checksum.algorithm=MD5|SHA-1
-bnd.checksum.value=a812b31a81f05767ea11896a81cd8eab|8a359edbb02aad9138b7824a0d7bbe22f02cf990
+bnd.checksum.value=78a21ab586850832a78342b8d0a99f64|91f28d145a1284f270a3d2cdc886863460c89833
bnd.home=${base.path}/bnd-${bnd.version}
bnd.jar=${bnd.home}/biz.aQute.bnd-${bnd.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2fb2d61e5f..c254896add 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -194,6 +194,9 @@
Update Checkstyle to 10.12.1. (markt)
+
+Update BND to 6.4.1. (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 JSign to 5.0
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 25124628fd Update JSign to 5.0
25124628fd is described below
commit 25124628fd841a3f559a6a91f543f9dd3f09d7be
Author: Mark Thomas
AuthorDate: Thu Jun 29 16:47:59 2023 +0100
Update JSign to 5.0
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index d9b4d7d734..fd68dcce8d 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -319,10 +319,10 @@
openssl-lib.loc=${base-maven.loc}/org/apache/tomcat/tomcat-coyote-openssl-java17
# - JSign, version 4.1 or later -
jsign.version=4.2
-# checksums for JSign 4.2
+# checksums for JSign 5.0
jsign.checksum.enabled=true
jsign.checksum.algorithm=MD5|SHA-1
-jsign.checksum.value=10fb38a1182515d583a1e252c8219eae|1e3b44e0114d599b05be243513b85a51b0c45401
+jsign.checksum.value=79c4f9bdff74a4ccee3d72f020ad45b7|5a6677625413e0d8acb52f80fa6fbb9031a6a9d0
jsign.home=${base.path}/jsign-${jsign.version}
jsign.jar=${jsign.home}/jsign-${jsign.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2f481c7d21..4129bdc4ae 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -227,6 +227,9 @@
Update BND to 6.4.1. (markt)
+
+Update JSign to 5.0. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Update JSign to 5.0
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new eccbb9c07b Update JSign to 5.0
eccbb9c07b is described below
commit eccbb9c07b50c30b8558f80f5fabd1bbffdd7979
Author: Mark Thomas
AuthorDate: Thu Jun 29 16:47:59 2023 +0100
Update JSign to 5.0
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 390e7247e0..b969fe066a 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -340,10 +340,10 @@
openssl-lib.loc=${base-maven.loc}/org/apache/tomcat/tomcat-coyote-openssl-java17
# - JSign, version 4.1 or later -
jsign.version=4.2
-# checksums for JSign 4.2
+# checksums for JSign 5.0
jsign.checksum.enabled=true
jsign.checksum.algorithm=MD5|SHA-1
-jsign.checksum.value=10fb38a1182515d583a1e252c8219eae|1e3b44e0114d599b05be243513b85a51b0c45401
+jsign.checksum.value=79c4f9bdff74a4ccee3d72f020ad45b7|5a6677625413e0d8acb52f80fa6fbb9031a6a9d0
jsign.home=${base.path}/jsign-${jsign.version}
jsign.jar=${jsign.home}/jsign-${jsign.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index da302851c0..1fd5b4fd09 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -197,6 +197,9 @@
Update BND to 6.4.1. (markt)
+
+Update JSign to 5.0. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Update JSign to 5.0
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new ad57136107 Update JSign to 5.0
ad57136107 is described below
commit ad571361079e02d3f748b8087ff7f5bee9958959
Author: Mark Thomas
AuthorDate: Thu Jun 29 16:47:59 2023 +0100
Update JSign to 5.0
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 172a08a083..aa8179820c 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -318,10 +318,10 @@
bnd.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bnd/${bnd.version}/biz.aQute.b
# - JSign, version 4.1 or later -
jsign.version=4.2
-# checksums for JSign 4.2
+# checksums for JSign 5.0
jsign.checksum.enabled=true
jsign.checksum.algorithm=MD5|SHA-1
-jsign.checksum.value=10fb38a1182515d583a1e252c8219eae|1e3b44e0114d599b05be243513b85a51b0c45401
+jsign.checksum.value=79c4f9bdff74a4ccee3d72f020ad45b7|5a6677625413e0d8acb52f80fa6fbb9031a6a9d0
jsign.home=${base.path}/jsign-${jsign.version}
jsign.jar=${jsign.home}/jsign-${jsign.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c254896add..0dbdaaa8d3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -197,6 +197,9 @@
Update BND to 6.4.1. (markt)
+
+Update JSign to 5.0. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Update JSign to 5.0
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 5334509849 Update JSign to 5.0
5334509849 is described below
commit 5334509849c97758bc6fb36452d1043f25e48d15
Author: Mark Thomas
AuthorDate: Thu Jun 29 16:47:59 2023 +0100
Update JSign to 5.0
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index ce24aeb59c..929dad74aa 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -309,10 +309,10 @@
spotbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${spotbugs.version}/
# - JSign, version 4.1 or later -
jsign.version=4.2
-# checksums for JSign 4.2
+# checksums for JSign 5.0
jsign.checksum.enabled=true
jsign.checksum.algorithm=MD5|SHA-1
-jsign.checksum.value=10fb38a1182515d583a1e252c8219eae|1e3b44e0114d599b05be243513b85a51b0c45401
+jsign.checksum.value=79c4f9bdff74a4ccee3d72f020ad45b7|5a6677625413e0d8acb52f80fa6fbb9031a6a9d0
jsign.home=${base.path}/jsign-${jsign.version}
jsign.jar=${jsign.home}/jsign-${jsign.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b28428b7b8..9766f56aa8 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -188,6 +188,9 @@
Update Checkstyle to 10.12.1. (markt)
+
+Update JSign to 5.0. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Remove unused variable
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 e0927ed00f Remove unused variable
e0927ed00f is described below
commit e0927ed00ffb2f2c95638f69f6ab09ddbc92e6d8
Author: Mark Thomas
AuthorDate: Thu Jun 29 16:51:41 2023 +0100
Remove unused variable
---
res/install-win/tomcat.nsi | 1 -
1 file changed, 1 deletion(-)
diff --git a/res/install-win/tomcat.nsi b/res/install-win/tomcat.nsi
index 8bd9b11cf5..fc133aa4af 100644
--- a/res/install-win/tomcat.nsi
+++ b/res/install-win/tomcat.nsi
@@ -52,7 +52,6 @@ ${Using:StrFunc} StrLoc
Var JavaHome
Var JavaExe
Var JvmDll
-Var Arch
Var ResetInstDir
Var TomcatPortShutdown
Var TomcatPortHttp
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
