svn commit: r791810 - in /tomcat: build/tc5.5.x/ connectors/trunk/coyote/ connectors/trunk/http11/ connectors/trunk/jni/ connectors/trunk/juli/ container/tc5.5.x/catalina/ container/tc5.5.x/modules/groupcom/build/ current/tc5.5.x/ servletapi/servlet2.4...

[kkolinko]

Author: kkolinko
Date: Tue Jul  7 12:17:35 2009
New Revision: 791810

URL: http://svn.apache.org/viewvc?rev=791810&view=rev
Log:
Specify explicit encoding when performing filtering in copy and replace tasks

Modified:
    tomcat/build/tc5.5.x/build.xml
    tomcat/connectors/trunk/coyote/build.xml
    tomcat/connectors/trunk/http11/build.xml
    tomcat/connectors/trunk/jni/build.xml
    tomcat/connectors/trunk/juli/build.xml
    tomcat/container/tc5.5.x/catalina/build.xml
    tomcat/container/tc5.5.x/modules/groupcom/build/build.xml
    tomcat/current/tc5.5.x/STATUS.txt
    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=791810&r1=791809&r2=791810&view=diff
==============================================================================
--- tomcat/build/tc5.5.x/build.xml (original)
+++ tomcat/build/tc5.5.x/build.xml Tue Jul  7 12:17:35 2009
@@ -730,14 +730,15 @@
             <exclude name="**/test/**" />
         </fileset>
     </copy>
- <!--   <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons">
+ <!--   <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons"
+        encoding="ISO-8859-1">
         <replacefilter token="return UnmodifiableList.decorate(l);"
             value="return l;" />
         <replacefilter token="import 
org.apache.commons.collections.list.UnmodifiableList;"
             value=" " />
     </replace>
     -->
-    <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons" >
+    <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons" 
encoding="ISO-8859-1">
         <replacefilter token="org.apache.commons"
             value="org.apache.tomcat.dbcp" />
     </replace>
@@ -869,14 +870,14 @@
     <!-- Add release notes to the root webapp -->
     <copy file="${basedir}/RELEASE-NOTES"
         tofile="${tomcat.build}/webapps/ROOT/RELEASE-NOTES.txt"
-        filtering="true" />
+        filtering="true" encoding="ISO-8859-1" />
 
     <!-- Add documents to the tomcat-docs webapp -->
     <copy file="${basedir}/resources/build.xml"
         todir="${tomcat.build}/webapps/tomcat-docs" />
     <copy file="./RELEASE-NOTES"
         tofile="${tomcat.build}/webapps/tomcat-docs/RELEASE-NOTES.txt"
-        filtering="true" />
+        filtering="true" encoding="ISO-8859-1" />
 
     <!-- Build JARs for webapps classes -->
     <mkdir dir="${tomcat.build}/server/webapps/admin/WEB-INF/lib" />
@@ -1007,7 +1008,10 @@
          -->
       </fileset>
     </copy>
-    <replace file="${tomcat.embed}/conf/context.xml" token="&lt;Context" 
value="&lt;Context privileged='true'" />
+    <replace file="${tomcat.embed}/conf/context.xml"
+        token="&lt;Context"
+        value="&lt;Context privileged='true'"
+        encoding="ISO-8859-1" />
 
     <mkdir dir="${tomcat.embed}/webapps"/>
     <copy todir="${tomcat.embed}/webapps" >
@@ -1296,7 +1300,7 @@
     <filter token="VERSION" value="${version}"/>
 
     <!-- Copy the top-level documentation files -->
-    <copy todir="${tomcat.dist}" filtering="true" >
+    <copy todir="${tomcat.dist}" filtering="true" encoding="ISO-8859-1">
       <fileset dir=".">
         <include name="INSTALLING.txt"/>
         <include name="LICENSE"/>
@@ -1520,7 +1524,8 @@
        <filter token="VERSION_MAJOR" value="${version.major}"/>
        <filter token="VERSION_MAJOR_MINOR" value="${version.major.minor}"/>
 
-    <copy file="tomcat.nsi" tofile="${tomcat.dist}/tomcat.nsi" 
filtering="true"/>
+    <copy file="tomcat.nsi" tofile="${tomcat.dist}/tomcat.nsi"
+        filtering="true" encoding="ISO-8859-1" />
     <exec dir="${tomcat.dist}" executable="${nsis.exe}">
       <arg value="/DNSISDIR=${nsis.home}" />
       <arg value="tomcat.nsi" />
