Author: ozizka(a)redhat.com Date: 2010-03-18 23:11:24 -0400 (Thu, 18 Mar 2010) New Revision: 883 Modified: branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/pom.xml Log: * POM: Fixed the WAR overlaying - copied libs from the dist WAR to lib. Who would expect such stupid task to be this complicated. Modified: branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/pom.xml =================================================================== --- branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/pom.xml 2010-03-18 23:16:53 UTC (rev 882) +++ branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/pom.xml 2010-03-19 03:11:24 UTC (rev 883) @@ -238,11 +238,26 @@ </dependencies> <build> <plugins> - <plugin> <artifactId>maven-antrun-plugin</artifactId> - <executions> <execution> <phase>initialize</phase> <goals><goal>run</goal></goals> <configuration> <tasks> + <plugin> <artifactId>maven-antrun-plugin</artifactId> <executions> + + <execution> <id>echo</id> <phase>initialize</phase> <goals><goal>run</goal></goals> <configuration> <tasks> <echo> *** dist-war profile activated. *** </echo> - </tasks> </configuration> </execution> </executions> - </plugin> + </tasks> </configuration> </execution> + + <execution> <id>copy-libs</id> <phase>prepare-package</phase> <goals><goal>run</goal></goals> <configuration> <tasks> + <echo> *** Copying dist-WAR/WEB-INF/lib to WEB-INF/lib... *** </echo> + <unzip src="${as.dist.war}" dest="${basedir}/target/tmp/distwar"/> + <!-- 1), use with <overlay>. --> + <zip destfile="${basedir}/target/tmp/libs.zip" compress="false" filesonly="true" basedir="${basedir}/target/tmp/distwar/WEB-INF/lib"/> + <!-- 2) simply copy. ${project.build.finalName}.${project.packaging} --> + <copy todir="${project.build.directory}/${project.build.finalName}/WEB-INF/lib" flatten="true" verbose="true"> + <fileset dir="${basedir}/target/tmp/distwar/WEB-INF/lib"/> + </copy> + </tasks> </configuration> </execution> + + </executions> </plugin> + <!-- WAR overlay needs an artifact. --> + </plugins> </build> </profile> @@ -251,10 +266,11 @@ <!-- JBoss AS 4.2 --> <profile> <id>jboss42-war</id> + <!-- I need AND, but it's OR. TODO: Switch to property-based. <activation> <file><missing>${as.dist.war}</missing></file> <property><name>jboss42</name><value>true</value></property> - </activation> + </activation> --> <dependencies> <dependency> <groupId>org.jboss.jopr</groupId> @@ -379,10 +395,11 @@ <!-- JBoss AS 5.x --> <profile> <id>jboss5x-war</id> + <!-- I need AND, but it's OR. TODO: Switch to property-based. <activation> <file><missing>${as.dist.war}</missing></file> <property><name>jboss5x</name><value>true</value></property> - </activation> + </activation> --> <dependencies> <dependency> <groupId>org.jboss.jopr</groupId>