[embjopr-commits] EMBJOPR SVN: r856 - trunk/jsfunit.

Author: ozizka(a)redhat.com Date: 2009-11-16 17:40:10 -0500 (Mon, 16 Nov 2009) New Revision: 856 Modified: trunk/jsfunit/pom.xml Log: * POM - swapped plugins order - XSLT first, then AntRun copies the result. Modified: trunk/jsfunit/pom.xml =================================================================== --- trunk/jsfunit/pom.xml 2009-11-16 20:51:36 UTC (rev 855) +++ trunk/jsfunit/pom.xml 2009-11-16 22:40:10 UTC (rev 856) @@ -850,24 +850,6 @@ <build> <plugins> - <!-- AntRun - move the modified web.xml - overwrite the original (MOJO-1453 workaround) . --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <!-- This has to be named this way, otherwise it would execute AFTER web.xml XSLT processing. That's Maven. --> - <id>move-new-web.xml-overwrite-the-original-one</id> <!-- move-new-web.xml-overwrite-the-original-one --> - <phase>package</phase> - <configuration><tasks> - <echo>Moving ${project.build.directory}/war/work/org.jboss.jopr/jopr-embedded-jbas5/web.xml to ${project.build.directory}/war/work/org.jboss.jopr/jopr-embedded-jbas5/WEB-INF/web.xml</echo> - <move file="${project.build.directory}/war/work/org.jboss.jopr/jopr-embedded-jbas5/web.xml" todir="${project.build.directory}/war/work/org.jboss.jopr/jopr-embedded-jbas5/WEB-INF" /> - </tasks></configuration> - <goals><goal>run</goal></goals> - </execution> - </executions> - </plugin> - <!-- Change web.xml to set up MyFaces instead of RichFaces. http://fisheye.jboss.org/browse/EMBJOPR/branches/EmbJopr_1_3_3_MyFaces/co... <plugin> @@ -896,6 +878,24 @@ </executions> </plugin> + <!-- AntRun - move the modified web.xml - overwrite the original (MOJO-1453 workaround) . --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <!-- This has to be named this way, otherwise it would execute AFTER web.xml XSLT processing. That's Maven. --> + <id>move-new-web.xml-overwrite-the-original-one</id> <!-- move-new-web.xml-overwrite-the-original-one --> + <phase>package</phase> + <configuration><tasks> + <echo>Moving ${project.build.directory}/war/work/org.jboss.jopr/jopr-embedded-jbas5/web.xml to ${project.build.directory}/war/work/org.jboss.jopr/jopr-embedded-jbas5/WEB-INF/web.xml</echo> + <move file="${project.build.directory}/war/work/org.jboss.jopr/jopr-embedded-jbas5/web.xml" todir="${project.build.directory}/war/work/org.jboss.jopr/jopr-embedded-jbas5/WEB-INF" /> + </tasks></configuration> + <goals><goal>run</goal></goals> + </execution> + </executions> + </plugin> + </plugins> </build> </profile>