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/05/04 16:51:22 UTC
[tomcat] branch 8.5.x updated (d7df70c -> 9d10586)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from d7df70c Backport updates / additions to Chinese translations
new 69801e6 Skip backport of keys known to be different
new 9d10586 Additional keys that change between 7.0.x and 8.5.x
The 2 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:
.../tomcat/buildutil/translate/BackportEnglish.java | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Skip backport of keys known to be different
Posted by ma...@apache.org.
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
commit 69801e6f17546911060f69076b4f2fdbc15bdd2e
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon May 4 17:10:16 2020 +0100
Skip backport of keys known to be different
---
.../tomcat/buildutil/translate/BackportEnglish.java | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
index c6f9608..023aa3f 100644
--- a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
+++ b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
@@ -17,6 +17,8 @@
package org.apache.tomcat.buildutil.translate;
import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
/**
* Generates a set of English property files to back-port updates to a previous
@@ -27,7 +29,18 @@ import java.io.IOException;
*/
public class BackportEnglish extends BackportBase {
+ private static Set<String> keysToExclude = new HashSet<>();
+
+
public static void main(String... args) throws IOException {
+ // Exclude keys known to be different between 9.0.x and 8.5.x
+ keysToExclude.add("java.org.apache.catalina.manager.zzz.htmlManagerServlet.deployPath");
+ keysToExclude.add("java.org.apache.catalina.mbeans.zzz.jmxRemoteLifecycleListener.deprecated");
+ keysToExclude.add("java.org.apache.catalina.startup.zzz.catalina.stopServer.connectException");
+ keysToExclude.add("java.org.apache.jasper.resources.zzz.jspc.usage");
+ keysToExclude.add("java.org.apache.jasper.resources.zzz.jspc.webfrg.header");
+ keysToExclude.add("java.org.apache.jasper.resources.zzz.jspc.webxml.header");
+
BackportEnglish backport = new BackportEnglish(args);
backport.execute();
}
@@ -41,7 +54,7 @@ public class BackportEnglish extends BackportBase {
@Override
protected void execute() throws IOException {
for (Object key : sourceEnglish.keySet()) {
- if (targetEnglish.containsKey(key)) {
+ if (targetEnglish.containsKey(key) && !keysToExclude.contains(key)) {
targetEnglish.put(key, sourceEnglish.get(key));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Additional keys that change between 7.0.x and 8.5.x
Posted by ma...@apache.org.
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
commit 9d10586adf581eb33b84192d550c0f1d38869d1f
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon May 4 17:50:52 2020 +0100
Additional keys that change between 7.0.x and 8.5.x
---
java/org/apache/tomcat/buildutil/translate/BackportEnglish.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
index 023aa3f..fb43d84 100644
--- a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
+++ b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
@@ -36,7 +36,10 @@ public class BackportEnglish extends BackportBase {
// Exclude keys known to be different between 9.0.x and 8.5.x
keysToExclude.add("java.org.apache.catalina.manager.zzz.htmlManagerServlet.deployPath");
keysToExclude.add("java.org.apache.catalina.mbeans.zzz.jmxRemoteLifecycleListener.deprecated");
+ keysToExclude.add("java.org.apache.catalina.session.zzz.managerBase.contextNull");
keysToExclude.add("java.org.apache.catalina.startup.zzz.catalina.stopServer.connectException");
+ keysToExclude.add("java.org.apache.jasper.resources.zzz.jsp.error.jsproot.version.invalid");
+ keysToExclude.add("java.org.apache.jasper.resources.zzz.jsp.tldCache.noTldInJar");
keysToExclude.add("java.org.apache.jasper.resources.zzz.jspc.usage");
keysToExclude.add("java.org.apache.jasper.resources.zzz.jspc.webfrg.header");
keysToExclude.add("java.org.apache.jasper.resources.zzz.jspc.webxml.header");
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org