Author: craigmcc
Date: Thu Nov 24 13:27:43 2005
New Revision: 348805
URL: http://svn.apache.org/viewcvs?rev=348805&view=rev
Log:
Tweak JAR building so that the manifest of each JAR file has a unique
"Extention-Name" entry:
* shale-core.jar org.apache.shale
* shale-spring.jar org.apache.shale.spring
* shale-tiles.jar org.apache.shale.tiles
Modified:
struts/shale/trunk/core-library/build.xml
Modified: struts/shale/trunk/core-library/build.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/build.xml?rev=348805&r1=348804&r2=348805&view=diff
==============================================================================
--- struts/shale/trunk/core-library/build.xml (original)
+++ struts/shale/trunk/core-library/build.xml Thu Nov 24 13:27:43 2005
@@ -185,10 +185,26 @@
<target name="static" depends="prepare">
<tstamp/>
- <copy todir="${build.home}/conf"
- filtering="on">
- <fileset dir="src/conf"
- includes="*.MF"/>
+ <copy tofile="${build.home}/conf/MANIFEST.MF-core"
+ file="src/conf/MANIFEST.MF">
+ <filterset>
+ <filter token="package" value="${project.package}"/>
+ <filter token="version" value="${project.version}"/>
+ </filterset>
+ </copy>
+ <copy tofile="${build.home}/conf/MANIFEST.MF-spring"
+ file="src/conf/MANIFEST.MF">
+ <filterset>
+ <filter token="package" value="${project.package}.spring"/>
+ <filter token="version" value="${project.version}"/>
+ </filterset>
+ </copy>
+ <copy tofile="${build.home}/conf/MANIFEST.MF-tiles"
+ file="src/conf/MANIFEST.MF">
+ <filterset>
+ <filter token="package" value="${project.package}.tiles"/>
+ <filter token="version" value="${project.version}"/>
+ </filterset>
</copy>
<copy todir="${build.home}/classes/META-INF">
<fileset dir="src/conf"
@@ -252,7 +268,7 @@
<jar jarfile="${build.home}/lib/shale-core.jar"
basedir="${build.home}/classes"
- manifest="${build.home}/conf/MANIFEST.MF"
+ manifest="${build.home}/conf/MANIFEST.MF-core"
excludes="org/apache/shale/spring/** org/apache/shale/tiles/**
**/package.html"/>
</target>
@@ -265,7 +281,7 @@
<copy todir="${build.home}/shale-spring/META-INF"
file="src/java/org/apache/shale/spring/faces-config.xml"/>
<jar jarfile="${build.home}/lib/shale-spring.jar"
- manifest="${build.home}/conf/MANIFEST.MF">
+ manifest="${build.home}/conf/MANIFEST.MF-spring">
<fileset dir="${build.home}/shale-spring"/>
<fileset dir="${build.home}/classes"
includes="org/apache/shale/spring/**"
@@ -280,7 +296,7 @@
<copy todir="${build.home}/shale-tiles/META-INF"
file="src/java/org/apache/shale/tiles/faces-config.xml"/>
<jar jarfile="${build.home}/lib/shale-tiles.jar"
- manifest="${build.home}/conf/MANIFEST.MF">
+ manifest="${build.home}/conf/MANIFEST.MF-tiles">
<fileset dir="${build.home}/shale-tiles"/>
<fileset dir="${build.home}/classes"
includes="org/apache/shale/tiles/**"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
