[jboss-cvs] JBossAS SVN: r63222 - in branches/Branch_4_2/ejb3: imports and 1 other directory.

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

Author: wolfc
Date: 2007-05-28 05:36:30 -0400 (Mon, 28 May 2007)
New Revision: 63222

Added:
   branches/Branch_4_2/ejb3/imports/build-simple.xml
Modified:
   branches/Branch_4_2/ejb3/build-test.xml
Log:
Merged build-simple macro from trunk

Modified: branches/Branch_4_2/ejb3/build-test.xml
===================================================================
--- branches/Branch_4_2/ejb3/build-test.xml	2007-05-28 09:31:57 UTC (rev 63221)
+++ branches/Branch_4_2/ejb3/build-test.xml	2007-05-28 09:36:30 UTC (rev 63222)
@@ -306,6 +306,8 @@
    <property name="jbosstest.beancount" value="5"/>
    <property name="jbosstest.nodeploy" value="false"/>
 
+   <import file="imports/build-simple.xml"/>
+   
    <target name="init">
       <record name="${basedir}/build.log" append="yes" action="start" loglevel="error"/>
       <!-- Setup the version 1 classes so the tests compile -->

Copied: branches/Branch_4_2/ejb3/imports/build-simple.xml (from rev 63221, trunk/ejb3/imports/build-simple.xml)
===================================================================
--- branches/Branch_4_2/ejb3/imports/build-simple.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/imports/build-simple.xml	2007-05-28 09:36:30 UTC (rev 63222)
@@ -0,0 +1,37 @@
+<!-- some build simple macros -->
+<project name="build-simple">
+   <target name="_build-simple-check-resources">
+      <available property="${jarname}-resources-available" file="${resources}/test/${jarname}"/>
+   </target>
+   
+   <target name="_build-simple-jar-with-resources" if="${jarname}-resources-available">
+      <jar jarfile="${build.lib}/${jarname}.jar">
+         <fileset dir="${build.classes}">
+            <include name="org/jboss/ejb3/test/${jarname}/*.class"/>
+         </fileset>
+         <fileset dir="${resources}/test/${jarname}" includes="META-INF/*"/>
+      </jar>
+   </target>
+   
+   <target name="_build-simple-jar-without-resources" unless="${jarname}-resources-available">
+      <jar jarfile="${build.lib}/${jarname}.jar">
+         <fileset dir="${build.classes}">
+            <include name="org/jboss/ejb3/test/${jarname}/*.class"/>
+         </fileset>
+      </jar>
+   </target>
+   
+   <target name="_build-simple-jar" depends="_build-simple-check-resources,_build-simple-jar-with-resources,_build-simple-jar-without-resources"/>
+   
+   <macrodef name="build-simple-jar"
+      description="build a simple test jar for deployment">
+      <attribute name="name" description="the name of the test"/>
+      <sequential>
+         <mkdir dir="${build.lib}"/>
+         
+         <antcall target="_build-simple-jar">
+            <param name="jarname" value="@{name}"/>
+         </antcall>
+      </sequential>
+   </macrodef>
+</project>
\ No newline at end of file