Author: dkatayev Date: 2010-08-26 07:06:23 -0400 (Thu, 26 Aug 2010) New Revision: 2991 Modified: jcr/trunk/applications/exo.jcr.applications.jetty/pom.xml jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml Log: EXOJCR-891 added regexp for removing timestamp from *.war files Modified: jcr/trunk/applications/exo.jcr.applications.jetty/pom.xml =================================================================== --- jcr/trunk/applications/exo.jcr.applications.jetty/pom.xml 2010-08-26 07:24:28 UTC (rev 2990) +++ jcr/trunk/applications/exo.jcr.applications.jetty/pom.xml 2010-08-26 11:06:23 UTC (rev 2991) @@ -108,11 +108,17 @@ <fileset dir="${basedir}/target/lib-binary.dir/"> <include name="**/*.war" /> </fileset> - <mapper> - <chainedmapper> - <flattenmapper /> - <globmapper from="exo.jcr.applications.*-${project.version}.war" to="*.war" casesensitive="no" /> - </chainedmapper> + <fileset dir="${basedir}/target/lib-binary.dir/"> + <include name="**/*.war" /> + </fileset> + <mapper> + <firstmatchmapper> + <!-- If a timestamped SNAPSHOT is used --> + <regexpmapper from="exo.jcr.applications.(.*)-([0-9]+(.[0-9]+)*-(.*))-([0-9]{8}.[0-9]{6})-([0-9]+).war" to="\1.war" casesensitive="no" /> + <!-- Otherwise --> + <globmapper from="exo.jcr.applications.*-${project.version}.war" to="*.war" casesensitive="no" /> + <!-- By default keep the name --> + </firstmatchmapper> </mapper> </move> <copy todir="${exo.projects.directory.working}/exo-jetty/webapps/" verbose="true" flatten="true" overwrite="true"> @@ -121,7 +127,24 @@ </fileset> </copy> </tasks> - </configuration> + </configuration> + <dependencies> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant-launcher</artifactId> + <version>1.8.1</version> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + <version>1.8.1</version> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant-nodeps</artifactId> + <version>1.8.1</version> + </dependency> + </dependencies> </plugin> </plugins> </build> Modified: jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml =================================================================== --- jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml 2010-08-26 07:24:28 UTC (rev 2990) +++ jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml 2010-08-26 11:06:23 UTC (rev 2991) @@ -111,10 +111,13 @@ <include name="**/*.war" /> </fileset> <mapper> - <chainedmapper> - <flattenmapper /> + <firstmatchmapper> + <!-- If a timestamped SNAPSHOT is used --> + <regexpmapper from="exo.jcr.applications.(.*)-([0-9]+(.[0-9]+)*-(.*))-([0-9]{8}.[0-9]{6})-([0-9]+).war" to="\1.war" casesensitive="no" /> + <!-- Otherwise --> <globmapper from="exo.jcr.applications.*-${project.version}.war" to="*.war" casesensitive="no" /> - </chainedmapper> + <!-- By default keep the name --> + </firstmatchmapper> </mapper> </move> <copy todir="${exo.projects.directory.working}/exo-tomcat/webapps/" verbose="true" flatten="true" overwrite="true"> @@ -124,6 +127,23 @@ </copy> </tasks> </configuration> + <dependencies> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant-launcher</artifactId> + <version>1.8.1</version> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + <version>1.8.1</version> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant-nodeps</artifactId> + <version>1.8.1</version> + </dependency> + </dependencies> </plugin> </plugins> </build>