You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by jr...@apache.org on 2003/01/24 12:34:30 UTC
cvs commit: jakarta-cactus/petals/ant/src/scripts/share build-tests-tomcat4x.xml
jruaux 2003/01/24 03:34:29
Modified: petals/ant/src/scripts/share build-tests-tomcat4x.xml
Log:
Merged with current Eclipse plugin script
Revision Changes Path
1.2 +60 -10 jakarta-cactus/petals/ant/src/scripts/share/build-tests-tomcat4x.xml
Index: build-tests-tomcat4x.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/petals/ant/src/scripts/share/build-tests-tomcat4x.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build-tests-tomcat4x.xml 23 Jan 2003 14:09:23 -0000 1.1
+++ build-tests-tomcat4x.xml 24 Jan 2003 11:34:29 -0000 1.2
@@ -29,8 +29,31 @@
Start Tomcat 4.x
========================================================================
-->
- <target name="cactus.start.tomcat4x" description="Start Tomcat 4.x"
- depends="cactus.check.tomcat4x" if="cactus.home.tomcat4x">
+ <target name="start.tomcat.40" depends="cactus.check.tomcat4x, cactus.checkwindows, cactus.start.tomcat4x.windows, cactus.start.tomcat4x.other" if="cactus.home.tomcat4x" description="Start Tomcat 4.x"/>
+
+ <target name="cactus.start.tomcat4x.windows" if="isWindows">
+
+ <java jvm='javaw' classname="org.apache.catalina.startup.Bootstrap" fork="yes">
+
+ <jvmarg value="-Dcatalina.home=${cactus.home.tomcat4x}"/>
+ <jvmarg value="-Dcatalina.base=${cactus.target.tomcat4x}"/>
+
+ <arg value="start"/>
+ <classpath>
+
+ <!-- These are ignored if -Dbuild.sysclasspath=only is used -->
+ <pathelement path="${java.home}/../lib/tools.jar"/>
+ <fileset dir="${cactus.home.tomcat4x}">
+ <include name="bin/bootstrap.jar"/>
+ </fileset>
+
+ </classpath>
+ </java>
+
+ </target>
+
+
+ <target name="cactus.start.tomcat4x.other" unless="isWindows">
<java classname="org.apache.catalina.startup.Bootstrap" fork="yes">
@@ -56,25 +79,51 @@
Stop Tomcat 4.x
========================================================================
-->
- <target name="cactus.stop.tomcat4x" description="Stop Tomcat 4.x"
- depends="cactus.check.tomcat4x" if="cactus.home.tomcat4x">
+ <target name="stop.tomcat.40" depends="cactus.check.tomcat4x, cactus.checkwindows, cactus.stop.tomcat4x.windows, cactus.stop.tomcat4x.other" if="cactus.home.tomcat4x" description="Stop Tomcat 4.x"/>
+
+ <target name="cactus.stop.tomcat4x.windows" if="isWindows">
+
+ <java jvm='javaw' classname="org.apache.catalina.startup.Bootstrap" fork="yes">
- <java classname="org.apache.catalina.startup.Bootstrap" fork="yes">
<jvmarg value="-Dcatalina.home=${cactus.home.tomcat4x}"/>
<jvmarg value="-Dcatalina.base=${cactus.target.tomcat4x}"/>
+
<arg value="stop"/>
+ <classpath>
+ <!-- These are ignored if -Dbuild.sysclasspath=only is used -->
+ <fileset dir="${cactus.home.tomcat4x}">
+ <include name="bin/bootstrap.jar"/>
+ </fileset>
+
+ </classpath>
+ </java>
+
+ </target>
+
+
+ <target name="cactus.stop.tomcat4x.other" unless="isWindows">
+
+ <java classname="org.apache.catalina.startup.Bootstrap" fork="yes">
+
+ <jvmarg value="-Dcatalina.home=${cactus.home.tomcat4x}"/>
+ <jvmarg value="-Dcatalina.base=${cactus.target.tomcat4x}"/>
+
+ <arg value="stop"/>
<classpath>
- <!-- These are ignored if -Dbuild.sysclasspath=only is used
- (this is the case for Gump builds) -->
+
+ <!-- These are ignored if -Dbuild.sysclasspath=only is used -->
<fileset dir="${cactus.home.tomcat4x}">
<include name="bin/bootstrap.jar"/>
</fileset>
+
</classpath>
</java>
</target>
+
+
<!--
========================================================================
Display a warning message if the needed servlet engine home property
@@ -101,12 +150,13 @@
description="Deploy the webapp on Tomcat 4.x">
<!-- Copy the webapp -->
- <copy todir="${cactus.target.tomcat4x}/webapps/test">
+ <copy todir="${cactus.target.tomcat4x}/webapps/${context.path}">
<fileset dir="${cactus.target.dir}/test"/>
</copy>
</target>
-
+
+
<!--
========================================================================
Set up a valid Tomcat 4.x directory structure in the
@@ -127,7 +177,7 @@
<!-- Remove the auto deployed webapp so that it is redeployed every
time -->
- <delete dir="${cactus.target.tomcat4x}/webapps/test"/>
+ <delete dir="${cactus.target.tomcat4x}/webapps/${context.path}"/>
<copy todir="${cactus.target.tomcat4x}/conf" filtering="on">
<fileset dir="${conf.tomcat4x.dir}"/>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>