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 43226fa5fa Remove remaining references to JDBCAccessLogValve
43226fa5fa is described below
commit 43226fa5fabcb7a7befa1b0796cda051525c707e
Author: Mark Thomas <[email protected]>
AuthorDate: Wed Dec 4 07:30:44 2024 +0000
Remove remaining references to JDBCAccessLogValve
---
build.xml | 1 -
java/org/apache/catalina/valves/LocalStrings.properties | 3 ---
java/org/apache/catalina/valves/LocalStrings_es.properties | 2 --
java/org/apache/catalina/valves/LocalStrings_fr.properties | 3 ---
java/org/apache/catalina/valves/LocalStrings_ja.properties | 3 ---
java/org/apache/catalina/valves/LocalStrings_ko.properties | 3 ---
java/org/apache/catalina/valves/LocalStrings_zh_CN.properties | 3 ---
res/spotbugs/filter-false-positives.xml | 7 -------
8 files changed, 25 deletions(-)
diff --git a/build.xml b/build.xml
index 8c816f5d1f..91353cd6ff 100644
--- a/build.xml
+++ b/build.xml
@@ -631,7 +631,6 @@
<exclude name="org/apache/catalina/valves/ExtendedAccessLogValve*" />
<exclude name="org/apache/catalina/valves/ExtendedAccessLogValve*" />
<exclude name="org/apache/catalina/valves/HealthCheckValve*" />
- <exclude name="org/apache/catalina/valves/JDBCAccessLogValve*" />
<exclude name="org/apache/catalina/valves/LoadBalancerDrainingValve*" />
<exclude name="org/apache/catalina/valves/PersistentValve*" />
diff --git a/java/org/apache/catalina/valves/LocalStrings.properties
b/java/org/apache/catalina/valves/LocalStrings.properties
index 2bd30f6e89..24b4194f9b 100644
--- a/java/org/apache/catalina/valves/LocalStrings.properties
+++ b/java/org/apache/catalina/valves/LocalStrings.properties
@@ -134,9 +134,6 @@ http.510.reason=Not Extended
http.511.desc=The client needs to authenticate to gain network access.
http.511.reason=Network Authentication Required
-jdbcAccessLogValve.close=Failed to close database
-jdbcAccessLogValve.exception=Exception performing insert access entry
-
loadBalancerDrainingValve.draining=Load-balancer is in DISABLED state,
draining this node
loadBalancerDrainingValve.skip=Client is presenting a valid [{0}] cookie,
re-balancing is being skipped
diff --git a/java/org/apache/catalina/valves/LocalStrings_es.properties
b/java/org/apache/catalina/valves/LocalStrings_es.properties
index 4164cbd372..36b14d8d87 100644
--- a/java/org/apache/catalina/valves/LocalStrings_es.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_es.properties
@@ -74,8 +74,6 @@ http.507.desc=El recurso no tiene espacio suficiente para
registrar el estado de
http.507.reason=El storage no es suficiente
http.511.desc=El cliente se tiene que autenticar para tener accesso a la red
-jdbcAccessLogValve.exception=Excepción realizando entrada de acceso a inserción
-
remoteIpValve.invalidPortHeader=Valor inválido [{0}] hallado para el puerto en
cabecera HTTP [{1}]
requestFilterValve.configInvalid=Uno o más parámetros de configuración
inválidos fueron proveídos para Remote[Addr|Host]Valve lo cual impide que el
Valve y sus contenedores padres puedan iniciar
diff --git a/java/org/apache/catalina/valves/LocalStrings_fr.properties
b/java/org/apache/catalina/valves/LocalStrings_fr.properties
index 2f2044af02..e4f7481167 100644
--- a/java/org/apache/catalina/valves/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_fr.properties
@@ -135,9 +135,6 @@ http.510.reason=Non étendu
http.511.desc=Le client doit s'authentifier pour accéder au réseau.
http.511.reason=L’authentification du réseau est nécessaire
-jdbcAccessLogValve.close=Echec de fermeture de la base de donnée
-jdbcAccessLogValve.exception=Exception en insérant l'entrée de l'accès
-
loadBalancerDrainingValve.draining=Le balanceur de charge est dans l'étât
DISABLED, le changement de répartition de la charge est sauté
loadBalancerDrainingValve.skip=Le client a envoyé un cookie [{0}] valide, le
le changement de répartition de la charge est sauté
diff --git a/java/org/apache/catalina/valves/LocalStrings_ja.properties
b/java/org/apache/catalina/valves/LocalStrings_ja.properties
index 49f12feac3..49aa83ff24 100644
--- a/java/org/apache/catalina/valves/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_ja.properties
@@ -135,9 +135,6 @@ http.510.reason=Not Extended
http.511.desc=クライアントはネットワークアクセスを取得するために認証する必要があります。
http.511.reason=Network Authentication Required
-jdbcAccessLogValve.close=データベースのクローズに失敗しました。
-jdbcAccessLogValve.exception=アクセスエントリの挿入を実行中の例外です
-
loadBalancerDrainingValve.draining=ロードバランサは DISABLED 状態にあり、このノードを使用していません
loadBalancerDrainingValve.skip=クライアントは有効な [{0}] Cookie
を提示しているため、リバランスはスキップされています
diff --git a/java/org/apache/catalina/valves/LocalStrings_ko.properties
b/java/org/apache/catalina/valves/LocalStrings_ko.properties
index c562b92db2..b1ee5f9117 100644
--- a/java/org/apache/catalina/valves/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_ko.properties
@@ -128,9 +128,6 @@ http.510.reason=확장 안됨
http.511.desc=클라이언트가 네트워크에 접근하기 위해서는 인증을 해야 합니다.
http.511.reason=네트워크 인증이 필요함
-jdbcAccessLogValve.close=데이터베이스를 닫지 못했습니다.
-jdbcAccessLogValve.exception=접근 엔트리를 추가하는 중 예외 발생
-
persistentValve.filter.failure=필터를 컴파일할 수 없습니다: [{0}]
remoteCidrValve.invalid=[{0}]을(를) 위해 유효하지 않은 설정이 제공되었습니다. 상세 정보를 보시려면 이전 메시지들을
확인하십시오.
diff --git a/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
index 209cdd0dc9..91a89c5af8 100644
--- a/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
@@ -128,9 +128,6 @@ http.510.reason=没有.扩展
http.511.desc=客户端需要进行身份验证才能获得网络访问权限。
http.511.reason=需要网络身份验证
-jdbcAccessLogValve.close=无法关闭数据库。
-jdbcAccessLogValve.exception=执行插入访问项时发生异常
-
persistentValve.filter.failure=无法编译filter=[{0}]
remoteCidrValve.invalid=为[{0}]提供的配置无效。有关详细信息，请参阅以前的消息
diff --git a/res/spotbugs/filter-false-positives.xml
b/res/spotbugs/filter-false-positives.xml
index 0b16521706..51335dc915 100644
--- a/res/spotbugs/filter-false-positives.xml
+++ b/res/spotbugs/filter-false-positives.xml
@@ -847,13 +847,6 @@
<Field name="context" />
<Bug pattern="IS2_INCONSISTENT_SYNC" />
</Match>
- <Match>
- <!-- Non-constant strings are configuration settings rather than client
- supplied -->
- <Class name="org.apache.catalina.valves.JDBCAccessLogValve" />
- <Method name="open" />
- <Bug code="SQL" />
- </Match>
<Match>
<!-- NO-OPs due to remaining FIXMEs -->
<Class name="org.apache.catalina.valves.rewrite.ResolverImpl"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
