Author: julien_viet Date: 2011-01-07 04:38:22 -0500 (Fri, 07 Jan 2011) New Revision: 5699 Modified: components/pc/trunk/test/core/src/main/build.xml Log: GTNPC-46 : improve how packaging of war is done Modified: components/pc/trunk/test/core/src/main/build.xml =================================================================== --- components/pc/trunk/test/core/src/main/build.xml 2011-01-07 09:36:39 UTC (rev 5698) +++ components/pc/trunk/test/core/src/main/build.xml 2011-01-07 09:38:22 UTC (rev 5699) @@ -6,6 +6,42 @@ uri="antlib:org.apache.maven.artifact.ant" classpathref="maven-ant-tasks.classpath" /> + <macrodef name="install"> + <attribute name="pomId"/> + <attribute name="artifactId"/> + <attribute name="packaging"/> + <attribute name="file"/> + <sequential> + + <!-- Create dir if not exist --> + <mkdir dir="${target}/poms"/> + + <!-- Generate pom --> + <artifact:pom + id="@{pomId}" + groupId="${groupId}" + artifactId="@{artifactId}" + version="${version}" + name="Generated @{pomId}" + packaging="@{packaging}"/> + + <!-- Write the physical pom --> + <artifact:writepom + pomRefId="@{pomId}" + file=&quot;${target}/poms/(a){pomId}.xml&quot;/&gt; + + <!-- Now we create the same pom but from the physical one --> + <artifact:pom + id="@{pomId}_" + file=&quot;${target}/poms/(a){pomId}.xml&quot;/&gt; + + <!-- Install the file --> + <artifact:install file="@{file}"> + <pom refid="@{pomId}_"/> + </artifact:install> + </sequential> + </macrodef> + <macrodef name="package-ext-test"> <attribute name="test"/> <sequential> @@ -55,10 +91,10 @@ <sequential> <!-- Make directory --> - <mkdir dir="${target}/test-@{testsuiteversion}-@{testsuitetype}-@{testsuitename}"/> + <mkdir dir="${target}/wars"/> <!-- Generate artifact --> - <jar jarfile=&quot;${target}/test-@{testsuiteversion}-@{testsuitetype}-(a){testsuitename}/artifact.war&quot;&gt; + <jar jarfile=&quot;${target}/wars/test-@{testsuiteversion}-@{testsuitetype}-(a){testsuitename}.war&quot;&gt; <zipfileset dir="${target}/test-classes" prefix="WEB-INF/classes"> <include name="org/gatein/pc/test/portlet/@{testsuiteversion}/@{testsuitetype}/common/**"/> <include name="org/gatein/pc/test/portlet/@{testsuiteversion}/common/**"/> @@ -74,30 +110,12 @@ <fileset dir="${basedir}/src/main/packaging/@{testsuiteversion}/@{testsuitetype}/@{testsuitename}-war"/> </jar> - <!-- Generate pom --> - <artifact:pom - id="@{testsuiteversion}-@{testsuitetype}-@{testsuitename}" - groupId="${groupId}" - artifactId="${artifactId}-@{testsuiteversion}-@{testsuitetype}-@{testsuitename}" - version="${version}" - name="Test @{testsuiteversion} @{testsuitetype} @{testsuitename}" - packaging="war"/> + <install + pomId="@{testsuiteversion}-@{testsuitetype}-@{testsuitename}" + artifactId="${artifactId}-@{testsuiteversion}-@{testsuitetype}-@{testsuitename}" + packaging="war" + file=&quot;${target}/wars/test-@{testsuiteversion}-@{testsuitetype}-(a){testsuitename}.war&quot;/&gt; - <!-- Write the physical pom --> - <artifact:writepom - pomRefId="@{testsuiteversion}-@{testsuitetype}-@{testsuitename}" - file=&quot;${target}/test-@{testsuiteversion}-@{testsuitetype}-(a){testsuitename}/pom.xml&quot;/&gt; - - <!-- Now we create the same pom but from the physical one --> - <artifact:pom - id="@{testsuiteversion}-@{testsuitetype}-@{testsuitename}_" - file=&quot;${target}/test-@{testsuiteversion}-@{testsuitetype}-(a){testsuitename}/pom.xml&quot;/&gt; - - <!-- Install the file --> - <artifact:install file=&quot;${target}/test-@{testsuiteversion}-@{testsuitetype}-(a){testsuitename}/artifact.war&quot;&gt; - <pom refid="@{testsuiteversion}-@{testsuitetype}-@{testsuitename}_"/> - </artifact:install> - </sequential> </macrodef>