@@ -1544,13 +1549,16 @@
          todir="${tomcat.release}/v${version}"/>
     <copy file="RELEASE-NOTES"
          todir="${tomcat.release}/v${version}"
-     filtering="true"/>
+        filtering="true"
+        encoding="ISO-8859-1" />
     <copy file="resources/welcome.main.html"
         tofile="${tomcat.release}/v${version}/README.html"
-     filtering="true"/>
+        filtering="true"
+        encoding="ISO-8859-1" />
     <copy file="resources/welcome.bin.html"
         tofile="${tomcat.release}/v${version}/bin/README.html"
-     filtering="true"/>
+        filtering="true"
+        encoding="ISO-8859-1" />
 
   </target>
 

Modified: tomcat/connectors/trunk/coyote/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/coyote/build.xml?rev=791810&r1=791809&r2=791810&view=diff
==============================================================================
--- tomcat/connectors/trunk/coyote/build.xml (original)
+++ tomcat/connectors/trunk/coyote/build.xml Tue Jul  7 12:17:35 2009
@@ -205,7 +205,7 @@
   <target name="static" depends="prepare"
    description="Copy static files to build directory">
     <tstamp/>
-    <copy  todir="${build.home}/conf" filtering="on">
+    <copy  todir="${build.home}/conf" filtering="on" encoding="ISO-8859-1">
       <fileset dir="${conf.home}" includes="*.MF"/>
     </copy>
   </target>
@@ -225,7 +225,7 @@
       <exclude name="org/apache/coyote/tomcat4/**" />
       <exclude name="org/apache/coyote/tomcat3/**" />
     </javac>
-    <copy    todir="${build.home}/classes" filtering="on">
+    <copy    todir="${build.home}/classes" filtering="on" 
encoding="ISO-8859-1">
       <fileset dir="${source.home}" excludes="**/*.java"/>
     </copy>
   </target>
@@ -269,7 +269,7 @@
       <classpath refid="compile.classpath"/>
       <include name="org/apache/coyote/tomcat4/**" />
     </javac>
-    <copy    todir="${build.home}/classes" filtering="on">
+    <copy    todir="${build.home}/classes" filtering="on" 
encoding="ISO-8859-1">
       <fileset dir="${source.home}" excludes="**/*.java"/>
     </copy>
   </target>
@@ -285,7 +285,7 @@
       <classpath refid="compile.classpath.tomcat33"/>
       <include name="org/apache/coyote/tomcat3/**" />
     </javac>
-    <copy    todir="${build.home}/classes" filtering="on">
+    <copy    todir="${build.home}/classes" filtering="on" 
encoding="ISO-8859-1">
       <fileset dir="${source.home}" excludes="**/*.java"/>
     </copy>
   </target>
@@ -340,7 +340,7 @@
           encoding="ISO-8859-1">
       <classpath refid="test.classpath"/>
     </javac>
-    <copy    todir="${build.home}/tests" filtering="on">
+    <copy    todir="${build.home}/tests" filtering="on" encoding="ISO-8859-1">
       <fileset dir="${test.home}" excludes="**/*.java"/>
     </copy>
   </target>

Modified: tomcat/connectors/trunk/http11/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/http11/build.xml?rev=791810&r1=791809&r2=791810&view=diff
==============================================================================
--- tomcat/connectors/trunk/http11/build.xml (original)
+++ tomcat/connectors/trunk/http11/build.xml Tue Jul  7 12:17:35 2009
@@ -154,7 +154,7 @@
   <target name="static" depends="prepare"
    description="Copy static files to build directory">
     <tstamp/>
-    <copy  todir="${build.home}/conf" filtering="on">
+    <copy  todir="${build.home}/conf" filtering="on" encoding="ISO-8859-1">
       <fileset dir="${conf.home}" includes="*.MF"/>
     </copy>
   </target>
@@ -189,7 +189,7 @@
       <exclude name="org\apache\coyote\http11\*Apr*" unless="jdk.1.4.present" 
/>
       <classpath refid="compile.classpath"/>
     </javac>
