vmassol 02/01/24 08:29:38
Modified: conf/sample/build/servlet23 build-tests-tomcat-40.xml
Log:
added ugly hack to circumvent Tomcat 4.x bug 5166 (when using catalina.base). Now,
at least it should build fine. Thanks to Cactus for discovering this Tomcat 4 bug ! ;-)
Revision Changes Path
1.7 +17 -9
jakarta-cactus/conf/sample/build/servlet23/build-tests-tomcat-40.xml
Index: build-tests-tomcat-40.xml
===================================================================
RCS file:
/home/cvs/jakarta-cactus/conf/sample/build/servlet23/build-tests-tomcat-40.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build-tests-tomcat-40.xml 18 Jan 2002 22:26:39 -0000 1.6
+++ build-tests-tomcat-40.xml 24 Jan 2002 16:29:38 -0000 1.7
@@ -1,4 +1,4 @@
- <!--
+ <!--
========================================================================
Run Tomcat 4.0 tests
========================================================================
@@ -16,7 +16,7 @@
</target>
- <!--
+ <!--
========================================================================
Start Tomcat 4.0
========================================================================
@@ -31,20 +31,20 @@
<!-- This is to allow the use of -Dbuild.sysclasspath=only when
starting Ant - Meaning that all jars need to be on the
- initial classpath -->
+ initial classpath. The classpath also contains the JDK
+ tools.jar, which is needed by Jasper. -->
<pathelement path="${java.class.path}"/>
<!-- These are ignore if -Dbuild.sysclasspath=only is used -->
<fileset dir="${tomcat.home.40}">
<include name="bin/bootstrap.jar"/>
- <!--include name="server/catalina.jar"/-->
</fileset>
</classpath>
</java>
</target>
- <!--
+ <!--
========================================================================
Stop Tomcat 4.0
========================================================================
@@ -65,14 +65,13 @@
<!-- These are ignore if -Dbuild.sysclasspath=only is used -->
<fileset dir="${tomcat.home.40}">
<include name="bin/bootstrap.jar"/>
- <include name="server/catalina.jar"/>
</fileset>
</classpath>
</java>
</target>
- <!--
+ <!--
========================================================================
Display a warning message if the needed servlet engine home property
is not set
@@ -89,7 +88,7 @@
</target>
- <!--
+ <!--
========================================================================
Prepare directories and variables for running the tests
========================================================================
@@ -117,12 +116,21 @@
<fileset dir="${conf.tomcat40.dir}"/>
</copy>
- <!-- Copy the Tomcat web.xml - We need to copy this file as it has
+ <!-- Copy the Tomcat web.xml - We need to copy this file as it has
changed between Tomcat 4.x versions and one version of it doesn't
work with another version of Tomcat 4 -->
<copy file="${tomcat.home.40}/conf/web.xml"
todir="${out.tomcat40.dir}/conf"/>
<!-- Copy the war file -->
<copy file="${out.test.dir}/test.war"
tofile="${out.tomcat40.dir}/webapps/test.war"/>
+
+ <!-- WARNING: Ugly hack. Tomcat 4.1dev has a bug when using
+ CATALINA_BASE : TC looks for the shared/ directory in
+ CATALINA_BASE instead of CATALINA_HOME. Thus we need to copy the
+ shared/ directory while waiting for a fix. Check bug id 5166 :
+ http://nagoya.apache.org/bugzilla/show_bug.cgi?id=5166 -->
+ <copy todir="${out.tomcat40.dir}/shared">
+ <fileset dir="${tomcat.home.40}/shared"/>
+ </copy>
</target>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
