Specify explicit encoding when performing replace task.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@791194 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.xml b/build.xml
index 89b0171..e4d3dde 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -848,11 +848,13 @@
         <exclude name="**/managed/**" />
       </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="org.apache.commons"
             value="org.apache.tomcat.dbcp" />
     </replace>
-    <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons/pool/impl" >
+    <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons/pool/impl"
+        encoding="ISO-8859-1">
       <replacefilter token="enum"
             value="enumeration" />
     </replace>

diff --git a/extras.xml b/extras.xml
index 9ae2980..9026c38 100644 (file)
--- a/extras.xml
+++ b/extras.xml
@@ -109,7 +109,8 @@
     <untar src="${tomcat.extras}/logging/commons-logging-src.tar" 
        dest="${tomcat.extras}/logging/"/>
        
-    <replace dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/src/java/org/apache/commons" >
+    <replace dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/src/java/org/apache/commons"
+        encoding="ISO-8859-1">
       <replacefilter token="org.apache.commons"
             value="org.apache.juli" />
     </replace>
@@ -118,7 +119,8 @@
       <fileset dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/src/java/org/apache/commons" />
     </move>
 
-    <replace dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src" >
+    <replace dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src"
+        encoding="ISO-8859-1">
       <replacefilter token="org.apache.commons"
             value="org.apache.juli" />
         <replacefilter token="org/apache/commons/"