vmassol 2003/03/29 07:10:04
Modified: integration/ant/src/scripts/share build-share.xml
Log:
Now using Chris' webmerge Ant task :-)
Revision Changes Path
1.12 +5 -1 jakarta-cactus/integration/ant/src/scripts/share/build-share.xml
Index: build-share.xml
===================================================================
RCS file:
/home/cvs/jakarta-cactus/integration/ant/src/scripts/share/build-share.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build-share.xml 25 Mar 2003 19:31:57 -0000 1.11
+++ build-share.xml 29 Mar 2003 15:10:04 -0000 1.12
@@ -138,7 +138,11 @@
<unwar src="${cactus.war}"
dest="${cactus.target.dir}/${cactus.context}"/>
- <!-- TODO: Perform a web.xml merge -->
+ <!-- Perform a web.xml merge -->
+ <webxmlmerge
+ srcFile="${cactus.target.dir}/${cactus.context}/WEB-INF/web.xml"
+ mergeFile="${cactus.conf.dir}/web.xml"
+ destFile="${cactus.target.dir}/${cactus.context}/WEB-INF/web.xml"/>
<!-- Copy the Cactus web.xml -->
<copy todir="${cactus.target.dir}/${cactus.context}/WEB-INF"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
