dion 02/05/01 08:47:58
Modified: src/templates/build build-j2ee.xml
Log:
Added war task, calls to compile and jar-resources, and added webxml as a requirement
Revision Changes Path
1.3 +9 -4 jakarta-turbine-maven/src/templates/build/build-j2ee.xml
Index: build-j2ee.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/build-j2ee.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build-j2ee.xml 1 May 2002 15:00:22 -0000 1.2
+++ build-j2ee.xml 1 May 2002 15:47:58 -0000 1.3
@@ -16,6 +16,7 @@
<and>
<available file="${maven.war.src}" type="dir"/>
<available file="${maven.war.content}" type="dir"/>
+ <available file="${maven.war.webxml}" type="file"/>
</and>
</condition>
<!-- set maven.war.preprocessing if the user has set both properties,
@@ -67,11 +68,13 @@
</target>
<target name="war-build" if="maven.war.ready">
+ <ant antfile="${maven.home}/build-maven.xml" target="compile" />
+ <ant antfile="${maven.home}/build-maven.xml" target="jar-resources" />
<echo>building for ${maven.war.name}</echo>
- <!--
<war warfile="${maven.build.war}/${maven.war.name}.war"
+ webxml="${maven.war.webxml}">
<fileset dir="${maven.war.content}"/>
- <fileset dir="${maven.war.templates}"/> ???
+ <!--<fileset dir="${maven.war.templates}"/> -->
<lib dir="${lib.repo}">
<include name="${maven.war.lib.includes}"/>
<exclude name="${maven.war.lib.excludes}"/>
@@ -80,7 +83,7 @@
<include name="${maven.war.classes.includes}" />
<exclude name="${maven.war.classes.excludes}" />
</classes>
- -->
+ </war>
</target>
<target name="war-error" unless="maven.war.ready">
@@ -88,9 +91,11 @@
<echo>
One of the required properties for maven:war was not provided.
Please ensure that the following directories exist:
- ------------------------------------------------------------------------
${maven.war.src}
${maven.war.content}
+ ------------------------------------------------------------------------
+ and the following files:
+ ${maven.war.webxml}
------------------------------------------------------------------------
</echo>
</target>