-    <copy    todir="${build.home}/classes" filtering="on">
+    <copy    todir="${build.home}/classes" filtering="on" 
encoding="ISO-8859-1">
       <fileset dir="${source.home}" excludes="**/*.java"/>
     </copy>
     <property name="tomcat-http11.jar" 
value="${build.home}/lib/tomcat-${component.name}.jar"/>
@@ -220,7 +220,7 @@
           encoding="ISO-8859-1">
       <classpath refid="test.classpath"/>
     </javac>
-    <copy    todir="${build.home}/tests" filtering="on">
+    <copy    todir="${build.home}/tests" filtering="on" encoding="ISO-8859-1">
       <fileset dir="${test.home}" excludes="**/*.java"/>
     </copy>
   </target>

Modified: tomcat/connectors/trunk/jni/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/build.xml?rev=791810&r1=791809&r2=791810&view=diff
==============================================================================
--- tomcat/connectors/trunk/jni/build.xml (original)
+++ tomcat/connectors/trunk/jni/build.xml Tue Jul  7 12:17:35 2009
@@ -158,7 +158,7 @@
         <filter token="VERSION" value="${version}"/>
         <filter token="VERSION_NUMBER" value="${version.number}"/>
         <filter token="VERSION_BUILT" value="${TODAY} ${TSTAMP}"/>
-        <copy todir="${build.src}/java" filtering="yes">
+        <copy todir="${build.src}/java" filtering="yes" encoding="ISO-8859-1">
             <fileset dir="${src.dir}/java">
                 <include name="**/*.java"/>
                 <include name="**/*.xml"/>
@@ -174,7 +174,7 @@
             encoding="ISO-8859-1">
             <classpath refid="classpath"/>
         </javac>
-        <copy todir="${build.dest}/java" filtering="yes">
+        <copy todir="${build.dest}/java" filtering="yes" encoding="ISO-8859-1">
             <fileset dir="${build.src}/java">
                 <include name="**/*.xml"/>
                 <include name="**/*.properties"/>
@@ -193,7 +193,7 @@
               encoding="ISO-8859-1">
           <classpath refid="classpath"/>
         </javac>
-        <copy    todir="${build.home}/classes" filtering="on">
+        <copy    todir="${build.home}/classes" filtering="on" 
encoding="ISO-8859-1">
           <fileset dir="${source.home}" excludes="**/*.java"/>
         </copy>
       </target>
@@ -214,7 +214,7 @@
         <filter token="VERSION" value="${version}"/>
         <filter token="VERSION_NUMBER" value="${version.number}"/>
         <filter token="VERSION_BUILT" value="${TODAY} ${TSTAMP}"/>
-        <copy todir="${build.src}/examples" filtering="yes">
+        <copy todir="${build.src}/examples" filtering="yes" 
encoding="ISO-8859-1">
             <fileset dir="${src.dir}/examples">
                 <include name="**/*.java"/>
                 <include name="**/*.xml"/>
@@ -230,7 +230,7 @@
             encoding="ISO-8859-1">
             <classpath refid="examples.classpath"/>
         </javac>
-        <copy todir="${build.dest}/examples" filtering="yes">
+        <copy todir="${build.dest}/examples" filtering="yes" 
encoding="ISO-8859-1">
             <fileset dir="${build.src}/examples">
                 <include name="**/*.xml"/>
                 <include name="**/*.properties"/>
@@ -267,7 +267,7 @@
     <target name="compile-tests" depends="compile">
         <mkdir dir="${build.dest}/test"/>
         <mkdir dir="${build.src}/test"/>
-        <copy todir="${build.src}/test" filtering="yes">
+        <copy todir="${build.src}/test" filtering="yes" encoding="ISO-8859-1">
             <fileset dir="${src.dir}/test">
                 <include name="**/*.java"/>
                 <include name="**/*.xml"/>
@@ -311,7 +311,7 @@
     <target name="compile-examples" depends="compile">
         <mkdir dir="${build.dest}/examples"/>
         <mkdir dir="${build.src}/examples"/>
-        <copy todir="${build.src}/examples" filtering="yes">
+        <copy todir="${build.src}/examples" filtering="yes" 
encoding="ISO-8859-1">
             <fileset dir="${src.dir}/examples">
                 <include name="**/*.java"/>
                 <include name="**/*.xml"/>

