[jboss-cvs] JBossAS SVN: r63114 - trunk/ejb3/imports.

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

Author: wolfc
Date: 2007-05-17 09:29:42 -0400 (Thu, 17 May 2007)
New Revision: 63114

Modified:
   trunk/ejb3/imports/build-simple.xml
Log:
Build simple with or without resources

Modified: trunk/ejb3/imports/build-simple.xml
===================================================================
--- trunk/ejb3/imports/build-simple.xml	2007-05-17 06:19:55 UTC (rev 63113)
+++ trunk/ejb3/imports/build-simple.xml	2007-05-17 13:29:42 UTC (rev 63114)
@@ -1,17 +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}"/>
          
-         <jar jarfile="${build.lib}/@{name}.jar">
-            <fileset dir="${build.classes}">
-               <include name="org/jboss/ejb3/test/@{name}/*.class"/>
-            </fileset>
-            <fileset dir="${resources}/test/@{name}" includes="META-INF/*"/>
-         </jar>
+         <antcall target="_build-simple-jar">
+            <param name="jarname" value="@{name}"/>
+         </antcall>
       </sequential>
    </macrodef>
 </project>
\ No newline at end of file