Author: kkolinko
Date: Tue Jul 7 12:06:56 2009
New Revision: 791805
URL: http://svn.apache.org/viewvc?rev=791805&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47149
Explicitly specify encoding for the source files when compiling
Modified:
tomcat/build/tc5.5.x/build.xml
tomcat/connectors/trunk/coyote/build.xml
tomcat/connectors/trunk/http11/build.xml
tomcat/connectors/trunk/jk/build.xml
tomcat/connectors/trunk/jk/jkstatus/build.xml
tomcat/connectors/trunk/jni/build.xml
tomcat/connectors/trunk/juli/build.xml
tomcat/connectors/trunk/util/build.xml
tomcat/container/tc5.5.x/catalina/build.xml
tomcat/container/tc5.5.x/modules/cluster/build.xml
tomcat/container/tc5.5.x/modules/groupcom/build.xml
tomcat/container/tc5.5.x/modules/groupcom/build/build.xml
tomcat/container/tc5.5.x/modules/ha/build.xml
tomcat/container/tc5.5.x/modules/storeconfig-ha/build.xml
tomcat/container/tc5.5.x/modules/storeconfig/build.xml
tomcat/container/tc5.5.x/tester/build.xml
tomcat/container/tc5.5.x/webapps/admin/build.xml
tomcat/container/tc5.5.x/webapps/balancer/build.xml
tomcat/current/tc5.5.x/STATUS.txt
tomcat/jasper/tc5.5.x/build.xml
tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/build.xml
tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/build.xml
Modified: tomcat/build/tc5.5.x/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/build.xml?rev=791805&r1=791804&r2=791805&view=diff
==============================================================================
--- tomcat/build/tc5.5.x/build.xml (original)
+++ tomcat/build/tc5.5.x/build.xml Tue Jul 7 12:06:56 2009
@@ -454,15 +454,17 @@
uriroot="${ROOT.base}"
webXmlFragment="${ROOT.base}/WEB-INF/generated_web.xml"
addWebXmlMappings="true"
- outputDir="${ROOT.base}/WEB-INF/src" />
+ outputDir="${ROOT.base}/WEB-INF/src"
+ javaEncoding="UTF-8" />
<jasper2
compile="false"
validateXml="false"
uriroot="${jsp-examples.base}"
- webXmlFragment="${jsp-examples.base}/WEB-INF/generated_web.xml"
+ webXmlFragment="${jsp-examples.base}/WEB-INF/generated_web.xml"
addWebXmlMappings="true"
- outputDir="${jsp-examples.base}/WEB-INF/src" />
+ outputDir="${jsp-examples.base}/WEB-INF/src"
+ javaEncoding="UTF-8" />
<jasper2
package="admin"
@@ -471,7 +473,8 @@
uriroot="${admin.base}"
webXmlFragment="${admin.base}/WEB-INF/generated_web.xml"
addWebXmlMappings="true"
- outputDir="${admin.base}/WEB-INF/src/admin" />
+ outputDir="${admin.base}/WEB-INF/src/admin"
+ javaEncoding="UTF-8" />
<javac destdir="${ROOT.base}/WEB-INF/classes"
optimize="off"
@@ -480,7 +483,8 @@
source="${compile.source}"
failonerror="false"
srcdir="${ROOT.base}/WEB-INF/src"
- excludes="**/*.smap">
+ excludes="**/*.smap"
+ encoding="UTF-8">
<classpath>
<pathelement location="${java.home}/../lib/tools.jar"/>
<fileset dir="${tomcat.build}/server/lib">
@@ -508,7 +512,8 @@
source="${compile.source}"
failonerror="false"
srcdir="${jsp-examples.base}/WEB-INF/src"
- excludes="**/*.smap">
+ excludes="**/*.smap"
+ encoding="UTF-8">
<classpath>
<pathelement location="${java.home}/../lib/tools.jar"/>
<fileset dir="${tomcat.build}/server/lib">
@@ -534,7 +539,8 @@
source="${compile.source}"
failonerror="false"
srcdir="${admin.base}/WEB-INF/src"
- excludes="**/*.smap">
+ excludes="**/*.smap"
+ encoding="UTF-8">
<classpath>
<pathelement location="${java.home}/../lib/tools.jar"/>
<fileset dir="${tomcat.build}/server/lib">
@@ -744,7 +750,8 @@
deprecation="${compile.deprecation}"
source="${compile.source}"
sourcepath="${tomcat-dbcp.home}/src/java"
- srcdir="src/java" >
+ srcdir="src/java"
+ encoding="ISO-8859-1">
<include name="**" />
</javac>
<jar jarfile="${tomcat-dbcp.jar}"
Modified: tomcat/connectors/trunk/coyote/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/coyote/build.xml?rev=791805&r1=791804&r2=791805&view=diff
==============================================================================
--- tomcat/connectors/trunk/coyote/build.xml (original)
+++ tomcat/connectors/trunk/coyote/build.xml Tue Jul 7 12:06:56 2009
@@ -218,7 +218,8 @@
destdir="${build.home}/classes"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
- optimize="${compile.optimize}">
+ optimize="${compile.optimize}"
+ encoding="ISO-8859-1">
<classpath refid="compile.classpath"/>
<exclude name="org/apache/coyote/tomcat5/**" />
<exclude name="org/apache/coyote/tomcat4/**" />
@@ -237,7 +238,8 @@
destdir="${build.home}/classes"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
- optimize="${compile.optimize}">
+ optimize="${compile.optimize}"
+ encoding="ISO-8859-1">
<classpath refid="compile.classpath"/>
<include name="org/apache/coyote/tomcat5/**" />
</javac>
@@ -262,7 +264,8 @@
destdir="${build.home}/classes"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
- optimize="${compile.optimize}">
+ optimize="${compile.optimize}"
+ encoding="ISO-8859-1">
<classpath refid="compile.classpath"/>
<include name="org/apache/coyote/tomcat4/**" />
</javac>
@@ -277,7 +280,8 @@
destdir="${build.home}/classes"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
- optimize="${compile.optimize}">
+ optimize="${compile.optimize}"
+ encoding="ISO-8859-1">
<classpath refid="compile.classpath.tomcat33"/>
<include name="org/apache/coyote/tomcat3/**" />
</javac>
@@ -332,7 +336,8 @@
destdir="${build.home}/tests"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
- optimize="${compile.optimize}">
+ optimize="${compile.optimize}"
+ encoding="ISO-8859-1">
<classpath refid="test.classpath"/>
</javac>
<copy todir="${build.home}/tests" filtering="on">
Modified: tomcat/connectors/trunk/http11/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/http11/build.xml?rev=791805&r1=791804&r2=791805&view=diff
==============================================================================
--- tomcat/connectors/trunk/http11/build.xml (original)
+++ tomcat/connectors/trunk/http11/build.xml Tue Jul 7 12:06:56 2009
@@ -184,7 +184,8 @@
destdir="${build.home}/classes"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
- optimize="${compile.optimize}">
+ optimize="${compile.optimize}"
+ encoding="ISO-8859-1">
<exclude name="org\apache\coyote\http11\*Apr*" unless="jdk.1.4.present"
/>
<classpath refid="compile.classpath"/>
</javac>
@@ -215,7 +216,8 @@
destdir="${build.home}/tests"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
- optimize="${compile.optimize}">
+ optimize="${compile.optimize}"
+ encoding="ISO-8859-1">
<classpath refid="test.classpath"/>
</javac>
<copy todir="${build.home}/tests" filtering="on">
Modified: tomcat/connectors/trunk/jk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/build.xml?rev=791805&r1=791804&r2=791805&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/build.xml (original)
+++ tomcat/connectors/trunk/jk/build.xml Tue Jul 7 12:06:56 2009
@@ -218,7 +218,8 @@
deprecation="${compile.deprecation}"
debug="${compile.debug}"
optimize="${optimize}"
- verbose="off" >
+ verbose="off"
+ encoding="ISO-8859-1">
<include name="org/apache/jk/**"/>
<include name="org/apache/coyote/ajp/**" />
<exclude name="org/apache/coyote/ajp/*Apr*"
unless="jdk.1.4.present" />
@@ -265,7 +266,8 @@
deprecation="${compile.deprecation}"
debug="${compile.debug}"
optimize="${optimize}"
- verbose="off" >
+ verbose="off"
+ encoding="ISO-8859-1">
<include name="org/apache/coyote/ajp/**"/>
<include name="org/apache/jk/config/**"/>
<classpath>
@@ -288,7 +290,8 @@
deprecation="${compile.deprecation}"
debug="${compile.debug}"
optimize="${optimize}"
- verbose="off" >
+ verbose="off"
+ encoding="ISO-8859-1">
<include name="org/apache/ajp/**" />
<exclude name="org/apache/ajp/tomcat33/**" />
<classpath>
@@ -319,7 +322,8 @@
deprecation="${compile.deprecation}"
debug="${compile.debug}"
optimize="${optimize}"
- verbose="off" >
+ verbose="off"
+ encoding="ISO-8859-1">
<include name="org/apache/ajp/**" />
<exclude name="org/apache/ajp/tomcat4/**" />
<classpath>
@@ -350,7 +354,8 @@
debug="${compile.debug}"
deprecation="${compile.deprecation}"
optimize="${optimize}"
- verbose="off" >
+ verbose="off"
+ encoding="ISO-8859-1">
</javac>
<copy todir="${jk.build}/classes/META-INF"
file="jkant/ant.tasks"/>
Modified: tomcat/connectors/trunk/jk/jkstatus/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/jkstatus/build.xml?rev=791805&r1=791804&r2=791805&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/jkstatus/build.xml (original)
+++ tomcat/connectors/trunk/jk/jkstatus/build.xml Tue Jul 7 12:06:56 2009
@@ -95,8 +95,8 @@
<javac srcdir="${basedir}/src/share" destdir="${jk.build}/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
- excludes="**/.svn/**"
- >
+ excludes="**/.svn/**"
+ encoding="ISO-8859-1">
<classpath refid="jtc.classpath" />
</javac>
<copy
file="${basedir}/src/share/org/apache/jk/status/LocalStrings.properties"
Modified: tomcat/connectors/trunk/jni/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/build.xml?rev=791805&r1=791804&r2=791805&view=diff
==============================================================================
--- tomcat/connectors/trunk/jni/build.xml (original)
+++ tomcat/connectors/trunk/jni/build.xml Tue Jul 7 12:06:56 2009
@@ -170,7 +170,8 @@
destdir="${build.dest}/java"
debug="${debug}"
deprecation="${deprecation}"
- optimize="${optimize}">
+ optimize="${optimize}"
+ encoding="ISO-8859-1">
<classpath refid="classpath"/>
</javac>
<copy todir="${build.dest}/java" filtering="yes">
@@ -188,7 +189,8 @@
destdir="${build.home}/classes"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
- optimize="${compile.optimize}">
+ optimize="${compile.optimize}"
+ encoding="ISO-8859-1">
<classpath refid="classpath"/>
</javac>
<copy todir="${build.home}/classes" filtering="on">
@@ -224,7 +226,8 @@
destdir="${build.dest}/examples"
debug="${debug}"
deprecation="${deprecation}"
- optimize="${optimize}">
+ optimize="${optimize}"
+ encoding="ISO-8859-1">
<classpath refid="examples.classpath"/>
</javac>
<copy todir="${build.dest}/examples" filtering="yes">
@@ -275,8 +278,8 @@
destdir="${build.dest}/test"
debug="on"
deprecation="${deprecation}"
- optimize="${optimize}">
-
+ optimize="${optimize}"
+ encoding="ISO-8859-1">
<classpath refid="test.classpath"/>
</javac>
</target>
@@ -319,8 +322,8 @@
destdir="${build.dest}/examples"
debug="${debug}"
deprecation="${deprecation}"
- optimize="${optimize}">
-
+ optimize="${optimize}"
+ encoding="ISO-8859-1">
<classpath refid="examples.classpath"/>
</javac>
</target>
Modified: tomcat/connectors/trunk/juli/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/juli/build.xml?rev=791805&r1=791804&r2=791805&view=diff
==============================================================================
--- tomcat/connectors/trunk/juli/build.xml (original)
+++ tomcat/connectors/trunk/juli/build.xml Tue Jul 7 12:06:56 2009
@@ -159,7 +159,8 @@
debug="${compile.debug}"
deprecation="${compile.deprecation}"
source="1.4"
- optimize="${compile.optimize}">
+ optimize="${compile.optimize}"
+ encoding="ISO-8859-1">
<classpath refid="compile.classpath"/>
</javac>
<copy todir="${build.home}/classes" filtering="on">
@@ -185,7 +186,8 @@
destdir="${build.home}/tests"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
- optimize="${compile.optimize}">
+ optimize="${compile.optimize}"
+ encoding="ISO-8859-1">
<classpath refid="test.classpath"/>
</javac>
<copy todir="${build.home}/tests" filtering="on">
Modified: tomcat/connectors/trunk/util/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/util/build.xml?rev=791805&r1=791804&r2=791805&view=diff
==============================================================================
--- tomcat/connectors/trunk/util/build.xml (original)
+++ tomcat/connectors/trunk/util/build.xml Tue Jul 7 12:06:56 2009
@@ -89,7 +89,8 @@
debug="${compile.debug}"
optimize="off"
verbose="off"
- excludes="**/CVS/**">
+ excludes="**/CVS/**"
+ encoding="ISO-8859-1">
<classpath refid="compile.classpath"/>
<exclude name="**/util/net/jsse/*" unless="jsse.present"/>
<exclude name="**/util/log/CommonLogHandler.java"
unless="commons-logging.present"/>
@@ -135,7 +136,8 @@
debug="${compile.debug}"
optimize="off"
verbose="off"
- excludes="**/CVS/**">
+ excludes="**/CVS/**"
+ encoding="ISO-8859-1">
<classpath refid="compile.classpath"/>
</javac>
<jar jarfile="${tomcat-loader.jar}"
Modified: tomcat/container/tc5.5.x/catalina/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/build.xml?rev=791805&r1=791804&r2=791805&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/catalina/build.xml (original)
+++ tomcat/container/tc5.5.x/catalina/build.xml Tue Jul 7 12:06:56 2009
@@ -613,7 +613,8 @@
deprecation="${compile.deprecation}"
source="${compile.source}"
optimize="${compile.optimize}"
- excludes="**/CVS/**">
+ excludes="**/CVS/**"
+ encoding="ISO-8859-1">
<classpath refid="catalina.classpath" />
<exclude name="org/apache/catalina/util/ProcessHelper.java"
@@ -664,7 +665,8 @@
deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
source="${compile.source}"
- excludes="**/CVS/**">
+ excludes="**/CVS/**"
+ encoding="ISO-8859-1">
<classpath refid="catalina.classpath" />
<exclude name="org/apache/naming/factory/MailSessionFactory.java"
unless="compile.javamail"/>
@@ -814,7 +816,8 @@
debug="${compile.debug}"
optimize="off"
source="${compile.source}"
- excludes="**/CVS/**">
+ excludes="**/CVS/**"
+ encoding="ISO-8859-1">
<classpath refid="test.classpath"/>
</javac>
</target>
Modified: tomcat/container/tc5.5.x/modules/cluster/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/cluster/build.xml?rev=791805&r1=791804&r2=791805&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/cluster/build.xml (original)
+++ tomcat/container/tc5.5.x/modules/cluster/build.xml Tue Jul 7 12:06:56 2009
@@ -97,8 +97,8 @@
<javac srcdir="${basedir}/src/share" destdir="${catalina.build}/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
- excludes="**/CVS/**"
- >
+ excludes="**/CVS/**"
+ encoding="ISO-8859-1">
<classpath refid="cluster.classpath" />
</javac>
<copy
file="${basedir}/src/share/org/apache/catalina/cluster/LocalStrings.properties"
Modified: tomcat/container/tc5.5.x/modules/groupcom/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/groupcom/build.xml?rev=791805&r1=791804&r2=791805&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/build.xml (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/build.xml Tue Jul 7 12:06:56 2009
@@ -97,8 +97,8 @@
<javac srcdir="${basedir}/src/share" destdir="${catalina.build}/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
- excludes="**/CVS/**"
- >
+ excludes="**/CVS/**"
+ encoding="ISO-8859-1">
<classpath refid="groupcom.classpath" />
</javac>
<copy
file="${basedir}/src/share/org/apache/catalina/tribes/LocalStrings.properties"
Modified: tomcat/container/tc5.5.x/modules/groupcom/build/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/groupcom/build/build.xml?rev=791805&r1=791804&r2=791805&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/build/build.xml (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/build/build.xml Tue Jul 7
12:06:56 2009
@@ -109,7 +109,8 @@
destdir="${compile.path}"
nowarn="true"
source="1.4"
- target="1.4">
+ target="1.4"
+ encoding="ISO-8859-1">
<classpath refid="tribes.classpath"/>
<src refid="java.sourcepath" />
</javac>
Modified: tomcat/container/tc5.5.x/modules/ha/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/ha/build.xml?rev=791805&r1=791804&r2=791805&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/ha/build.xml (original)
+++ tomcat/container/tc5.5.x/modules/ha/build.xml Tue Jul 7 12:06:56 2009
@@ -105,8 +105,8 @@
<javac srcdir="${basedir}/src/share" destdir="${catalina.build}/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
- excludes="**/CVS/**"
- >
+ excludes="**/CVS/**"
+ encoding="ISO-8859-1">
<classpath refid="ha.classpath" />
</javac>
<copy
file="${basedir}/src/share/org/apache/catalina/ha/LocalStrings.properties"
Modified: tomcat/container/tc5.5.x/modules/storeconfig-ha/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/storeconfig-ha/build.xml?rev=791805&r1=791804&r2=791805&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/storeconfig-ha/build.xml (original)
+++ tomcat/container/tc5.5.x/modules/storeconfig-ha/build.xml Tue Jul 7
12:06:56 2009
@@ -95,7 +95,14 @@
<target name="build-catalina-config" depends="build-prepare">
<!-- Compile internal server components -->
- <javac srcdir="${basedir}/src/share"
destdir="${catalina.build}/classes" deprecation="${compile.deprecation}"
debug="${compile.debug}" source="${compile.source}"
optimize="${compile.optimize}" excludes="**/CVS/**">
+ <javac srcdir="${basedir}/src/share"
+ destdir="${catalina.build}/classes"
+ deprecation="${compile.deprecation}"
+ debug="${compile.debug}"
+ source="${compile.source}"
+ optimize="${compile.optimize}"
+ excludes="**/CVS/**"
+ encoding="ISO-8859-1">
<classpath refid="config.classpath" />
</javac>
<copy
todir="${catalina.build}/classes/org/apache/catalina/storeconfig">
Modified: tomcat/container/tc5.5.x/modules/storeconfig/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/storeconfig/build.xml?rev=791805&r1=791804&r2=791805&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/storeconfig/build.xml (original)
+++ tomcat/container/tc5.5.x/modules/storeconfig/build.xml Tue Jul 7 12:06:56
2009
@@ -95,7 +95,14 @@
<target name="build-catalina-config" depends="build-prepare">
<!-- Compile internal server components -->
- <javac srcdir="${basedir}/src/share"
destdir="${catalina.build}/classes" deprecation="${compile.deprecation}"
debug="${compile.debug}" source="${compile.source}"
optimize="${compile.optimize}" excludes="**/CVS/**">
+ <javac srcdir="${basedir}/src/share"
+ destdir="${catalina.build}/classes"
+ deprecation="${compile.deprecation}"
+ debug="${compile.debug}"
+ source="${compile.source}"
+ optimize="${compile.optimize}"
+ excludes="**/CVS/**"
+ encoding="ISO-8859-1">
<classpath refid="config.classpath" />
</javac>
<copy
todir="${catalina.build}/classes/org/apache/catalina/storeconfig">
Modified: tomcat/container/tc5.5.x/tester/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/build.xml?rev=791805&r1=791804&r2=791805&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/tester/build.xml (original)
+++ tomcat/container/tc5.5.x/tester/build.xml Tue Jul 7 12:06:56 2009
@@ -80,7 +80,8 @@
classpath="${ant.jar}:${servlet-api.jar}:${xercesImpl.jar}"
deprecation="${compile.deprecation}"
debug="${compile.debug}" optimize="off"
- excludes="**/CVS/**"/>
+ excludes="**/CVS/**"
+ encoding="ISO-8859-1"/>
<!-- Copy static resource files -->
<copy todir="${tester.build}/classes">
Modified: tomcat/container/tc5.5.x/webapps/admin/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/build.xml?rev=791805&r1=791804&r2=791805&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/admin/build.xml (original)
+++ tomcat/container/tc5.5.x/webapps/admin/build.xml Tue Jul 7 12:06:56 2009
@@ -217,7 +217,8 @@
destdir="${webapps.build}/${webapp.name}/WEB-INF/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
- excludes="**/CVS/**">
+ excludes="**/CVS/**"
+ encoding="ISO-8859-1">
<classpath refid="admin.classpath" />
</javac>
Modified: tomcat/container/tc5.5.x/webapps/balancer/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/balancer/build.xml?rev=791805&r1=791804&r2=791805&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/balancer/build.xml (original)
+++ tomcat/container/tc5.5.x/webapps/balancer/build.xml Tue Jul 7 12:06:56 2009
@@ -78,7 +78,8 @@
destdir="${webapps.build}/${webapp.name}/WEB-INF/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
- excludes="**/CVS/**">
+ excludes="**/CVS/**"
+ encoding="ISO-8859-1">
<classpath refid="balancer.classpath" />
</javac>
Modified: tomcat/current/tc5.5.x/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=791805&r1=791804&r2=791805&view=diff
==============================================================================
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Tue Jul 7 12:06:56 2009
@@ -65,12 +65,6 @@
+1: markt
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47149
- Explicitly specify encoding for the source files
- http://people.apache.org/~kkolinko/patches/2009-07-04_tc55_encodings.patch
- +1: kkolinko, markt, rjung
- -1:
-
* Document minimum required Ant version to be 1.6.2, instead of 1.5.x
Note, that http://tomcat.apache.org/tomcat-5.5-doc/building.html already
mentions 1.6.2 since rev.351798, thus for more than 3.5 years.
Modified: tomcat/jasper/tc5.5.x/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/jasper/tc5.5.x/build.xml?rev=791805&r1=791804&r2=791805&view=diff
==============================================================================
--- tomcat/jasper/tc5.5.x/build.xml (original)
+++ tomcat/jasper/tc5.5.x/build.xml Tue Jul 7 12:06:56 2009
@@ -144,7 +144,8 @@
deprecation="${compile.deprecation}"
source="${compile.source}"
optimize="${compile.optimize}"
- excludes="**/CVS/**">
+ excludes="**/CVS/**"
+ encoding="ISO-8859-1">
<classpath refid="jasper.classpath" />
</javac>
@@ -230,7 +231,8 @@
debug="${compile.debug}"
source="${compile.source}"
optimize="off"
- excludes="**/CVS/**">
+ excludes="**/CVS/**"
+ encoding="ISO-8859-1">
<classpath refid="test.classpath"/>
</javac>
-->
Modified: tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/build.xml?rev=791805&r1=791804&r2=791805&view=diff
==============================================================================
--- tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/build.xml (original)
+++ tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/build.xml Tue Jul 7
12:06:56 2009
@@ -88,7 +88,8 @@
<javac srcdir="src/share" destdir="${jsp-api.build}/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
- classpath="${servlet-api.jar}" />
+ classpath="${servlet-api.jar}"
+ encoding="ISO-8859-1"/>
<!-- Associated property files -->
<copy todir="${jsp-api.build}/classes">
@@ -130,7 +131,8 @@
<javac srcdir="src/ant" destdir="${jsp-api.build}/ant"
debug="${compile.debug}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
- classpath="${ant.home}/lib/ant.jar" />
+ classpath="${ant.home}/lib/ant.jar"
+ encoding="ISO-8859-1"/>
<jar jarfile="${jsp-anttask.jar}" basedir="${jsp-api.build}/ant" />
<taskdef name="txt2html" classname="task.Txt2Html"
classpath="${jsp-anttask.jar}" />
@@ -222,7 +224,8 @@
destdir="${jsp-api.build}/examples/WEB-INF/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
- excludes="**/CVS/**">
+ excludes="**/CVS/**"
+ encoding="ISO-8859-1">
<classpath refid="examples.classpath" />
</javac>
@@ -230,7 +233,8 @@
destdir="${jsp-api.build}/examples/plugin/applet"
debug="${compile.debug}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
- excludes="**/CVS/**">
+ excludes="**/CVS/**"
+ encoding="ISO-8859-1">
<classpath refid="examples.classpath" />
</javac>
Modified: tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/build.xml?rev=791805&r1=791804&r2=791805&view=diff
==============================================================================
--- tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/build.xml (original)
+++ tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/build.xml Tue Jul 7
12:06:56 2009
@@ -81,7 +81,8 @@
<!-- Java classes -->
<javac srcdir="src/share" destdir="${servlet-api.build}/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
- optimize="${compile.optimize}"/>
+ optimize="${compile.optimize}"
+ encoding="ISO-8859-1"/>
<!-- Associated property files -->
<copy todir="${servlet-api.build}/classes">
@@ -128,7 +129,8 @@
destdir="${servlet-api.build}/examples/WEB-INF/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
- excludes="**/CVS/**">
+ excludes="**/CVS/**"
+ encoding="ISO-8859-1">
<classpath refid="examples.classpath" />
</javac>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
