Author: kkolinko
Date: Sun Jul 5 00:17:22 2009
New Revision: 791194
URL: http://svn.apache.org/viewvc?rev=791194&view=rev
Log:
Specify explicit encoding when performing replace task.
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=791194&r1=791193&r2=791194&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Sun Jul 5 00:17:22 2009
@@ -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>
Modified: tomcat/trunk/extras.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/extras.xml?rev=791194&r1=791193&r2=791194&view=diff
==============================================================================
--- tomcat/trunk/extras.xml (original)
+++ tomcat/trunk/extras.xml Sun Jul 5 00:17:22 2009
@@ -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/"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
