This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 804ffa6728e8b7db27d10a80a0acb1e587788bb5
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu May 20 13:16:49 2021 +0100
Better align with 10.0.x/9.0.x - use StringManager
---
java/org/apache/catalina/core/DefaultInstanceManager.java | 13 +++++--------
java/org/apache/catalina/core/LocalStrings.properties | 2 ++
java/org/apache/catalina/core/LocalStrings_fr.properties | 2 ++
java/org/apache/catalina/core/LocalStrings_ja.properties | 2 ++
java/org/apache/catalina/core/LocalStrings_ko.properties | 2 ++
java/org/apache/catalina/core/LocalStrings_zh_CN.properties | 2 ++
6 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/java/org/apache/catalina/core/DefaultInstanceManager.java
b/java/org/apache/catalina/core/DefaultInstanceManager.java
index f67179b..1ca25e3 100644
--- a/java/org/apache/catalina/core/DefaultInstanceManager.java
+++ b/java/org/apache/catalina/core/DefaultInstanceManager.java
@@ -382,9 +382,8 @@ public class DefaultInstanceManager implements
InstanceManager {
postConstruct.getParameterTypes(), null,
AnnotationCacheEntryType.POST_CONSTRUCT));
} else if (postConstructFromXml != null) {
- throw new IllegalArgumentException("Post construct method "
- + postConstructFromXml + " for class " +
clazz.getName()
- + " is declared in deployment descriptor but cannot be
found.");
+ throw new
IllegalArgumentException(sm.getString("defaultInstanceManager.postConstructNotFound",
+ postConstructFromXml, clazz.getName()));
}
if (preDestroy != null) {
annotations.add(new AnnotationCacheEntry(
@@ -392,9 +391,8 @@ public class DefaultInstanceManager implements
InstanceManager {
preDestroy.getParameterTypes(), null,
AnnotationCacheEntryType.PRE_DESTROY));
} else if (preDestroyFromXml != null) {
- throw new IllegalArgumentException("Pre destroy method "
- + preDestroyFromXml + " for class " + clazz.getName()
- + " is declared in deployment descriptor but cannot be
found.");
+ throw new
IllegalArgumentException(sm.getString("defaultInstanceManager.preDestroyNotFound",
+ preDestroyFromXml, clazz.getName()));
}
if (context != null) {
@@ -725,8 +723,7 @@ public class DefaultInstanceManager implements
InstanceManager {
});
} else {
try {
- result = clazz.getDeclaredField(
- entry.getAccessibleObjectName());
+ result =
clazz.getDeclaredField(entry.getAccessibleObjectName());
} catch (NoSuchFieldException e) {
// Should never happen. On that basis don't log it.
}
diff --git a/java/org/apache/catalina/core/LocalStrings.properties
b/java/org/apache/catalina/core/LocalStrings.properties
index 5bedad0..242bd7c 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -117,6 +117,8 @@ containerBase.threadedStartFailed=A child container failed
during start
containerBase.threadedStopFailed=A child container failed during stop
defaultInstanceManager.invalidInjection=Invalid method resource injection
annotation
+defaultInstanceManager.postConstructNotFound=Post construct method [{0}] for
class [{1}] is declared in deployment descriptor but cannot be found
+defaultInstanceManager.preDestroyNotFound=Pre destroy method [{0}] for class
[{1}] is declared in deployment descriptor but cannot be found
defaultInstanceManager.restrictedClass=Access to class [{0}] is forbidden. It
is a restricted class. A web application must be configured as privileged to be
able to load it
defaultInstanceManager.restrictedContainerServlet=Access to class [{0}] is
forbidden. It is a restricted class (implements ContainerServlet interface). A
web application must be configured as privileged to be able to load it
defaultInstanceManager.restrictedFiltersResource=Restricted filters property
file not found [{0}]
diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index 2de7308..3d37d8d 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -116,6 +116,8 @@ containerBase.threadedStartFailed=Un conteneur fils a
échoué pendant son déma
containerBase.threadedStopFailed=Erreur lors de l'arrêt d'un conteneur fils
defaultInstanceManager.invalidInjection=Annotation invalide pour l'injection
d'une resource méthode
+defaultInstanceManager.postConstructNotFound=La méthode post construct [{0}]
de la classe [{1}] est déclarée dans le descripteur de déploiement mais n''a
pas été trouvée
+defaultInstanceManager.preDestroyNotFound=La méthode pre destroy [{0}] de la
classe [{1}] est déclarée dans le descripteur de déploiement mais n''a pas été
trouvée
defaultInstanceManager.restrictedClass=L''accès à la classe à accès restreint
[{0}] est interdit, une application web doit être marquée comme étant
privilégiée pour pouvoir la charger
defaultInstanceManager.restrictedContainerServlet=L''accès à la classe [{0}]
est interdit. C''est une classe restreinte qui (implémente l''interface
ContainerServlet). Une application web doit être privilégiée pour pouvoir la
charger.
defaultInstanceManager.restrictedFiltersResource=Le fichier de propriétés
contenant la liste des filtres restreints n''a pas été trouvée [{0}]
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index 78c28b1..a15636c 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -116,6 +116,8 @@ containerBase.threadedStartFailed=子コンテナーを開始できません。
containerBase.threadedStopFailed=停止中に子コンテナが失敗しました。
defaultInstanceManager.invalidInjection=無効なメソッドリソースアノテーションです。
+defaultInstanceManager.postConstructNotFound=配備記述子に宣言されたクラス [{1}] の
post-construct メソッド [{0}] が見つかりません。
+defaultInstanceManager.preDestroyNotFound=配備記述子に宣言されたクラス [{1}] の pre-destroy
メソッド [{0}] が見つかりません。
defaultInstanceManager.restrictedClass=制限されたクラス [{0}]
へのアクセスは拒否されました。制限されたクラスを読み込むには Web アプリケーションに特権を構成しなければなりません。
defaultInstanceManager.restrictedContainerServlet=クラス [{0}]
へのアクセスは禁止されています。制限クラスです (ContainerServlet
インターフェイスを実装しています)。アクセス可能にするにはWebアプリケーションに特権を構成しなければなりません。
defaultInstanceManager.restrictedFiltersResource=制限フィルターのプロパティファイルが見つかりません
[{0}]
diff --git a/java/org/apache/catalina/core/LocalStrings_ko.properties
b/java/org/apache/catalina/core/LocalStrings_ko.properties
index c8dacaf..c0b8343 100644
--- a/java/org/apache/catalina/core/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ko.properties
@@ -116,6 +116,8 @@ containerBase.threadedStartFailed=자식 컨테이너를 시작 중 실패했습
containerBase.threadedStopFailed=자식 컨테이너가 중지되는 중 실패했습니다.
defaultInstanceManager.invalidInjection=유효하지 않은 메소드 리소스 injection annotation
+defaultInstanceManager.postConstructNotFound=클래스 [{1}]을(를) 위한 PostConstruct
메소드 [{0}]이(가), 배치 descriptor에 선언되어 있지만, 해당 메소드를 찾을 수 없습니다.
+defaultInstanceManager.preDestroyNotFound=클래스 [{1}]을(를) 위한 PreDestroy 메소드
[{0}]이(가) 배치 descriptor에 선언되어 있으나, 해당 메소드를 찾을 수 없습니다.
defaultInstanceManager.restrictedClass=클래스 [{0}]에 대한 접근이 금지되었습니다. 접근 제한된
클래스입니다. 그것을 로드할 수 있으려면, 웹 애플리케이션이 반드시 privileged 된 것으로 설정되어야 합니다.
defaultInstanceManager.restrictedContainerServlet=클래스 [{0}]을(를) 접근하는 것은 금지되어
있습니다. 해당 클래스는 (ContainerServlet 인터페이스를 구현하고 있는) 접근 제한 클래스입니다. 웹 애플리케이션이 만약
접근하고자 한다면 로드할 수 있는 권한이 설정되어야 합니다.
defaultInstanceManager.restrictedFiltersResource=제한 필터들에 대한 설정 파일을 찾을 수 없습니다:
[{0}]
diff --git a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
index 8bde25e..f2d4cc3 100644
--- a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
@@ -117,6 +117,8 @@ containerBase.threadedStartFailed=子容器启动失败
containerBase.threadedStopFailed=停止期间子容器失败
defaultInstanceManager.invalidInjection=方法资源注入注解无效
+defaultInstanceManager.postConstructNotFound=类[{1}]的后构造方法[{0}]已在部署描述符中声明，但找不到
+defaultInstanceManager.preDestroyNotFound=类[{1}]的预销毁方法[{0}]已在部署描述符中声明，但找不到
defaultInstanceManager.restrictedClass=禁止访问类[{0}]。这是一个限制类。必须将web应用程序配置为具有特权才能加载它
defaultInstanceManager.restrictedContainerServlet=禁止访问类 [{0}]。 它是一个受限制的类（实现了
ContainerServlet 接口）。 必须将 Web 应用程序配置为特权才能加载它
defaultInstanceManager.restrictedFiltersResource=找不到受限制的过滤器属性文件[{0}]
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