Modified: tomcat/connectors/trunk/juli/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/juli/build.xml?rev=791810&r1=791809&r2=791810&view=diff
==============================================================================
--- tomcat/connectors/trunk/juli/build.xml (original)
+++ tomcat/connectors/trunk/juli/build.xml Tue Jul  7 12:17:35 2009
@@ -129,7 +129,7 @@
   <target name="static" depends="prepare"
    description="Copy static files to build directory">
     <tstamp/>
-    <copy  todir="${build.home}/conf" filtering="on">
+    <copy  todir="${build.home}/conf" filtering="on" encoding="ISO-8859-1">
       <fileset dir="${conf.home}" includes="*.MF"/>
     </copy>
   </target>
@@ -163,7 +163,7 @@
           encoding="ISO-8859-1">
       <classpath refid="compile.classpath"/>
     </javac>
-    <copy    todir="${build.home}/classes" filtering="on">
+    <copy    todir="${build.home}/classes" filtering="on" 
encoding="ISO-8859-1">
       <fileset dir="${source.home}" excludes="**/*.java"/>
     </copy>
     <property name="tomcat-juli.jar" 
value="${build.home}/lib/tomcat-${component.name}.jar"/>
@@ -190,7 +190,7 @@
           encoding="ISO-8859-1">
       <classpath refid="test.classpath"/>
     </javac>
-    <copy    todir="${build.home}/tests" filtering="on">
+    <copy    todir="${build.home}/tests" filtering="on" encoding="ISO-8859-1">
       <fileset dir="${test.home}" excludes="**/*.java"/>
     </copy>
   </target>

Modified: tomcat/container/tc5.5.x/catalina/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/build.xml?rev=791810&r1=791809&r2=791810&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/catalina/build.xml (original)
+++ tomcat/container/tc5.5.x/catalina/build.xml Tue Jul  7 12:17:35 2009
@@ -684,7 +684,7 @@
 
     <!-- Copy static resource files -->
     <filter token="VERSION" value="${version}"/>
-    <copy todir="${classes.dir}" filtering="true">
+    <copy todir="${classes.dir}" filtering="true" encoding="ISO-8859-1">
       <fileset dir="src/share">
         <exclude name="**/*.java"/>
       </fileset>

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=791810&r1=791809&r2=791810&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:17:35 2009
@@ -194,7 +194,8 @@
           </fileset>
       </copy>
       <copy tofile="${dist.path}/mvn/tribes-${tribes.version}.pom"
-            file="${basedir}/build/mvn/tribes.pom">
+            file="${basedir}/build/mvn/tribes.pom"
+            encoding="ISO-8859-1">
           <filterset>
               <filter token="tribes.version" value="${tribes.version}"/>
           </filterset>

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=791810&r1=791809&r2=791810&view=diff
==============================================================================
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Tue Jul  7 12:17:35 2009
@@ -75,11 +75,6 @@
   +1: markt - min JRE version is 1.4, even with the compat package
   -1:
 
-* Specify explicit encoding when performing filtering in copy and replace tasks
-  
http://people.apache.org/~kkolinko/patches/2009-07-04_tc55_copy-encodings.patch
-  +1: kkolinko, markt, rjung
-  -1:
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=38797
   Reverts previous fix for
   https://issues.apache.org/bugzilla/show_bug.cgi?id=37933 and implements an

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=791810&r1=791809&r2=791810&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:17:35 2009
@@ -250,7 +250,7 @@
 
     <!-- Prepare Manifest -->
     <copy tofile="${jsp-api.build}/manifest"
-            file="src/etc/manifest" overwrite="yes">
+            file="src/etc/manifest" overwrite="yes" encoding="ISO-8859-1">
       <filterset>
         <filter token="implementation.revision"
                 value="${implementation.revision}"/>

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=791810&r1=791809&r2=791810&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:17:35 2009
@@ -146,7 +146,7 @@
 
     <!-- Prepare Manifest -->
     <copy tofile="${servlet-api.build}/manifest"
-            file="src/etc/manifest" overwrite="yes">
+            file="src/etc/manifest" overwrite="yes" encoding="ISO-8859-1">
       <filterset>
         <filter token="implementation.revision"
                 value="${implementation.revision}"/>



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