From: Adrian B. <ej...@us...> - 2004-04-23 01:45:22
|
User: ejort Date: 04/04/22 18:45:16 Modified: . build.xml Log: Make the webservice build incremental by building the sar as unpacked in the first place Revision Changes Path 1.4 +15 -13 webservice/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/webservice/build.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- build.xml 22 Apr 2004 23:37:38 -0000 1.3 +++ build.xml 23 Apr 2004 01:45:16 -0000 1.4 @@ -16,7 +16,7 @@ <!-- --> <!-- ====================================================================== --> -<!-- $Id: build.xml,v 1.3 2004/04/22 23:37:38 tdiesler Exp $ --> +<!-- $Id: build.xml,v 1.4 2004/04/23 01:45:16 ejort Exp $ --> <project default="main" name="JBoss/Webservice"> @@ -128,7 +128,7 @@ <!-- | Build all jar files. --> - <target name="module-jars" depends="compile"> + <target name="module-jars"> <!-- Build jboss-ws4ee.jar --> <jar jarfile="${build.lib}/jboss-ws4ee.jar"> @@ -146,20 +146,22 @@ </jar> <!-- Build jboss-ws4ee.war --> - <war jarfile="${build.lib}/jboss-ws4ee.war" webxml="${module.source}/webapp/WEB-INF/web.xml"> + <mkdir dir="${build.lib}/jboss-ws4ee.war"/> + <copy todir="${build.lib}/jboss-ws4ee.war" filtering="no"> <fileset dir="${module.source}/webapp"> - <exclude name="WEB-INF/web.xml"/> + <include name="**/*"/> </fileset> - <classes dir="${build.classes}"> + <fileset dir="${build.classes}"> <include name="**/webservice/*Servlet.class"/> - </classes> - </war> + </fileset> + </copy> <!-- Build jboss-ws4ee.sar --> - <jar jarfile="${build.lib}/jboss-ws4ee.sar"> + <mkdir dir="${build.lib}/jboss-ws4ee.sar"/> + <copy todir="${build.lib}/jboss-ws4ee.sar" filtering="no"> <fileset dir="${build.lib}"> <include name="jboss-ws4ee.jar"/> - <include name="jboss-ws4ee.war"/> + <include name="jboss-ws4ee.war/**"/> </fileset> <fileset dir="${apache.axis.lib}"> <exclude name="axis-ant.jar"/> @@ -168,10 +170,10 @@ <include name="commons-discovery.jar"/> <include name="commons-logging.jar"/> </fileset> - <metainf dir="${source.resources}/META-INF"> - <include name="*.xml"/> - </metainf> - </jar> + <fileset dir="${source.resources}"> + <include name="META-INF/*.xml"/> + </fileset> + </copy> </target> </project> |