antlets/enterpriseapp/src xbuild.xml,1.1,1.2

Michael Homeijer <[email protected]> Fri, 19 Mar 2004 09:00:27 +0000
Newsgroups gmane.comp.krysalis.metamorphosis.cvs
Message-ID <[email protected]>
Update of /cvsroot/metamorphosis/antlets/enterpriseapp/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4946/enterpriseapp/src

Modified Files:
	xbuild.xml 
Log Message:
Removed subdirectories (of wars and jars) from ear

Index: xbuild.xml
===================================================================
RCS file: /cvsroot/metamorphosis/antlets/enterpriseapp/src/xbuild.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** xbuild.xml	16 Mar 2004 10:01:01 -0000	1.1
--- xbuild.xml	19 Mar 2004 09:00:16 -0000	1.2
***************
*** 19,22 ****
--- 19,28 ----
                   includeSemanticAttribute="true" />   
  
+ 	<!-- copy the deliverables (jars and wars) of the subprojects to this 
+ 	     projects build directory to add to the ear (without subdirectories)
+ 	-->      
+ 	<copy todir="${project.build.dir}" flatten="true">
+       <fileset dir="${build.dir}" includes="*/*.jar,*/*.war"/>
+ 	</copy>
      <!-- Build the ear, using Ant task -->
      <ear destfile="${project.build.dir}/${project.name}-${project.version}.ear" 
***************
*** 27,32 ****
        <!-- The ear contains all deliverables (of type jar and war) from the subprojects.
             This should be more flexible in the future. -->
!       <fileset dir="${build.dir}" includes="*/*.jar,*/*.war"/>
      </ear>
    </target>
  
--- 33,44 ----
        <!-- The ear contains all deliverables (of type jar and war) from the subprojects.
             This should be more flexible in the future. -->
!       <fileset dir="${project.build.dir}" includes="*.jar,*.war"/>
      </ear>
+ 	<!-- delete the copied deliverables (jars and wars) of the subprojects 
+ 	     so that only the ear remains.
+ 	-->      
+     <delete>
+       <fileset dir="${project.build.dir}" includes="*.jar,*.war"/>
+     </delete>
    </target>
  



-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click