This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new b77ab12 Fix BZ 64521 - avoid moving i18n translations into classes
dir since they are packaged into separate jars
b77ab12 is described below
commit b77ab12595514e5bd6efe72c43943be844c97712
Author: Raymond Augé <[email protected]>
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é <[email protected]>
---
build.xml | 21 +++++++++++----------
webapps/docs/changelog.xml | 5 +++++
2 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/build.xml b/build.xml
index 64da7e7..e475f01 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"/>
@@ -725,7 +726,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>
@@ -862,7 +864,7 @@
<!-- i18n JARs -->
<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"
@@ -872,7 +874,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"
@@ -882,7 +884,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"
@@ -892,7 +894,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"
@@ -902,7 +904,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"
@@ -912,7 +914,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"
@@ -922,7 +924,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"
@@ -3347,9 +3349,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 bcba434..0230a60 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -122,6 +122,11 @@
<code>LOGGING_CONFIG</code> environment variable to avoid using a POSIX
shell feature that is not available by default on Solaris 10. (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: [email protected]
For additional commands, e-mail: [email protected]
