You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/02/06 11:04:21 UTC
[tomcat] branch master updated: Parameterize localization string to
ease Java EE / Jakarta EE re-use
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 2e69b8b Parameterize localization string to ease Java EE / Jakarta EE re-use
2e69b8b is described below
commit 2e69b8b9edb218ab77214a9789b0d8d1aae7b98f
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Feb 6 11:04:04 2020 +0000
Parameterize localization string to ease Java EE / Jakarta EE re-use
---
java/org/apache/jasper/compiler/TagFileProcessor.java | 3 ++-
java/org/apache/jasper/resources/LocalStrings.properties | 2 +-
java/org/apache/jasper/resources/LocalStrings_es.properties | 2 +-
java/org/apache/jasper/resources/LocalStrings_fr.properties | 2 +-
java/org/apache/jasper/resources/LocalStrings_ja.properties | 2 +-
java/org/apache/jasper/resources/LocalStrings_ko.properties | 2 +-
webapps/docs/changelog.xml | 4 ++--
7 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/java/org/apache/jasper/compiler/TagFileProcessor.java b/java/org/apache/jasper/compiler/TagFileProcessor.java
index af1ed91..c91b2aa 100644
--- a/java/org/apache/jasper/compiler/TagFileProcessor.java
+++ b/java/org/apache/jasper/compiler/TagFileProcessor.java
@@ -25,6 +25,7 @@ import java.util.Vector;
import jakarta.el.MethodExpression;
import jakarta.el.ValueExpression;
+import jakarta.servlet.jsp.tagext.JspFragment;
import jakarta.servlet.jsp.tagext.TagAttributeInfo;
import jakarta.servlet.jsp.tagext.TagFileInfo;
import jakarta.servlet.jsp.tagext.TagInfo;
@@ -252,7 +253,7 @@ class TagFileProcessor {
// type is fixed to "JspFragment" and a translation error
// must occur if specified.
if (type != null) {
- err.jspError(n, "jsp.error.fragmentwithtype");
+ err.jspError(n, "jsp.error.fragmentwithtype", JspFragment.class.getName());
}
// rtexprvalue is fixed to "true" and a translation error
// must occur if specified.
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties b/java/org/apache/jasper/resources/LocalStrings.properties
index a63e77c..17a0ace 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -76,7 +76,7 @@ jsp.error.file.already.registered=Recursive include of file [{0}]
jsp.error.file.cannot.read=Cannot read file: [{0}]
jsp.error.file.not.found=File [{0}] not found
jsp.error.flush=Exception occurred when flushing data
-jsp.error.fragmentwithtype=Cannot specify both 'fragment' and 'type' attributes. If 'fragment' is present, 'type' is fixed as 'jakarta.servlet.jsp.tagext.JspFragment'
+jsp.error.fragmentwithtype=Cannot specify both 'fragment' and 'type' attributes. If 'fragment' is present, 'type' is fixed as '{0}'
jsp.error.function.classnotfound=The class [{0}] specified in TLD for the function [{1}] cannot be found: [{2}]
jsp.error.include.exception=Unable to include [{0}]
jsp.error.include.tag=Invalid jsp:include tag
diff --git a/java/org/apache/jasper/resources/LocalStrings_es.properties b/java/org/apache/jasper/resources/LocalStrings_es.properties
index 6046657..e5eb63e 100644
--- a/java/org/apache/jasper/resources/LocalStrings_es.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_es.properties
@@ -69,7 +69,7 @@ jsp.error.file.already.registered=El archivo [{0}] ya se ha visto, ¿podría ser
jsp.error.file.cannot.read=No se puede leer el archivo: [{0}]
jsp.error.file.not.found=Archivo JSP [{0}] no encontrado
jsp.error.flush=Excepción sucedida al vaciar los datos
-jsp.error.fragmentwithtype=No puede especificar ambos atributos 'fragment' y 'type'. Si está presente 'fragment', 'type' se pone como 'jakarta.servlet.jsp.tagext.JspFragment'
+jsp.error.fragmentwithtype=No puede especificar ambos atributos 'fragment' y 'type'. Si está presente 'fragment', 'type' se pone como '{0}'
jsp.error.function.classnotfound=La clase [{0}] especificada en el TLD para la función [{1}] no se puede hallar: [{2}]
jsp.error.include.exception=No se puede incluir [{0}]
jsp.error.include.tag=Tag jsp:include no válido
diff --git a/java/org/apache/jasper/resources/LocalStrings_fr.properties b/java/org/apache/jasper/resources/LocalStrings_fr.properties
index 505c7e2..9970182 100644
--- a/java/org/apache/jasper/resources/LocalStrings_fr.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_fr.properties
@@ -76,7 +76,7 @@ jsp.error.file.already.registered=Inclusion récursive du fichier [{0}]
jsp.error.file.cannot.read=Impossible de lire le fichier: [{0}]
jsp.error.file.not.found=Le fichier [{0}] n''a pas été trouvé
jsp.error.flush=Une exception s'est produite lors de l'envoi des données
-jsp.error.fragmentwithtype=On ne peut indiquer à la fois les attributs 'fragment' et 'type'. Si 'fragment' est présent, 'type' est fixé comme 'jakarta.servlet.jsp.tagext.JspFragment'
+jsp.error.fragmentwithtype=On ne peut indiquer à la fois les attributs 'fragment' et 'type'. Si 'fragment' est présent, 'type' est fixé comme '{0}'
jsp.error.function.classnotfound=La classe [{0}] spécifiée dans la TLD pour la fonction [{1}] n''a pas été trouvée: [{2}]
jsp.error.include.exception=Impossible d''inclure (include) [{0}]
jsp.error.include.tag=Tag jsp:include incorrect
diff --git a/java/org/apache/jasper/resources/LocalStrings_ja.properties b/java/org/apache/jasper/resources/LocalStrings_ja.properties
index bb3f8bc..3bcae7d 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ja.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ja.properties
@@ -76,7 +76,7 @@ jsp.error.file.already.registered=ファイル [{0}] の再帰的な取り込み
jsp.error.file.cannot.read=ファイルが読めません: [{0}]
jsp.error.file.not.found=JSP ファイル [{0}] が見つかりません
jsp.error.flush=データをフラッシュする際に例外が発生しました。
-jsp.error.fragmentwithtype='fragment'属性と'type'属性を両方指定できません。'fragment'が存在する場合には'type'は'jakarta.servlet.jsp.tagext.JspFragment'に固定されます
+jsp.error.fragmentwithtype='fragment'属性と'type'属性を両方指定できません。'fragment'が存在する場合には'type'は'{0}'に固定されます
jsp.error.function.classnotfound=TLDの中で関数 [{1}] に指定されているクラス [{0}] が見つかりません: [{2}]
jsp.error.include.exception=[{0}] を取り込めません
jsp.error.include.tag=無効なjsp:includeタグです
diff --git a/java/org/apache/jasper/resources/LocalStrings_ko.properties b/java/org/apache/jasper/resources/LocalStrings_ko.properties
index 96ccab6..38c2f73 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ko.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ko.properties
@@ -77,7 +77,7 @@ jsp.error.file.already.registered=파일 [{0}]의 재귀적인 include입니다.
jsp.error.file.cannot.read=파일을 읽을 수 없습니다: [{0}]
jsp.error.file.not.found=파일 [{0}]을(를) 찾을 수 없습니다.
jsp.error.flush=데이터를 배출하는 중 예외가 발생했습니다.
-jsp.error.fragmentwithtype='fragment'와 'type' 속성, 둘 다를 지정할 수 없습니다. 만일 'fragment'이 지정되면, 'type'은 'jakarta.servlet.jsp.tagext.JspFragment'으로 고정됩니다.
+jsp.error.fragmentwithtype='fragment'와 'type' 속성, 둘 다를 지정할 수 없습니다. 만일 'fragment'이 지정되면, 'type'은 '{0}'으로 고정됩니다.
jsp.error.function.classnotfound=function [{1}]을(를) 위하여 TLD에 지정된, 클래스 [{0}]을(를) 찾을 수 없습니다: [{2}]
jsp.error.include.exception=[{0}]을(를) include할 수 없습니다.
jsp.error.include.tag=유효하지 않은 jsp:include 태그
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 6771063..c6b7b2c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -48,8 +48,8 @@
<subsection name="Jasper">
<changelog>
<scode>
- Parameterize JSP version in localization messages to allow simpler
- re-use between major versions. (markt)
+ Parameterize JSP version and API class names in localization messages to
+ allow simpler re-use between major versions. (markt)
</scode>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org