cmlenz 2003/06/18 12:55:45
Modified: integration/ant/src/java/org/apache/cactus/integration/ant
WebXmlMergeTask.java
Log:
Actually use the 'encoding' and 'indent' parameters of the task when serializing the
descriptor.
Muchos gracias to Martin.Bayly (Martin.Bayly at webct.com) for reporting this bug!
Revision Changes Path
1.17 +3 -2
jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/WebXmlMergeTask.java
Index: WebXmlMergeTask.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/WebXmlMergeTask.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- WebXmlMergeTask.java 14 May 2003 10:44:53 -0000 1.16
+++ WebXmlMergeTask.java 18 Jun 2003 19:55:45 -0000 1.17
@@ -157,7 +157,8 @@
WebXmlMerger merger = new WebXmlMerger(srcWebXml);
merger.setLog(new AntLog(this));
merger.merge(mergeWebXml);
- WebXmlIo.writeWebXml(srcWebXml, this.destFile);
+ WebXmlIo.writeWebXml(srcWebXml, this.destFile,
+ this.encoding, this.indent);
}
else
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
