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 f604e26 Remove unused code/strings f604e26 is described below commit f604e2672cdb621b4864288c70c3562e44de65b7 Author: Mark Thomas <ma...@apache.org> AuthorDate: Mon Mar 22 22:10:40 2021 +0000 Remove unused code/strings --- java/org/apache/catalina/core/LocalStrings_fr.properties | 1 - java/org/apache/catalina/core/LocalStrings_ja.properties | 1 - java/org/apache/catalina/core/LocalStrings_ko.properties | 1 - java/org/apache/catalina/core/LocalStrings_zh_CN.properties | 1 - java/org/apache/catalina/core/StandardContext.java | 11 ----------- 5 files changed, 15 deletions(-) diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties b/java/org/apache/catalina/core/LocalStrings_fr.properties index d227738..55c45dc 100644 --- a/java/org/apache/catalina/core/LocalStrings_fr.properties +++ b/java/org/apache/catalina/core/LocalStrings_fr.properties @@ -208,7 +208,6 @@ standardContext.stop.asyncWaitInterrupted=Une interruption a été reçue en att standardContext.stoppingContext=Exception à l''arrêt du Context [{0}] standardContext.threadBindingListenerError=Une erreur s''est produite dans l''écouteur de l’''association de thread configuré pour le contexte [{0}] standardContext.urlPattern.patternWarning=WARNING : Le modèle (pattern) d''URL [{0}] doit commencer par un ''/'' dans l''API Servlet 2.4 -standardContext.webappClassLoader.missingProperty=Impossible de fixer la propriété [{0}] du chargeur de classes de l''application web à [{1}] car cette propriété n''existe pas standardContext.workCreateException=Impossible de déterminer le chemin absolu pour le répertoire de travail à partir du répertoire [{0}] et de CATALINA_HOME [{1}] pour le contexte [{2}] standardContext.workCreateFail=Impossible de créer le répertoire de travail [{0}] pour le contexte [{1}] standardContext.workPath=Impossible d''obtenir le chemin de travail pour le contexte [{0}] diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties b/java/org/apache/catalina/core/LocalStrings_ja.properties index 018aff9..8af2c96 100644 --- a/java/org/apache/catalina/core/LocalStrings_ja.properties +++ b/java/org/apache/catalina/core/LocalStrings_ja.properties @@ -208,7 +208,6 @@ standardContext.stop.asyncWaitInterrupted=実行中の非同期要求が完了 standardContext.stoppingContext=ローダを停止中の例外です standardContext.threadBindingListenerError=コンテキスト [{0}] に構成されたリスナーを束縛するスレッドで異常が発生しました。 standardContext.urlPattern.patternWarning=警告: Servlet 2.4ではURLパターン [{0}] は''/''で始まらなければいけません -standardContext.webappClassLoader.missingProperty=プロパティが存在しないため、Webアプリケーションクラスローダプロパティ[{0}]を[{1}]に設定できません。 standardContext.workCreateException=コンテキスト[{2}]のディレクトリ[{0}]とCATALINA_HOME [{1}]からの絶対workディレクトリを特定できませんでした standardContext.workCreateFail=コンテキスト [{1}] の作業ディレクトリ [{0}] を作成できません。 standardContext.workPath=コンテキスト[{0}]のworkパスを取得中の例外 diff --git a/java/org/apache/catalina/core/LocalStrings_ko.properties b/java/org/apache/catalina/core/LocalStrings_ko.properties index 4521d76..3abed4c 100644 --- a/java/org/apache/catalina/core/LocalStrings_ko.properties +++ b/java/org/apache/catalina/core/LocalStrings_ko.properties @@ -208,7 +208,6 @@ standardContext.stop.asyncWaitInterrupted=처리 중인 비동기 요청이 완 standardContext.stoppingContext=이름이 [{0}]인 컨텍스트를 중지시키는 중 예외 발생 standardContext.threadBindingListenerError=컨텍스트 [{0}]을(를) 위해 설정된 쓰레드 바인딩 리스너에서 오류가 발생했습니다. standardContext.urlPattern.patternWarning=경고: Servlet 2.4에서 URL 패턴 [{0}]은(는) 반드시 ''/''로 시작해야 합니다. -standardContext.webappClassLoader.missingProperty=해당 프로퍼티가 존재하지 않기에, 웹 애플리케이션 클래스로더 프로퍼티 [{0}]을(를) [{1}](으)로 설정할 수 없습니다. standardContext.workCreateException=디렉토리 [{0}]와(과) CATALINA_HOME [{1}](으)로부터, 컨텍스트 [{2}]을(를) 위한 작업 디렉토리의 절대 경로를 결정하지 못했습니다. standardContext.workCreateFail=컨텍스트 [{1}]을(를) 위한 작업 디렉토리 [{0}]을(를) 생성하지 못했습니다. standardContext.workPath=컨텍스트 [{0}]을(를) 위한 작업 경로를 구하는 중 예외 발생 diff --git a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties index 08a37b9..82fb949 100644 --- a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties +++ b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties @@ -208,7 +208,6 @@ standardContext.stop.asyncWaitInterrupted=等待卸载延迟毫秒以完成飞 standardContext.stoppingContext=异常停止的上下文使用名为[{0}] standardContext.threadBindingListenerError=上下文[{0}]配置的线程绑定监听器发生错误 standardContext.urlPattern.patternWarning=警告:在Servlet 2.4中,URL模式[{0}]必须以“/”开头 -standardContext.webappClassLoader.missingProperty=无法将web应用程序类加载器属性[{0}]设置为[{1}],因为该属性不存在。 standardContext.workCreateException=无法从目录[{0}]和catalina_home[{1}]中为上下文[{2}]确定绝对工作目录 standardContext.workCreateFail=无法为上下文[{1}]创建工作目录[{0}] standardContext.workPath=获取上下文[{0}]的工作路径时发生异常 diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java index 5ede9c5..44b7dd0 100644 --- a/java/org/apache/catalina/core/StandardContext.java +++ b/java/org/apache/catalina/core/StandardContext.java @@ -116,7 +116,6 @@ import org.apache.tomcat.InstanceManager; import org.apache.tomcat.InstanceManagerBindings; import org.apache.tomcat.JarScanner; import org.apache.tomcat.util.ExceptionUtils; -import org.apache.tomcat.util.IntrospectionUtils; import org.apache.tomcat.util.buf.StringUtils; import org.apache.tomcat.util.buf.UDecoder; import org.apache.tomcat.util.descriptor.XmlIdentifiers; @@ -5263,16 +5262,6 @@ public class StandardContext extends ContainerBase } - private void setClassLoaderProperty(String name, boolean value) { - ClassLoader cl = getLoader().getClassLoader(); - if (!IntrospectionUtils.setProperty(cl, name, Boolean.toString(value))) { - // Failed to set - log.info(sm.getString( - "standardContext.webappClassLoader.missingProperty", - name, Boolean.toString(value))); - } - } - private Map<String, Map<String, String>> buildInjectionMap(NamingResourcesImpl namingResources) { Map<String, Map<String, String>> injectionMap = new HashMap<>(); for (Injectable resource: namingResources.findLocalEjbs()) { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org