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 ea79f05 No functional change. Align 10.0.x, 9.0.x and 8.5.x ea79f05 is described below commit ea79f05f25db4560dd34eaf5bdb39fa6338d9212 Author: Mark Thomas <ma...@apache.org> AuthorDate: Mon Mar 29 16:33:11 2021 +0100 No functional change. Align 10.0.x, 9.0.x and 8.5.x --- java/org/apache/jasper/compiler/JDTCompiler.java | 8 ++++---- java/org/apache/jasper/resources/LocalStrings.properties | 3 +++ java/org/apache/jasper/resources/LocalStrings_de.properties | 1 + java/org/apache/jasper/resources/LocalStrings_fr.properties | 3 +++ java/org/apache/jasper/resources/LocalStrings_ja.properties | 3 +++ java/org/apache/jasper/resources/LocalStrings_ko.properties | 3 +++ java/org/apache/jasper/resources/LocalStrings_zh_CN.properties | 3 +++ 7 files changed, 20 insertions(+), 4 deletions(-) diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java b/java/org/apache/jasper/compiler/JDTCompiler.java index c0b39a1..510db1a 100644 --- a/java/org/apache/jasper/compiler/JDTCompiler.java +++ b/java/org/apache/jasper/compiler/JDTCompiler.java @@ -145,7 +145,7 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler { result = new char[buf.length()]; buf.getChars(0, result.length, result, 0); } catch (IOException e) { - log.error("Compilation error", e); + log.error(Localizer.getMessage("jsp.error.compilation.source", sourceFile), e); } return result; } @@ -232,7 +232,7 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler { return new NameEnvironmentAnswer(classFileReader, null); } } catch (IOException | ClassFormatException exc) { - log.error("Compilation error", exc); + log.error(Localizer.getMessage("jsp.error.compilation.dependent", className), exc); } return null; } @@ -465,7 +465,7 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler { (name, pageNodes, new StringBuilder(problem.getMessage()), problem.getSourceLineNumber(), ctxt)); } catch (JasperException e) { - log.error("Error visiting node", e); + log.error(Localizer.getMessage("jsp.error.compilation.jdtProblemError"), e); } } } @@ -491,7 +491,7 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler { } } } catch (IOException exc) { - log.error("Compilation error", exc); + log.error(Localizer.getMessage("jsp.error.compilation.jdt"), exc); } } }; diff --git a/java/org/apache/jasper/resources/LocalStrings.properties b/java/org/apache/jasper/resources/LocalStrings.properties index 4fd82ec..ad38f8b 100644 --- a/java/org/apache/jasper/resources/LocalStrings.properties +++ b/java/org/apache/jasper/resources/LocalStrings.properties @@ -46,6 +46,9 @@ jsp.error.bug48498=Unable to display JSP extract. Probably due to an XML parser jsp.error.classname=Cannot determine classname from .class file jsp.error.coerce_to_type=Cannot coerce value [{2}] to type [{1}] for attribute [{0}]. jsp.error.compilation=Error compiling file: [{0}] [{1}] +jsp.error.compilation.jdt=Compilation error +jsp.error.compilation.jdtProblemError=Error processing JDT problems list +jsp.error.compilation.source=Error loading source file [{0}] jsp.error.compiler=No Java compiler available jsp.error.compiler.config=No Java compiler available for configuration options compilerClassName: [{0}] and compiler: [{1}] jsp.error.config_pagedir_encoding_mismatch=Page-encoding specified in jsp-property-group [{0}] is different from that specified in page directive [{1}] diff --git a/java/org/apache/jasper/resources/LocalStrings_de.properties b/java/org/apache/jasper/resources/LocalStrings_de.properties index 56b5be5..2fbc268 100644 --- a/java/org/apache/jasper/resources/LocalStrings_de.properties +++ b/java/org/apache/jasper/resources/LocalStrings_de.properties @@ -20,6 +20,7 @@ jsp.error.attribute.deferredmix=Kann nicht ${} und #{} gleichzeitig als EL Ausdr jsp.error.attribute.duplicate=Qualifizierte Attributnamen müssen innerhalb eines Elements eindeutig sein jsp.error.attribute.noequal=Gleichheitszeichen erwartet jsp.error.attribute.nowhitespace=Die JSP Spezifikation verlangt, dass einem Attribut Namen ein Leerzeichen vorangeht. +jsp.error.compilation.source=Fehler beim Laden der Quelldatei [{0}] jsp.error.compiler=Keine Java-Compiler verfügbar jsp.error.data.file.processing=Fehler beim Verarbeiten der Datei [{0}] jsp.error.el.template.deferred=#{...} is im Template Text nicht erlaubt diff --git a/java/org/apache/jasper/resources/LocalStrings_fr.properties b/java/org/apache/jasper/resources/LocalStrings_fr.properties index f1ef97e..d7891b2 100644 --- a/java/org/apache/jasper/resources/LocalStrings_fr.properties +++ b/java/org/apache/jasper/resources/LocalStrings_fr.properties @@ -46,6 +46,9 @@ jsp.error.bug48498=Impossible d'afficher un extrait du JSP, ce qui peut être ca jsp.error.classname=Impossible de déterminer le nom de classe d'après le fichier .class jsp.error.coerce_to_type=Impossible de convertir la valeur [{2}] de l''attribut [{0}] vers le type [{1}] jsp.error.compilation=Erreur de compilation du fichier : [{0}] [{1}] +jsp.error.compilation.jdt=Erreur de compilation +jsp.error.compilation.jdtProblemError=Erreur lors du traitement de la liste des problèmes renvoyée par JDT +jsp.error.compilation.source=Erreur lors du chargement du fichier source [{0}] jsp.error.compiler=Aucun compilateur Java disponible jsp.error.compiler.config=Aucun compilateur Java disponible pour les options de configuration compilerClassName : [{0}] et compiler : [{1}] jsp.error.config_pagedir_encoding_mismatch=L''encode de page (Page-encoding) indiqué dans le jsp-property-group [{0}] est différent de celui indiqué dans la directive de page [{1}] diff --git a/java/org/apache/jasper/resources/LocalStrings_ja.properties b/java/org/apache/jasper/resources/LocalStrings_ja.properties index 5cab672..9e04013 100644 --- a/java/org/apache/jasper/resources/LocalStrings_ja.properties +++ b/java/org/apache/jasper/resources/LocalStrings_ja.properties @@ -46,6 +46,9 @@ jsp.error.bug48498=JSP抽出を表示できません。 XMLパーサーのバグ jsp.error.classname=.classファイルからクラス名を決定できません jsp.error.coerce_to_type=属性[{0}]の値[{2}]をタイプ[{1}]に変換できません。 jsp.error.compilation=ファイルのコンパイル中にエラーが発生しました:[{0}] [{1}] +jsp.error.compilation.jdt=コンパイルエラー +jsp.error.compilation.jdtProblemError=JDT問題リスト処理中のエラー +jsp.error.compilation.source=ソースファイル[{0}]の読み込み中のエラー jsp.error.compiler=Java コンパイラが見つかりません。 jsp.error.compiler.config=設定オプション compilerClassName:[{0}]およびコンパイラ:[{1}]のJavaコンパイラは利用可能ではありません。 jsp.error.config_pagedir_encoding_mismatch=jsp-property-group中に指定されているPage-encoding [{0}] がpage指示子中の指定 [{1}] と違います diff --git a/java/org/apache/jasper/resources/LocalStrings_ko.properties b/java/org/apache/jasper/resources/LocalStrings_ko.properties index 9382177..7a9baee 100644 --- a/java/org/apache/jasper/resources/LocalStrings_ko.properties +++ b/java/org/apache/jasper/resources/LocalStrings_ko.properties @@ -46,6 +46,9 @@ jsp.error.bug48498=JSP extract를 표시할 수 없습니다. XML 파서의 버 jsp.error.classname=.class 파일로부터 클래스명을 결정할 수 없습니다. jsp.error.coerce_to_type=속성 [{0}]을(를) 위한 값 [{2}]을(를), 타입 [{1}](으)로 강제 변환 시킬 수 없습니다. jsp.error.compilation=파일 컴파일 중 오류 발생: [{0}] [{1}] +jsp.error.compilation.jdt=컴파일 오류 +jsp.error.compilation.jdtProblemError=JDT 문제들의 목록을 처리하는 중 오류 발생 +jsp.error.compilation.source=소스 파일 [{0}]을(를) 로드하는 중 오류 발생 jsp.error.compiler=가용한 자바 컴파일러가 없습니다. jsp.error.compiler.config=설정 옵션들인 compilerClassName: [{0}]와(과) compiler: [{1}]들을 지원하는, 가용한 자바 컴파일러가 없습니다. jsp.error.config_pagedir_encoding_mismatch=jsp-property-group [{0}]에 지정된 페이지 인코딩이, 페이지 지시어 [{1}]에 지정된 것과 다릅니다. diff --git a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties index bc2700b..379b57d 100644 --- a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties +++ b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties @@ -46,6 +46,9 @@ jsp.error.bug48498=无法显示JSP提取。可能是由于XML解析器错误( jsp.error.classname=无法从.class文件确定类名 jsp.error.coerce_to_type=无法将值[{2}]强制为属性[{0}]的类型[{1}]。 jsp.error.compilation=编译文件时出错:[{0}[{1}] +jsp.error.compilation.jdt=编译错误 +jsp.error.compilation.jdtProblemError=处理JDT问题列表时出错 +jsp.error.compilation.source=加载源文件时出错[{0}] jsp.error.compiler=没有可用的Java编译器 jsp.error.compiler.config=没有可用于配置选项的Java编译器compilerClassName:[{0}]和compiler:[{1}] jsp.error.config_pagedir_encoding_mismatch=jsp属性组[{0}]中指定的页编码与page指令[{1}]中指定的页编码不同 --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org