Author: niallp
Date: Sun Mar 12 17:04:53 2006
New Revision: 385398
URL: http://svn.apache.org/viewcvs?rev=385398&view=rev
Log:
Fix for Bug 38940 - Unable to run 'maven dist' from source distribution
reported by Wendy Smoak.
Modified:
struts/build/trunk/maven.xml
Modified: struts/build/trunk/maven.xml
URL:
http://svn.apache.org/viewcvs/struts/build/trunk/maven.xml?rev=385398&r1=385397&r2=385398&view=diff
==============================================================================
--- struts/build/trunk/maven.xml (original)
+++ struts/build/trunk/maven.xml Sun Mar 12 17:04:53 2006
@@ -1,202 +1,204 @@
-<?xml version="1.0"?>
-
-<project default="build-all"
- xmlns:j="jelly:core"
- xmlns:ant="jelly:ant"
- xmlns:maven="jelly:maven">
-
- <tstamp>
- <format property="today" pattern="yyyyMMdd"/>
- </tstamp>
-
- <preGoal name="xdoc:jelly-transform">
- <attainGoal name="faq"/>
- </preGoal>
-
- <goal name="nightly">
- <ant:delete dir="nightly"/>
- <ant:mkdir dir="nightly/"/>
- <ant:mkdir dir="nightly/logs/"/>
- <ant:mkdir dir="nightly/struts-apps/"/>
- <ant:mkdir dir="nightly/struts-action/"/>
- <ant:mkdir dir="nightly/struts-el/"/>
- <ant:mkdir dir="nightly/struts-extras/"/>
- <ant:mkdir dir="nightly/struts-faces/"/>
- <ant:mkdir dir="nightly/struts-flow/"/>
- <ant:mkdir dir="nightly/struts-sandbox/"/>
- <ant:mkdir dir="nightly/struts-scripting/"/>
- <ant:mkdir dir="nightly/struts-site/"/>
- <ant:mkdir dir="nightly/struts-taglib/"/>
- <ant:mkdir dir="nightly/struts-tiles/"/>
-
- <attainGoal name="clean-all"/>
- <attainGoal name="build-all"/>
-
- <ant:mkdir dir="nightly/struts-apps/"/>
-
- <ant:copy tofile="nightly/struts-apps/struts-blank-${today}.war">
- <ant:fileset dir="../apps/blank/target/">
- <ant:include name="struts-blank.war"/>
- </ant:fileset>
- </ant:copy>
-
- <ant:copy tofile="nightly/struts-apps/struts-cookbook-${today}.war">
- <ant:fileset dir="../apps/cookbook/target/">
- <ant:include name="struts-cookbook.war"/>
- </ant:fileset>
- </ant:copy>
-
- <ant:copy tofile="nightly/struts-apps/struts-mailreader-${today}.war">
- <ant:fileset dir="../apps/mailreader/target/">
- <ant:include name="struts-mailreader.war"/>
- </ant:fileset>
- </ant:copy>
-
- <ant:copy tofile="nightly/struts-apps/struts-examples-${today}.war">
- <ant:fileset dir="../apps/examples/target/">
- <ant:include name="struts-examples.war"/>
- </ant:fileset>
- </ant:copy>
-
- <ant:copy
-
tofile="nightly/struts-el/strutsel-exercise-taglib-${today}.war">
- <ant:fileset dir="../el/target/">
- <ant:include name="strutsel-exercise-taglib.war"/>
- </ant:fileset>
- </ant:copy>
-
- </goal>
-
-
- <goal name="build-all">
-
- <maven:reactor
- basedir="../"
- includes="*/project.xml"
- excludes="build/project.xml"
- goals="dist"
- banner="Building nightlies"
- ignoreFailures="true"/>
-
- <maven:reactor
- basedir="../"
- includes="*/project.xml"
- excludes="build/project.xml"
- goals="copy-distribution"
- banner="Building nightlies"
- ignoreFailures="true"/>
-
- </goal>
-
-
- <goal name="clean-all">
- <maven:reactor
- basedir="../"
- includes="*/project.xml"
- excludes="build/project.xml"
- goals="clean"
- banner="Building nightlies"
- ignoreFailures="true"/>
-
- </goal>
-
- <postGoal name="dist">
- <attainGoal name="jar:install"/>
- </postGoal>
-
- <postGoal name="dist:prepare-bin-filesystem">
- <!-- Copy Instructions and Readmes -->
- <ant:copy todir="${maven.dist.bin.assembly.dir}">
- <ant:fileset dir="build/">
- <ant:include name="README*"/>
- <ant:include name="LICENSE.txt"/>
- <ant:include name="STATUS*"/>
- <ant:include name="INSTALL*"/>
- <ant:include name="NOTICE*"/>
- </ant:fileset>
- </ant:copy>
-
- </postGoal>
-
- <postGoal name="dist:prepare-src-filesystem">
-
- <!-- Copy Instructions and Readmes -->
- <ant:copy todir="${maven.dist.src.assembly.dir}">
- <ant:fileset dir="build">
- <ant:include name="README*"/>
- <ant:include name="LICENSE.txt"/>
- <ant:include name="STATUS*"/>
- <ant:include name="INSTALL*"/>
- <ant:include name="NOTICE*"/>
- </ant:fileset>
- </ant:copy>
-
- <!-- Copy Maven Control files -->
- <ant:copy todir="${maven.dist.src.assembly.dir}/build">
- <ant:fileset dir="build">
- <ant:include name="project.*"/>
- <ant:include name="*.xml"/>
- <ant:include name="*.jsl"/>
- </ant:fileset>
- </ant:copy>
- </postGoal>
-
- <goal name="copy-artifacts">
-
- <maven:reactor
- basedir="../"
- includes="*/project.xml"
- excludes="build/project.xml"
- goals="copy-distribution"
- banner="Copy nightly artifacts"
- ignoreFailures="false"/>
-
- </goal>
-
- <goal name="copy-distribution">
- <!--
- <ant:copy
todir="../build/${today}/${pom.artifactId}-${pom.currentVersion}">
- <ant:fileset dir="${maven.build.dir}/distributions">
- <ant:include name="*"/>
- </ant:fileset>
- </ant:copy>
- -->
-
- <ant:mkdir dir="../build/nightly/${pom.artifactId}/"/>
-
- <ant:copy
-
tofile="../build/nightly/${pom.artifactId}/${pom.artifactId}-${pom.currentVersion}-${today}.tar.gz">
- <ant:fileset dir="${maven.build.dir}/distributions">
- <ant:include
- name="${pom.artifactId}-${pom.currentVersion}.tar.gz"/>
- </ant:fileset>
- </ant:copy>
-
- <ant:copy
-
tofile="../build/nightly/${pom.artifactId}/${pom.artifactId}-${pom.currentVersion}-${today}.zip">
- <ant:fileset dir="${maven.build.dir}/distributions">
- <ant:include
- name="${pom.artifactId}-${pom.currentVersion}.zip"/>
- </ant:fileset>
- </ant:copy>
-
- <ant:copy
-
tofile="../build/nightly/${pom.artifactId}/${pom.artifactId}-${pom.currentVersion}-${today}-src.tar.gz">
- <ant:fileset dir="${maven.build.dir}/distributions">
- <ant:include
-
name="${pom.artifactId}-${pom.currentVersion}-src.tar.gz"/>
- </ant:fileset>
- </ant:copy>
-
- <ant:copy
-
tofile="../build/nightly/${pom.artifactId}/${pom.artifactId}-${pom.currentVersion}-${today}-src.zip">
- <ant:fileset dir="${maven.build.dir}/distributions">
- <ant:include
-
name="${pom.artifactId}-${pom.currentVersion}-src.zip"/>
- </ant:fileset>
- </ant:copy>
-
- </goal>
-
-
-</project>
+<?xml version="1.0"?>
+
+<project default="build-all"
+ xmlns:j="jelly:core"
+ xmlns:ant="jelly:ant"
+ xmlns:maven="jelly:maven">
+
+ <tstamp>
+ <format property="today" pattern="yyyyMMdd"/>
+ </tstamp>
+
+ <preGoal name="xdoc:jelly-transform">
+ <attainGoal name="faq"/>
+ </preGoal>
+
+ <goal name="nightly">
+ <ant:delete dir="nightly"/>
+ <ant:mkdir dir="nightly/"/>
+ <ant:mkdir dir="nightly/logs/"/>
+ <ant:mkdir dir="nightly/struts-apps/"/>
+ <ant:mkdir dir="nightly/struts-action/"/>
+ <ant:mkdir dir="nightly/struts-el/"/>
+ <ant:mkdir dir="nightly/struts-extras/"/>
+ <ant:mkdir dir="nightly/struts-faces/"/>
+ <ant:mkdir dir="nightly/struts-flow/"/>
+ <ant:mkdir dir="nightly/struts-sandbox/"/>
+ <ant:mkdir dir="nightly/struts-scripting/"/>
+ <ant:mkdir dir="nightly/struts-site/"/>
+ <ant:mkdir dir="nightly/struts-taglib/"/>
+ <ant:mkdir dir="nightly/struts-tiles/"/>
+
+ <attainGoal name="clean-all"/>
+ <attainGoal name="build-all"/>
+
+ <ant:mkdir dir="nightly/struts-apps/"/>
+
+ <ant:copy tofile="nightly/struts-apps/struts-blank-${today}.war">
+ <ant:fileset dir="../apps/blank/target/">
+ <ant:include name="struts-blank.war"/>
+ </ant:fileset>
+ </ant:copy>
+
+ <ant:copy tofile="nightly/struts-apps/struts-cookbook-${today}.war">
+ <ant:fileset dir="../apps/cookbook/target/">
+ <ant:include name="struts-cookbook.war"/>
+ </ant:fileset>
+ </ant:copy>
+
+ <ant:copy tofile="nightly/struts-apps/struts-mailreader-${today}.war">
+ <ant:fileset dir="../apps/mailreader/target/">
+ <ant:include name="struts-mailreader.war"/>
+ </ant:fileset>
+ </ant:copy>
+
+ <ant:copy tofile="nightly/struts-apps/struts-examples-${today}.war">
+ <ant:fileset dir="../apps/examples/target/">
+ <ant:include name="struts-examples.war"/>
+ </ant:fileset>
+ </ant:copy>
+
+ <ant:copy
+
tofile="nightly/struts-el/strutsel-exercise-taglib-${today}.war">
+ <ant:fileset dir="../el/target/">
+ <ant:include name="strutsel-exercise-taglib.war"/>
+ </ant:fileset>
+ </ant:copy>
+
+ </goal>
+
+
+ <goal name="build-all">
+
+ <maven:reactor
+ basedir="../"
+ includes="*/project.xml"
+ excludes="build/project.xml"
+ goals="dist"
+ banner="Building nightlies"
+ ignoreFailures="true"/>
+
+ <maven:reactor
+ basedir="../"
+ includes="*/project.xml"
+ excludes="build/project.xml"
+ goals="copy-distribution"
+ banner="Building nightlies"
+ ignoreFailures="true"/>
+
+ </goal>
+
+
+ <goal name="clean-all">
+ <maven:reactor
+ basedir="../"
+ includes="*/project.xml"
+ excludes="build/project.xml"
+ goals="clean"
+ banner="Building nightlies"
+ ignoreFailures="true"/>
+
+ </goal>
+
+ <postGoal name="dist">
+ <attainGoal name="jar:install"/>
+ </postGoal>
+
+ <postGoal name="dist:prepare-bin-filesystem">
+ <!-- Copy Instructions and Readmes -->
+ <ant:copy todir="${maven.dist.bin.assembly.dir}">
+ <ant:fileset dir="build/">
+ <ant:include name="README*"/>
+ <ant:include name="LICENSE.txt"/>
+ <ant:include name="STATUS*"/>
+ <ant:include name="INSTALL*"/>
+ <ant:include name="NOTICE*"/>
+ </ant:fileset>
+ </ant:copy>
+
+ </postGoal>
+
+ <postGoal name="dist:prepare-src-filesystem">
+
+ <!-- Copy Instructions and Readmes -->
+ <ant:copy todir="${maven.dist.src.assembly.dir}">
+ <ant:fileset dir="build">
+ <ant:include name="README*"/>
+ <ant:include name="LICENSE.txt"/>
+ <ant:include name="STATUS*"/>
+ <ant:include name="INSTALL*"/>
+ <ant:include name="NOTICE*"/>
+ </ant:fileset>
+ </ant:copy>
+
+ <!-- Copy Maven Control files -->
+ <ant:copy todir="${maven.dist.src.assembly.dir}/build">
+ <ant:fileset dir="build">
+ <ant:include name="project.*"/>
+ <ant:include name="*.xml"/>
+ <ant:include name="*.jsl"/>
+ <ant:include name="LICENSE*"/>
+ <ant:include name="NOTICE*"/>
+ </ant:fileset>
+ </ant:copy>
+ </postGoal>
+
+ <goal name="copy-artifacts">
+
+ <maven:reactor
+ basedir="../"
+ includes="*/project.xml"
+ excludes="build/project.xml"
+ goals="copy-distribution"
+ banner="Copy nightly artifacts"
+ ignoreFailures="false"/>
+
+ </goal>
+
+ <goal name="copy-distribution">
+ <!--
+ <ant:copy
todir="../build/${today}/${pom.artifactId}-${pom.currentVersion}">
+ <ant:fileset dir="${maven.build.dir}/distributions">
+ <ant:include name="*"/>
+ </ant:fileset>
+ </ant:copy>
+ -->
+
+ <ant:mkdir dir="../build/nightly/${pom.artifactId}/"/>
+
+ <ant:copy
+
tofile="../build/nightly/${pom.artifactId}/${pom.artifactId}-${pom.currentVersion}-${today}.tar.gz">
+ <ant:fileset dir="${maven.build.dir}/distributions">
+ <ant:include
+ name="${pom.artifactId}-${pom.currentVersion}.tar.gz"/>
+ </ant:fileset>
+ </ant:copy>
+
+ <ant:copy
+
tofile="../build/nightly/${pom.artifactId}/${pom.artifactId}-${pom.currentVersion}-${today}.zip">
+ <ant:fileset dir="${maven.build.dir}/distributions">
+ <ant:include
+ name="${pom.artifactId}-${pom.currentVersion}.zip"/>
+ </ant:fileset>
+ </ant:copy>
+
+ <ant:copy
+
tofile="../build/nightly/${pom.artifactId}/${pom.artifactId}-${pom.currentVersion}-${today}-src.tar.gz">
+ <ant:fileset dir="${maven.build.dir}/distributions">
+ <ant:include
+
name="${pom.artifactId}-${pom.currentVersion}-src.tar.gz"/>
+ </ant:fileset>
+ </ant:copy>
+
+ <ant:copy
+
tofile="../build/nightly/${pom.artifactId}/${pom.artifactId}-${pom.currentVersion}-${today}-src.zip">
+ <ant:fileset dir="${maven.build.dir}/distributions">
+ <ant:include
+
name="${pom.artifactId}-${pom.currentVersion}-src.zip"/>
+ </ant:fileset>
+ </ant:copy>
+
+ </goal>
+
+
+</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
