Java Mailing List Archive

http://www.junlu.com/

Home » dev.tomcat »

svn commit: r791041 - in /tomcat/trunk: build.xml extras.xml

kkolinko

2009-07-03


Author LoginPost Reply
Author: kkolinko
Date: Sat Jul 4 00:06:05 2009
New Revision: 791041

URL: http://svn.apache.org/viewvc?rev=791041&view=rev
Log:
Explicitly specify encoding for the source files
Fixes https://issues.apache.org/bugzilla/show_bug.cgi?id=47149

Modified:
  tomcat/trunk/build.xml
  tomcat/trunk/extras.xml

Modified: tomcat/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=791041&r1=791040&r2=791041&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Sat Jul 4 00:06:05 2009
@@(protected) @@
       source="${compile.source}"
       target="${compile.target}"
       optimize="${compile.optimize}"
-       excludes="**/CVS/**,**/.svn/**">
+       excludes="**/CVS/**,**/.svn/**"
+       encoding="ISO-8859-1">
<!-- Comment this in to show unchecked warnings:  
    <compilerarg value="-Xlint:unchecked"/>
-->
@@(protected) @@
        target="${compile.target}"
        optimize="${compile.optimize}"
        classpath="${tomcat.classes}"
-         excludes="**/CVS/**,**/.svn/**">
+         excludes="**/CVS/**,**/.svn/**"
+         encoding="ISO-8859-1">
  </javac>

  <javac  srcdir="webapps/examples/jsp/plugin/applet"
@@(protected) @@
        target="${compile.target}"
        optimize="${compile.optimize}"
        classpath="$tomcat.lcasses}"
-         excludes="**/CVS/**,**/.svn/**">
+         excludes="**/CVS/**,**/.svn/**"
+         encoding="ISO-8859-1">
  </javac>

  <!-- Add sources for examples -->
@@(protected) @@
       debug="${compile.debug}"
       deprecation="${compile.deprecation}"
       source="${compile.source}"
-       optimize="${compile.optimize}">
+       optimize="${compile.optimize}"
+       encoding="ISO-8859-1">
    <classpath refid="tomcat.test.classpath" />
    <include name="org/apache/**" />
  </javac>
@@(protected) @@
       source="${compile.source}"
       target="${compile.target}"
       sourcepath="${tomcat-dbcp.home}/src/java"
-       srcdir="${tomcat-dbcp.home}/src/java" >
+       srcdir="${tomcat-dbcp.home}/src/java"
+       encoding="ISO-8859-1">
    <include name="**" />
  </javac>
  <jar jarfile="${tomcat-dbcp.jar}"

Modified: tomcat/trunk/extras.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/extras.xml?rev=791041&r1=791040&r2=791041&view=diff
==============================================================================
--- tomcat/trunk/extras.xml (original)
+++ tomcat/trunk/extras.xml Sat Jul 4 00:06:05 2009
@@(protected) @@
        debug="${compile.debug}"
        deprecation="${compile.deprecation}"
        source="${compile.source}"
-         optimize="${compile.optimize}">
+         optimize="${compile.optimize}"
+         encoding="ISO-8859-1">
     <classpath refid="tomcat.webservices.classpath" />
     <include name="org/apache/naming/factory/webservices/**" />
    </javac>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@(protected)
For additional commands, e-mail: dev-help@(protected)

©2008 junlu.com - Jax Systems, LLC, U.S.A.