[jboss-cvs] JBossAS SVN: r69236 - in trunk/testsuite: imports/sections and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: petemuir
Date: 2008-01-23 07:31:59 -0500 (Wed, 23 Jan 2008)
New Revision: 69236

Modified:
   trunk/testsuite/build-thirdparty.xml
   trunk/testsuite/imports/sections/seam.xml
Log:
Include jbas5 integration jar in seam ears

Modified: trunk/testsuite/build-thirdparty.xml
===================================================================
--- trunk/testsuite/build-thirdparty.xml	2008-01-23 11:19:09 UTC (rev 69235)
+++ trunk/testsuite/build-thirdparty.xml	2008-01-23 12:31:59 UTC (rev 69236)
@@ -42,7 +42,7 @@
         The repository is in CVS under the module repository.jboss.com whose contents
         are pushed to the http://repository.jboss.com site.
       -->
-      <componentref name="apache-maven-ant-tasks" version="2.0.7"/>
+      <componentref name="apache-maven-ant-tasks" version="2.0.8"/>
       <componentref name="httpunit" version="1.6"/>
    </build>
 

Modified: trunk/testsuite/imports/sections/seam.xml
===================================================================
--- trunk/testsuite/imports/sections/seam.xml	2008-01-23 11:19:09 UTC (rev 69235)
+++ trunk/testsuite/imports/sections/seam.xml	2008-01-23 12:31:59 UTC (rev 69236)
@@ -1,30 +1,70 @@
-<project name="tests-seam-jars" xmlns:artifact="urn:maven-artifact-ant">
-
-   <property name="repository" value="http://snapshots.jboss.org/maven2/org/jboss/seam/examples/"/>
-
-   <property name="seam_version" value="2.0.1.CR1"/>
-
+<project name="tests-seam-jars" xmlns:artifact="urn:maven-artifact-ant">
+
+   <property name="seam_version" value="2.0.1-SNAPSHOT"/>
+	
+   <property name="build.seam.lib" value="${build.lib}/seam" />
+
    <target name="_jars-seam">
    	
    	  <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="apache.maven.ant.tasks.classpath" />
-   	
+   	
       <mkdir dir="${build.lib}"/>
+   	  <mkdir dir="${build.seam.lib}" />
+   	  <mkdir dir="${build.seam.lib}/lib" />
       <artifact:dependencies filesetId="examples.fileset" versionsId="examples.versions">
           <dependency groupId="org.jboss.seam.examples" artifactId="jboss-seam-booking" version="${seam_version}" type="ear"/>
       	  <dependency groupId="org.jboss.seam.examples" artifactId="jboss-seam-booking" version="${seam_version}" type="xml" classifier="ds"/>
       	  <dependency groupId="org.jboss.seam.examples" artifactId="jboss-seam-dvd" version="${seam_version}" type="ear"/>
       	  <dependency groupId="org.jboss.seam.examples" artifactId="jboss-seam-dvd" version="${seam_version}" type="xml" classifier="ds"/>
       	  <dependency groupId="org.jboss.seam.examples" artifactId="jboss-seam-numberguess" version="${seam_version}" type="ear"/>
+      	  <dependency groupId="org.jboss.seam" artifactId="jboss-seam-jbas5" version="${seam_version}" />
       	  <remoterepository id="repository.jboss.org" url="http://repository.jboss.org/maven2"/>
+      	  <remoterepository id="snapshots.jboss.org" url="http://snapshots.jboss.org/maven2"/>
       </artifact:dependencies>
    	
-   	  <copy todir="${build.lib}">
+   	  <copy todir="${build.seam.lib}">
    		  <fileset refid="examples.fileset" />
    		  <mapper classpathref="apache.maven.ant.tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${examples.versions}" to="flatten" />
-   	  </copy>
-
+   	  </copy>
+   	
+   	  <move file="${build.seam.lib}/jboss-seam-jbas5.jar" todir="${build.seam.lib}/lib"/>
+
+   	  <shadeExample example="jboss-seam-booking" />
+   	  <shadeExample example="jboss-seam-dvd" />
+   	  <shadeExample example="jboss-seam-numberguess" />
+   	
+   	  <copy todir="${build.lib}">
+   	  	 <fileset dir="${build.seam.lib}">
+   	  	 	<include name="*-ds.xml" />
+   	  	 </fileset>
+   	  </copy>
+   	
    </target>
+   	  	
+   <macrodef name="shadeExample">
+   		<attribute name="example" />
+   		<attribute name="type" default="ear" />
+   		<attribute name="file" default="@{example}.@{type}" />
+   		<sequential>
+   			<shade src="${build.seam.lib}/@{file}" dest="${build.lib}/@{file}">
+   				<fileset dir="${build.seam.lib}">
+   					<include name="lib/jboss-seam-jbas5.jar" />
+   				</fileset>
+   			</shade>
+   		</sequential>
+   </macrodef>
    
-   
-
-</project>
+   <macrodef name="shade">
+   		<attribute name="src"/>
+   		<attribute name="dest" />
+   		<element name="additions" implicit="true"/>
+   		<sequential>
+   			<jar jarfile="@{dest}">
+   				<zipfileset src="@{src}"/>
+   				<additions />
+   			</jar>
+   		</sequential>
+   </macrodef>
+   
+
+</project>