tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r762923 - in /tomcat/tc6.0.x/trunk: STATUS.txt build.xml webapps/docs/changelog.xml
Date Wed, 08 Apr 2009 04:12:00 GMT
Author: markt
Date: Tue Apr  7 19:47:04 2009
New Revision: 762923

URL: http://svn.apache.org/viewvc?rev=762923&view=rev
Log:
Apply Remy's patch for https://issues.apache.org/bugzilla/show_bug.cgi?id=46910
Fix filtering of properties files.

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/build.xml
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=762923&r1=762922&r2=762923&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Apr  7 19:47:04 2009
@@ -139,20 +139,6 @@
   +1: markt, rjung
   -1: 
 
-* Fix encoding when filtering French properties files, by using in build.xml:
-  http://svn.apache.org/viewvc?view=rev&revision=759720
-@@ -128,7 +128,7 @@
-     <filter token="VERSION" value="${version}"/>
-     <filter token="VERSION_NUMBER" value="${version.number}"/>
-     <filter token="VERSION_BUILT" value="${TODAY} ${TSTAMP}"/>
--    <copy todir="${tomcat.classes}" filtering="true">
-+    <copy todir="${tomcat.classes}" filtering="true" encoding="ISO-8859-1">
-       <fileset dir="java">
-         <include name="**/*.properties"/>
-         <include name="**/*.dtd"/>
-  +1: remm, rjung, markt
-  -1:
-
 * Fix some failures when testing WebDAV with litmus test suite
   http://svn.apache.org/viewvc?view=rev&revision=761601
   +1: markt

Modified: tomcat/tc6.0.x/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=762923&r1=762922&r2=762923&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Tue Apr  7 19:47:04 2009
@@ -128,7 +128,7 @@
     <filter token="VERSION" value="${version}"/>
     <filter token="VERSION_NUMBER" value="${version.number}"/>
     <filter token="VERSION_BUILT" value="${TODAY} ${TSTAMP}"/>
-    <copy todir="${tomcat.classes}" filtering="true">
+    <copy todir="${tomcat.classes}" filtering="true" encoding="ISO-8859-1">
       <fileset dir="java">
         <include name="**/*.properties"/>
         <include name="**/*.dtd"/>

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=762923&r1=762922&r2=762923&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Apr  7 19:47:04 2009
@@ -85,6 +85,9 @@
         <bug>46351</bug>: Refactor the build script. Patch provided by Marc
         Guillemot. (markt)
       </fix>
+      <fix>
+        <bug>46910</bug>: Properties files corrupted by build process. (remm)
+      </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