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 10:54:35 UTC
[tomcat] branch master updated (51f8c1c -> 319b6c8)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 51f8c1c Increment version for next dev cycle
new fb51a07 Update translation import/export to handle javax -> jakarta migration
new 09afab2 Parameterize JSP spec version in localization messages to ease re-use
new 319b6c8 Update spec versions
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
BUILDING.txt | 7 ++++---
RELEASE-NOTES | 10 +++++-----
java/org/apache/jasper/Constants.java | 2 ++
java/org/apache/jasper/resources/LocalStrings.properties | 2 +-
.../apache/jasper/resources/LocalStrings_es.properties | 2 +-
.../apache/jasper/resources/LocalStrings_fr.properties | 2 +-
.../apache/jasper/resources/LocalStrings_ja.properties | 2 +-
.../apache/jasper/resources/LocalStrings_ko.properties | 2 +-
java/org/apache/jasper/runtime/HttpJspBase.java | 3 ++-
java/org/apache/jasper/runtime/JspFactoryImpl.java | 3 +--
.../org/apache/tomcat/buildutil/translate/Constants.java | 3 +++
java/org/apache/tomcat/buildutil/translate/Import.java | 2 +-
java/org/apache/tomcat/buildutil/translate/Utils.java | 3 +++
webapps/docs/changelog.xml | 16 ++++++++++++++++
14 files changed, 42 insertions(+), 17 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/03: Parameterize JSP spec version in localization
messages to ease re-use
Posted by ma...@apache.org.
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 09afab24d6a6a223ff1bf4eb4876f9003f9e6364
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Feb 6 10:01:47 2020 +0000
Parameterize JSP spec version in localization messages to ease re-use
---
java/org/apache/jasper/Constants.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/HttpJspBase.java | 3 ++-
java/org/apache/jasper/runtime/JspFactoryImpl.java | 3 +--
webapps/docs/changelog.xml | 8 ++++++++
9 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/java/org/apache/jasper/Constants.java b/java/org/apache/jasper/Constants.java
index 73e3bf2..43730f6 100644
--- a/java/org/apache/jasper/Constants.java
+++ b/java/org/apache/jasper/Constants.java
@@ -30,6 +30,8 @@ import java.util.List;
*/
public class Constants {
+ public static final String SPEC_VERSION = "3.0";
+
/**
* The base class of the generated servlets.
*/
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties b/java/org/apache/jasper/resources/LocalStrings.properties
index e7a4e4d..a63e77c 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 3.0 Engine
+jsp.engine.info=Jasper JSP {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 b71e975..6046657 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 3.0
+jsp.engine.info=Motor Jasper JSP {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 e3e0812..505c7e2 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 3.0
+jsp.engine.info=Moteur Jasper JSP {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 f47a2de..bb3f8bc 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 3.0エンジン
+jsp.engine.info=Jasper JSP {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 5cf8e16..96ccab6 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 3.0 엔진
+jsp.engine.info=Jasper JSP {0} 엔진
jsp.error.URLMustStartWithSlash=경로 [{0}]은(는) 반드시 슬래시 문자로 시작해야 합니다.
jsp.error.action.isnottagfile=[{0}] 액션은 오직 태그 파일들 내에서만 사용될 수 있습니다.
jsp.error.action.istagfile=[{0}] 액션은 태그 파일 내에서 사용될 수 없습니다.
diff --git a/java/org/apache/jasper/runtime/HttpJspBase.java b/java/org/apache/jasper/runtime/HttpJspBase.java
index 64caf7e..4ba635c 100644
--- a/java/org/apache/jasper/runtime/HttpJspBase.java
+++ b/java/org/apache/jasper/runtime/HttpJspBase.java
@@ -26,6 +26,7 @@ import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.servlet.jsp.HttpJspPage;
+import org.apache.jasper.Constants;
import org.apache.jasper.compiler.Localizer;
/**
@@ -51,7 +52,7 @@ public abstract class HttpJspBase extends HttpServlet implements HttpJspPage {
@Override
public String getServletInfo() {
- return Localizer.getMessage("jsp.engine.info");
+ return Localizer.getMessage("jsp.engine.info", Constants.SPEC_VERSION);
}
@Override
diff --git a/java/org/apache/jasper/runtime/JspFactoryImpl.java b/java/org/apache/jasper/runtime/JspFactoryImpl.java
index 4bbaafb..44a53db 100644
--- a/java/org/apache/jasper/runtime/JspFactoryImpl.java
+++ b/java/org/apache/jasper/runtime/JspFactoryImpl.java
@@ -38,7 +38,6 @@ import org.apache.jasper.Constants;
*/
public class JspFactoryImpl extends JspFactory {
- 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 =
@@ -81,7 +80,7 @@ public class JspFactoryImpl extends JspFactory {
return new JspEngineInfo() {
@Override
public String getSpecificationVersion() {
- return SPEC_VERSION;
+ return Constants.SPEC_VERSION;
}
};
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 108e7c7..5fd3a3b 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -45,6 +45,14 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 10.0.0.0-M2 (markt)" rtext="in development">
+ <subsection name="Jasper">
+ <changelog>
+ <scode>
+ Parameterize JSP version in localization messages to allow simpler
+ re-use between major versions. (markt)
+ </scode>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 10.0.0.0-M1 (markt)" rtext="release in progress">
<subsection name="General">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/03: Update translation import/export to handle javax ->
jakarta migration
Posted by ma...@apache.org.
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 fb51a0780522e3a2f011fcdff883b8819447fe53
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Feb 6 09:36:32 2020 +0000
Update translation import/export to handle javax -> jakarta migration
---
java/org/apache/tomcat/buildutil/translate/Constants.java | 3 +++
java/org/apache/tomcat/buildutil/translate/Import.java | 2 +-
java/org/apache/tomcat/buildutil/translate/Utils.java | 3 +++
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/buildutil/translate/Constants.java b/java/org/apache/tomcat/buildutil/translate/Constants.java
index 403daa6..c4c4a5a 100644
--- a/java/org/apache/tomcat/buildutil/translate/Constants.java
+++ b/java/org/apache/tomcat/buildutil/translate/Constants.java
@@ -26,4 +26,7 @@ public class Constants {
public static final String STORAGE_DIR = ".settings/translations";
public static final String END_PACKAGE_MARKER = ".zzz.";
+
+ public static final String JAVA_EE_SUBSTRING = "java.javax";
+ public static final String JAKARTA_EE_SUBSTRING = "java.jakarta";
}
diff --git a/java/org/apache/tomcat/buildutil/translate/Import.java b/java/org/apache/tomcat/buildutil/translate/Import.java
index 4cf6fec..bdffd73 100644
--- a/java/org/apache/tomcat/buildutil/translate/Import.java
+++ b/java/org/apache/tomcat/buildutil/translate/Import.java
@@ -124,7 +124,7 @@ public class Import {
public CompositeKey(String in) {
int posPkg = in.indexOf(Constants.END_PACKAGE_MARKER);
- pkg = in.substring(0, posPkg);
+ pkg = in.substring(0, posPkg).replace(Constants.JAVA_EE_SUBSTRING, Constants.JAKARTA_EE_SUBSTRING);
key = in.substring(posPkg + Constants.END_PACKAGE_MARKER.length());
int posGroup = key.indexOf('.');
if (posGroup == -1) {
diff --git a/java/org/apache/tomcat/buildutil/translate/Utils.java b/java/org/apache/tomcat/buildutil/translate/Utils.java
index 5eb015f..e7f7795 100644
--- a/java/org/apache/tomcat/buildutil/translate/Utils.java
+++ b/java/org/apache/tomcat/buildutil/translate/Utils.java
@@ -129,6 +129,9 @@ public class Utils {
prefix = prefix.substring(root.getCanonicalPath().length() + 1);
prefix = prefix.replace(File.separatorChar, '.');
prefix = prefix + Constants.END_PACKAGE_MARKER;
+ // POEditor uses javax package names.
+ // Renaming here is less work than renaming terms in POEditor
+ prefix = prefix.replace(Constants.JAKARTA_EE_SUBSTRING, Constants.JAVA_EE_SUBSTRING);
return prefix;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 03/03: Update spec versions
Posted by ma...@apache.org.
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 319b6c8e23e034da5e2cf90a8bfb54ef70572f2f
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Feb 6 10:05:54 2020 +0000
Update spec versions
---
BUILDING.txt | 7 ++++---
RELEASE-NOTES | 10 +++++-----
webapps/docs/changelog.xml | 8 ++++++++
3 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/BUILDING.txt b/BUILDING.txt
index f8695fb..a8d31a6 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -19,9 +19,10 @@
Building The Apache Tomcat @VERSION_MAJOR_MINOR@ Servlet/JSP Container
====================================================
-This subproject contains the source code for Tomcat @VERSION_MAJOR_MINOR@, a container that
-implements the Servlet 4.0, JSP 2.3, EL 3.0, WebSocket 1.1 and JASPIC 1.1
-specifications from the Java Community Process <https://www.jcp.org/>.
+This project contains the source code for Tomcat @VERSION_MAJOR_MINOR@, a container that
+implements the Jakarta Servlet 5.0, JSP 3.0, EL 4.0, WebSocket 2.0 and
+Authentication 2.0 specifications from the Jakarta EE project at Eclipse
+<https://jakarta.ee//>.
Note: If you just need to run Apache Tomcat, it is not necessary to build
it. You may simply download a binary distribution. It is cross-platform.
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c4e88e1..ae7072f 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -74,19 +74,19 @@ for use by web applications (by placing them in "lib"):
* catalina-storeconfig.jar (Generation of XML configuration from current state)
* catalina-tribes.jar (Group communication)
* ecj-@JDT_VERSION@.jar (Eclipse JDT Java compiler)
-* el-api.jar (EL 3.0 API)
+* el-api.jar (EL 4.0 API)
* jasper.jar (Jasper 2 Compiler and Runtime)
* jasper-el.jar (Jasper 2 EL implementation)
-* jsp-api.jar (JSP 2.3 API)
-* servlet-api.jar (Servlet 4.0 API)
+* jsp-api.jar (JSP 3.0 API)
+* servlet-api.jar (Servlet 5.0 API)
* tomcat-api.jar (Interfaces shared by Catalina and Jasper)
* tomcat-coyote.jar (Tomcat connectors and utility classes)
* tomcat-dbcp.jar (package renamed database connection pool based on Commons DBCP 2)
* tomcat-jdbc.jar (Tomcat's database connection pooling solution)
* tomcat-jni.jar (Interface to the native component of the APR/native connector)
* tomcat-util.jar (Various utilities)
-* tomcat-websocket.jar (WebSocket 1.1 implementation)
-* websocket-api.jar (WebSocket 1.1 API)
+* tomcat-websocket.jar (WebSocket 2.0 implementation)
+* websocket-api.jar (WebSocket 2.0 API)
You can make additional APIs available to all of your web applications by
putting unpacked classes into a "classes" directory (not created by default),
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5fd3a3b..6771063 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -53,6 +53,14 @@
</scode>
</changelog>
</subsection>
+ <subsection name="Other">
+ <changelog>
+ <fix>
+ Update implementated specification version information in a few places
+ where it has not been updated for Jakarta EE 9. (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 10.0.0.0-M1 (markt)" rtext="release in progress">
<subsection name="General">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org