vgritsenko 2002/10/02 21:27:05 Modified: . Tag: cocoon_2_0_3_branch build.xml Log: fix binary dist: include proper manifest into cocoon.war Revision Changes Path No revision No revision 1.196.2.19 +13 -7 xml-cocoon2/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/xml-cocoon2/build.xml,v retrieving revision 1.196.2.18 retrieving revision 1.196.2.19 diff -u -r1.196.2.18 -r1.196.2.19 --- build.xml 23 Sep 2002 08:24:18 -0000 1.196.2.18 +++ build.xml 3 Oct 2002 04:27:05 -0000 1.196.2.19 @@ -1297,13 +1297,16 @@ <!-- =================================================================== --> <target name="webapp" depends="prepare-war" description="* Generates the war package"> <!-- A task to create manifest for webapp. --> - <taskdef name="manifest-tool" classname="ManifestToolTask" - classpath="${tools.dir}/anttasks"/> + <taskdef name="manifest" classname="ManifestToolTask" + classpath="${tools.dir}/anttasks"/> - <manifest-tool directory="${build.war}/WEB-INF/lib" - manifest="${build.war}/WEB-INF/Manifest.mf"/> + <manifest directory="${build.war}/WEB-INF/lib" + manifest="${build.war}/WEB-INF/Manifest.mf"/> - <jar jarfile="${build.dir}/${name}.war" basedir="${build.war}" includes="**" manifest="${build.war}/WEB-INF/Manifest.mf"/> + <jar jarfile="${build.dir}/${name}.war" + basedir="${build.war}" + includes="**" + manifest="${build.war}/WEB-INF/Manifest.mf"/> </target> <!-- =================================================================== --> @@ -1548,7 +1551,7 @@ <exclude name="lib/xalan*"/> <exclude name="lib/xerces*"/> <exclude name="lib/jtidy*"/> - <exclude name="lib/xml-apis*"/> + <exclude name="lib/xml-apis.jar"/> </fileset> </copy> @@ -1732,7 +1735,10 @@ <copy file="INSTALL.bin" tofile="${dist.bin.dir}/INSTALL" filtering="on"/> <!-- Build the war file --> - <jar jarfile="${dist.bin.dir}/${name}.war" basedir="${dist.bin.dir}/webapp" includes="**"/> + <jar jarfile="${dist.bin.dir}/${name}.war" + basedir="${dist.bin.dir}/webapp" + includes="**" + manifest="${build.war}/WEB-INF/Manifest.mf"/> <!-- Delete the webapp directory --> <delete dir="${dist.bin.dir}/webapp"/>
---------------------------------------------------------------------- In case of troubles, e-mail: [EMAIL PROTECTED] To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]