jruaux 2003/01/31 02:57:42
Modified: petals/eclipse/src/scripts build-war.xml
Log:
Removed cactification of the war
Revision Changes Path
1.2 +2 -33 jakarta-cactus/petals/eclipse/src/scripts/build-war.xml
Index: build-war.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/petals/eclipse/src/scripts/build-war.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build-war.xml 30 Jan 2003 15:37:09 -0000 1.1
+++ build-war.xml 31 Jan 2003 10:57:42 -0000 1.2
@@ -100,38 +100,7 @@
Create a Cactus test war file for the sample application.
========================================================================
-->
- <target name="testwar" depends="user.testwar, default.testwar"/>
-
- <target name="user.testwar" if="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}"/>
- <fileset dir="${user.webfiles.dir}"/>
- </war>
-
- </target>
-
- <target name="default.testwar" unless="user.webfiles.dir">
+ <target name="testwar">
<!-- Make sure the directory for the war exist -->
<mkdir dir="${target.test.dir}"/>
@@ -154,7 +123,7 @@
classloader -->
<lib dir="${jars.dir}"/>
- <fileset dir="${webfiles.dir}"/>
+ <fileset dir="${webfiles.dir}" excludes="WEB-INF/"/>
</war>
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
