tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kkoli...@apache.org
Subject svn commit: r792731 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt build.xml extras.xml webapps/docs/changelog.xml
Date Thu, 09 Jul 2009 22:22:57 GMT
Author: kkolinko
Date: Thu Jul  9 22:22:57 2009
New Revision: 792731

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

Modified:
    tomcat/tc6.0.x/trunk/   (props changed)
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/build.xml
    tomcat/tc6.0.x/trunk/extras.xml
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul  9 22:22:57 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,777464,77
 7466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,790405,791243,791326,791328
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,777464,77
 7466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,790405,791041,791243,791326,791328

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=792731&r1=792730&r2=792731&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jul  9 22:22:57 2009
@@ -15,7 +15,7 @@
   limitations under the License.
 ================================================================================
 
-$Revision$ $Date$
+$Id$
 
                          =================================
                          Apache Tomcat 6.0 Patch Proposals
@@ -124,12 +124,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_tc6_encodings.patch
-  +1: kkolinko, markt, rjung
-  -1:
-
 * Add *.rtf to the list of exclusions in fixcrlf task.
   http://svn.apache.org/viewvc?rev=791184&view=rev
   +1: kkolinko, markt, rjung

Modified: tomcat/tc6.0.x/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=792731&r1=792730&r2=792731&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Thu Jul  9 22:22:57 2009
@@ -118,7 +118,8 @@
            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"/>
-->
       <classpath refid="tomcat.classpath" />
       <exclude name="org/apache/naming/factory/webservices/**" />
@@ -489,7 +490,8 @@
              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"
@@ -499,7 +501,8 @@
              target="${compile.target}"
              optimize="${compile.optimize}"
              classpath="$tomcat.lcasses}"
-             excludes="**/CVS/**,**/.svn/**">
+             excludes="**/CVS/**,**/.svn/**"
+             encoding="ISO-8859-1">
     </javac>
 
     <!-- Add sources for examples -->
@@ -738,7 +741,8 @@
            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/tc6.0.x/trunk/extras.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/extras.xml?rev=792731&r1=792730&r2=792731&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/extras.xml (original)
+++ tomcat/tc6.0.x/trunk/extras.xml Thu Jul  9 22:22:57 2009
@@ -203,7 +203,8 @@
 	           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>

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=792731&r1=792730&r2=792731&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Jul  9 22:22:57 2009
@@ -215,8 +215,12 @@
         build scripts. (kkolinko)
       </fix>
       <add>
-        Included deployer-howto.html into the deployer distributive. (kkolinko)
+        Include deployer-howto.html into the deployer distributive. (kkolinko)
       </add>
+      <fix>
+        <bug>47149</bug>: Build scripts: Explicitly specify encoding when
+        compiling. (kkolinko)
+      </fix>
     </changelog>
   </subsection>
 </section>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message