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/01/13 11:56:08 UTC
[tomcat] 16/18: Update JSP version in code to 3.0
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
commit 7d4b08ccc3c0972646dfe9d692e036ed7ec0e331
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jan 13 11:39:11 2020 +0000
Update JSP version in code to 3.0
---
java/org/apache/jasper/compiler/Generator.java | 2 +-
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 +-
java/org/apache/jasper/runtime/JspFactoryImpl.java | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/java/org/apache/jasper/compiler/Generator.java b/java/org/apache/jasper/compiler/Generator.java
index b0b03f2..50f8767 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -831,7 +831,7 @@ class Generator {
out.println(");");
if (ctxt.getOptions().isXpoweredBy()) {
- out.printil("response.addHeader(\"X-Powered-By\", \"JSP/2.3\");");
+ out.printil("response.addHeader(\"X-Powered-By\", \"JSP/3.0\");");
}
out.printil("pageContext = _jspxFactory.getPageContext(this, request, response,");
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties b/java/org/apache/jasper/resources/LocalStrings.properties
index e51ba3d..e7a4e4d 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -15,7 +15,7 @@
jasper.error.emptybodycontent.nonempty=According to TLD, tag [{0}] must be empty, but is not
-jsp.engine.info=Jasper JSP 2.3 Engine
+jsp.engine.info=Jasper JSP 3.0 Engine
jsp.error.URLMustStartWithSlash=Path [{0}] must start with a slash character
jsp.error.action.isnottagfile=[{0}] action can be used in tag files only
jsp.error.action.istagfile=[{0}] action cannot be used in a tag file
diff --git a/java/org/apache/jasper/resources/LocalStrings_es.properties b/java/org/apache/jasper/resources/LocalStrings_es.properties
index 5f2f900..b71e975 100644
--- a/java/org/apache/jasper/resources/LocalStrings_es.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_es.properties
@@ -15,7 +15,7 @@
jasper.error.emptybodycontent.nonempty=Según el TLD, el tag [{0}] debe de estar vacío, pero no lo está
-jsp.engine.info=Motor Jasper JSP 2.3
+jsp.engine.info=Motor Jasper JSP 3.0
jsp.error.action.isnottagfile=La acción [{0}] sólo se puede usar en archivos tag
jsp.error.action.istagfile=La acción [{0}] no se puede usar en un archivo tag
jsp.error.attempt_to_clear_flushed_buffer=Error: Se ha intentado limpiar un buffer que ya había sido escrito
diff --git a/java/org/apache/jasper/resources/LocalStrings_fr.properties b/java/org/apache/jasper/resources/LocalStrings_fr.properties
index 6373ae8..e3e0812 100644
--- a/java/org/apache/jasper/resources/LocalStrings_fr.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_fr.properties
@@ -15,7 +15,7 @@
jasper.error.emptybodycontent.nonempty=D''après la TLD, le tag [{0}] doit être vide, mais ne l''est pas
-jsp.engine.info=Moteur Jasper JSP 2.3
+jsp.engine.info=Moteur Jasper JSP 3.0
jsp.error.URLMustStartWithSlash=Le chemin [{0}] doit commencer par un caractère slash
jsp.error.action.isnottagfile=L''action [{0}] ne peut être utilisée que dans un fichier tag
jsp.error.action.istagfile=L''action [{0}] ne peut être utilisée dans un fichier tag
diff --git a/java/org/apache/jasper/resources/LocalStrings_ja.properties b/java/org/apache/jasper/resources/LocalStrings_ja.properties
index 58aab4f..f47a2de 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ja.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ja.properties
@@ -15,7 +15,7 @@
jasper.error.emptybodycontent.nonempty=TLDに従ってタグ [{0}] は空でなければいけませんが、そうではありません
-jsp.engine.info=Jasper JSP 2.3エンジン
+jsp.engine.info=Jasper JSP 3.0エンジン
jsp.error.URLMustStartWithSlash=パス[{0}]はスラッシュ文字で始まる必要があります。
jsp.error.action.isnottagfile=[{0}] アクションはタグファイル中でのみ使用できません
jsp.error.action.istagfile=[{0}] アクションはタグファイル中で使用できません
diff --git a/java/org/apache/jasper/resources/LocalStrings_ko.properties b/java/org/apache/jasper/resources/LocalStrings_ko.properties
index ed63764..5cf8e16 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ko.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ko.properties
@@ -15,7 +15,7 @@
jasper.error.emptybodycontent.nonempty=TLD 파일에 따르면, [{0}] 태그는 반드시 비어 있어야 하는데, 그렇지 않습니다,
-jsp.engine.info=Jasper JSP 2.3 엔진
+jsp.engine.info=Jasper JSP 3.0 엔진
jsp.error.URLMustStartWithSlash=경로 [{0}]은(는) 반드시 슬래시 문자로 시작해야 합니다.
jsp.error.action.isnottagfile=[{0}] 액션은 오직 태그 파일들 내에서만 사용될 수 있습니다.
jsp.error.action.istagfile=[{0}] 액션은 태그 파일 내에서 사용될 수 없습니다.
diff --git a/java/org/apache/jasper/runtime/JspFactoryImpl.java b/java/org/apache/jasper/runtime/JspFactoryImpl.java
index 1e4a005..4bbaafb 100644
--- a/java/org/apache/jasper/runtime/JspFactoryImpl.java
+++ b/java/org/apache/jasper/runtime/JspFactoryImpl.java
@@ -38,7 +38,7 @@ import org.apache.jasper.Constants;
*/
public class JspFactoryImpl extends JspFactory {
- private static final String SPEC_VERSION = "2.3";
+ private static final String SPEC_VERSION = "3.0";
private static final boolean USE_POOL =
Boolean.parseBoolean(System.getProperty("org.apache.jasper.runtime.JspFactoryImpl.USE_POOL", "true"));
private static final int POOL_SIZE =
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org