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/06/15 18:48:54 UTC
[tomcat] branch 9.0.x updated: Fix BZ 64521 - avoid moving i18n
translations into classes dir since they are packaged into separate jars
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 2e32925 Fix BZ 64521 - avoid moving i18n translations into classes dir since they are packaged into separate jars
2e32925 is described below
commit 2e3292574456ae1fa1c2eece5b934fd3cdc65f7f
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Sat Jun 13 17:19:29 2020 -0400
Fix BZ 64521 - avoid moving i18n translations into classes dir since they are packaged into separate jars
Signed-off-by: Raymond Augé <ro...@apache.org>
---
build.xml | 25 +++++++++++++------------
webapps/docs/changelog.xml | 5 +++++
2 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/build.xml b/build.xml
index f22ce5f..f06cea5 100644
--- a/build.xml
+++ b/build.xml
@@ -536,6 +536,7 @@
<mkdir dir="${tomcat.build}"/>
<mkdir dir="${tomcat.build}/bin"/>
<mkdir dir="${tomcat.build}/conf"/>
+ <mkdir dir="${tomcat.build}/i18n"/>
<mkdir dir="${tomcat.build}/lib"/>
<mkdir dir="${tomcat.build}/logs"/>
<mkdir dir="${tomcat.build}/temp"/>
@@ -717,7 +718,8 @@
<!-- Convert the message files from UTF-8 to ASCII. This can be removed
after upgrading to Java 9+ as the minimum JRE and specifying the encoding
when loading the ResourceBundles -->
- <native2ascii src="java" dest="${tomcat.classes}" includes="**/LocalStrings*.properties,**/Messages*.properties" encoding="UTF-8"/>
+ <native2ascii src="java" dest="${tomcat.classes}" includes="**/LocalStrings.properties,**/Messages*.properties" encoding="UTF-8"/>
+ <native2ascii src="java" dest="${tomcat.build}/i18n" includes="**/LocalStrings_*.properties" encoding="UTF-8"/>
</target>
@@ -893,7 +895,7 @@
<!-- i18n JARs -->
<jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar"
manifest="${tomcat.manifests}/default.manifest">
- <fileset dir="${tomcat.classes}">
+ <fileset dir="${tomcat.build}/i18n">
<include name="**/LocalStrings_cs.properties" />
</fileset>
<zipfileset file="${tomcat.manifests}/default.notice"
@@ -903,7 +905,7 @@
</jar>
<jar jarfile="${tomcat.build}/lib/tomcat-i18n-de.jar"
manifest="${tomcat.manifests}/default.manifest">
- <fileset dir="${tomcat.classes}">
+ <fileset dir="${tomcat.build}/i18n">
<include name="**/LocalStrings_de.properties" />
</fileset>
<zipfileset file="${tomcat.manifests}/default.notice"
@@ -913,7 +915,7 @@
</jar>
<jar jarfile="${tomcat.build}/lib/tomcat-i18n-es.jar"
manifest="${tomcat.manifests}/default.manifest">
- <fileset dir="${tomcat.classes}">
+ <fileset dir="${tomcat.build}/i18n">
<include name="**/LocalStrings_es.properties" />
</fileset>
<zipfileset file="${tomcat.manifests}/default.notice"
@@ -923,7 +925,7 @@
</jar>
<jar jarfile="${tomcat.build}/lib/tomcat-i18n-fr.jar"
manifest="${tomcat.manifests}/default.manifest">
- <fileset dir="${tomcat.classes}">
+ <fileset dir="${tomcat.build}/i18n">
<include name="**/LocalStrings_fr.properties" />
</fileset>
<zipfileset file="${tomcat.manifests}/default.notice"
@@ -933,7 +935,7 @@
</jar>
<jar jarfile="${tomcat.build}/lib/tomcat-i18n-ja.jar"
manifest="${tomcat.manifests}/default.manifest">
- <fileset dir="${tomcat.classes}">
+ <fileset dir="${tomcat.build}/i18n">
<include name="**/LocalStrings_ja.properties" />
</fileset>
<zipfileset file="${tomcat.manifests}/default.notice"
@@ -943,7 +945,7 @@
</jar>
<jar jarfile="${tomcat.build}/lib/tomcat-i18n-ko.jar"
manifest="${tomcat.manifests}/default.manifest">
- <fileset dir="${tomcat.classes}">
+ <fileset dir="${tomcat.build}/i18n">
<include name="**/LocalStrings_ko.properties" />
</fileset>
<zipfileset file="${tomcat.manifests}/default.notice"
@@ -953,7 +955,7 @@
</jar>
<jar jarfile="${tomcat.build}/lib/tomcat-i18n-pt-BR.jar"
manifest="${tomcat.manifests}/default.manifest">
- <fileset dir="${tomcat.classes}">
+ <fileset dir="${tomcat.build}/i18n">
<include name="**/LocalStrings_pt_BR.properties" />
</fileset>
<zipfileset file="${tomcat.manifests}/default.notice"
@@ -963,7 +965,7 @@
</jar>
<jar jarfile="${tomcat.build}/lib/tomcat-i18n-ru.jar"
manifest="${tomcat.manifests}/default.manifest">
- <fileset dir="${tomcat.classes}">
+ <fileset dir="${tomcat.build}/i18n">
<include name="**/LocalStrings_ru.properties" />
</fileset>
<zipfileset file="${tomcat.manifests}/default.notice"
@@ -973,7 +975,7 @@
</jar>
<jar jarfile="${tomcat.build}/lib/tomcat-i18n-zh-CN.jar"
manifest="${tomcat.manifests}/default.manifest">
- <fileset dir="${tomcat.classes}">
+ <fileset dir="${tomcat.build}/i18n">
<include name="**/LocalStrings_zh_CN.properties" />
</fileset>
<zipfileset file="${tomcat.manifests}/default.notice"
@@ -3326,9 +3328,8 @@ Read the Building page on the Apache Tomcat documentation site for details on ho
<jar jarfile="@{jarfile}" manifest="@{manifest}">
<fileset dir="@{filesDir}">
<patternset refid="@{filesId}"/>
- <!-- Javadoc and i18n exclusions -->
+ <!-- Javadoc exclusions -->
<exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
</fileset>
<zipfileset dir="@{meta-inf}" prefix="META-INF/"
excludes=".gitignore" />
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4518796..2d3c18f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -114,6 +114,11 @@
to address packaging/dependency concerns for JPMS and OSGi. Pull request
provided by Raymond Augé. (markt)
</fix>
+ <fix>
+ <bug>64521</bug>: Avoid moving i18n translations into classes dir since
+ they are packaged into separate jars. Pull request provided by Raymond
+ Augé. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org