jruaux 2003/01/15 01:22:38
Modified: Eclipse-Plugin/ant build-war.xml
Log:
Included user Web files directory
Revision Changes Path
1.4 +30 -1 jakarta-cactus/Eclipse-Plugin/ant/build-war.xml
Index: build-war.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/Eclipse-Plugin/ant/build-war.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build-war.xml 3 Jan 2003 15:49:19 -0000 1.3
+++ build-war.xml 15 Jan 2003 09:22:38 -0000 1.4
@@ -100,8 +100,9 @@
Create a Cactus test war file for the sample application.
========================================================================
-->
+ <target name="testwar" depends="user.testwar, default.testwar"/>
- <target name="testwar">
+ <target name="user.testwar" if="user.webfiles.dir">
<!-- Make sure the directory for the war exist -->
<mkdir dir="${target.test.dir}"/>
@@ -125,7 +126,35 @@
<lib dir="${jars.dir}"/>
<fileset dir="${webfiles.dir}"/>
+ <fileset dir="${user.webfiles.dir}"/>
+ </war>
+ </target>
+
+ <target name="default.testwar" unless="user.webfiles.dir">
+
+ <!-- Make sure the directory for the war exist -->
+ <mkdir dir="${target.test.dir}"/>
+
+ <!-- Create the war file -->
+ <war warfile="${war.path}"
+ webxml="${webxml.path}">
+
+ <classes dir="${classes.dir}"/>
+
+ <!-- log_server.properties need to be in the server classpath -->
+ <classes dir="${classes.dir}">
+ <include name="log4j.properties"/>
+ </classes>
+
+ <!-- We need to copy all dependent jar in the war. This is
+ because if we just put these jars in the global classpath for
+ the Servlet engine, the Cactus jar might not be able to load
+ the test case class as it may be loadable only by the war
+ classloader -->
+ <lib dir="${jars.dir}"/>
+
+ <fileset dir="${webfiles.dir}"/>
</war>
</target>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
