vgritsenko 2002/10/02 21:27:06
Modified: . build.xml
Log:
fix binary dist: include proper manifest into cocoon.war
Revision Changes Path
1.270 +9 -7 xml-cocoon2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.xml,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -r1.269 -r1.270
--- build.xml 27 Sep 2002 11:46:12 -0000 1.269
+++ build.xml 3 Oct 2002 04:27:05 -0000 1.270
@@ -1403,11 +1403,11 @@
<!-- =================================================================== -->
<target name="webapp" depends="prepare-war" description="Builds 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"/>
<!-- Compatible testing of 'obsolete' exclude.webapp.samples and
new property cocoon.webapp.samples.include -->
@@ -1436,7 +1436,8 @@
</or>
</condition>
- <jar jarfile="${build.dir}/${name}.war"
manifest="${build.war}/WEB-INF/Manifest.mf">
+ <jar jarfile="${build.dir}/${name}.war"
+ manifest="${build.war}/WEB-INF/Manifest.mf">
<fileset dir="${build.war}">
<exclude name="samples/**" if="exclude.samples.from.webapp"/>
<exclude name="documentation/**" if="exclude.documentation.from.webapp"/>
@@ -1713,7 +1714,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>
@@ -1896,7 +1897,8 @@
<jar jarfile="${dist.bin}/${name}.war"
basedir="${dist.bin}/webapp"
includes="**"
- excludes="samples/**"/>
+ excludes="samples/**"
+ manifest="${build.war}/WEB-INF/Manifest.mf"/>
<!-- Delete the webapp directory -->
<delete dir="${dist.bin}/webapp"/>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
