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:36 UTC
[tomcat] 01/03: Update translation import/export to handle javax ->
jakarta migration
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