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
The following commit(s) were added to refs/heads/master by this push:
new 60dcf7c Fix BZ 64521 - avoid moving i18n translations into classes
dir since they are packaged into separate jars
60dcf7c is described below
commit 60dcf7ca2d5c953200f8dfe6fc13097d8b20b526
Author: Raymond Augé <rotty3...@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é <rotty3...@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 e6beaf0..6303917 100644
--- a/build.xml
+++ b/build.xml
@@ -540,6 +540,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"/>
@@ -727,7 +728,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>
@@ -909,7 +911,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"
@@ -919,7 +921,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"
@@ -929,7 +931,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"
@@ -939,7 +941,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"
@@ -949,7 +951,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"
@@ -959,7 +961,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"
@@ -969,7 +971,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"
@@ -979,7 +981,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"
@@ -989,7 +991,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"
@@ -3343,9 +3345,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 daaedda..b181385 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -128,6 +128,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-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
