jruaux 2002/10/30 07:58:10
Modified: Eclipse-Plugin/ant/build build-tests-orion-15.xml
build-tests-weblogic-61.xml
build-tests-orion-14.xml build-tests-resin-20.xml
build-tests-weblogic-70.xml build.xml
build-tests-resin-13.xml build-tests-tomcat-40.xml
build-tests-orion-16.xml
Log:
Cast the scripts to the 'mask' model (e.g. tomcat.home.40 becomes home.tomcat.40)
Revision Changes Path
1.3 +9 -9 jakarta-cactus/Eclipse-Plugin/ant/build/build-tests-orion-15.xml
Index: build-tests-orion-15.xml
===================================================================
RCS file:
/home/cvs/jakarta-cactus/Eclipse-Plugin/ant/build/build-tests-orion-15.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build-tests-orion-15.xml 29 Oct 2002 17:12:28 -0000 1.2
+++ build-tests-orion-15.xml 30 Oct 2002 15:58:10 -0000 1.3
@@ -3,8 +3,8 @@
Run Orion 1.5 tests
========================================================================
-->
- <target name="test.orion.15" depends="prepare.test.orion.15"
- if="orion.home.15" description="Run tests on Orion 1.5">
+ <target name="test.orion.15" depends="prepare.orion.15"
+ if="home.orion.15" description="Run tests on Orion 1.5">
<!-- Start the servlet engine, wait for it to be started, run the
unit tests, stop the servlet engine, wait for it to be stopped.
@@ -29,7 +29,7 @@
<arg value="-config"/>
<arg value="${target.orion15.dir}/conf/server.xml"/>
<classpath>
- <fileset dir="${orion.home.15}">
+ <fileset dir="${home.orion.15}">
<include name="*.jar"/>
</fileset>
</classpath>
@@ -51,7 +51,7 @@
<arg value="password"/>
<arg value="-shutdown"/>
<classpath>
- <fileset dir="${orion.home.15}">
+ <fileset dir="${home.orion.15}">
<include name="*.jar"/>
</fileset>
</classpath>
@@ -65,11 +65,11 @@
is not set
========================================================================
-->
- <target name="check.test.orion.15" unless="orion.home.15">
+ <target name="check.test.orion.15" unless="home.orion.15">
<echo message=""/>
<echo message="******************************************************"/>
- <echo message="WARNING : The 'orion.home.15' property has not been"/>
+ <echo message="WARNING : The 'home.orion.15' property has not been"/>
<echo message="set. No test will be run on that servlet engine."/>
<echo message="******************************************************"/>
<echo message=""/>
@@ -81,10 +81,10 @@
Prepare directories and variables for running the tests
========================================================================
-->
- <target name="prepare.test.orion.15"
- depends="check.test.orion.15" if="orion.home.15">
+ <target name="prepare.orion.15"
+ depends="check.test.orion.15,init" if="home.orion.15">
- <echo message="orion.home.15 = ${orion.home.15}"/>
+ <echo message="home.orion.15 = ${home.orion.15}"/>
<property name="target.orion15.dir" value="${target.test.dir}/orion15"/>
<property name="conf.orion15.dir" value="${conf.test.dir}/orion15"/>
1.3 +13 -13
jakarta-cactus/Eclipse-Plugin/ant/build/build-tests-weblogic-61.xml
Index: build-tests-weblogic-61.xml
===================================================================
RCS file:
/home/cvs/jakarta-cactus/Eclipse-Plugin/ant/build/build-tests-weblogic-61.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build-tests-weblogic-61.xml 29 Oct 2002 17:12:28 -0000 1.2
+++ build-tests-weblogic-61.xml 30 Oct 2002 15:58:10 -0000 1.3
@@ -3,8 +3,8 @@
Run WebLogic 6.1 tests
========================================================================
-->
- <target name="test.weblogic.61" depends="prepare.test.weblogic.61"
- if="weblogic.home.61" description="Run tests on WebLogic 6.1">
+ <target name="test.weblogic.61" depends="prepare.weblogic.61"
+ if="home.weblogic.61" description="Run tests on WebLogic 6.1">
<!-- Start the servlet engine, wait for it to be started, run the
unit tests, stop the servlet engine, wait for it to be stopped.
@@ -29,8 +29,8 @@
dir="${target.weblogic61.dir}">
<classpath>
- <pathelement
location="${weblogic.home.61}/wlserver6.1/lib/weblogic.sp.jar"/>
- <pathelement
location="${weblogic.home.61}/wlserver6.1/lib/weblogic.jar"/>
+ <pathelement
location="${home.weblogic.61}/wlserver6.1/lib/weblogic.sp.jar"/>
+ <pathelement
location="${home.weblogic.61}/wlserver6.1/lib/weblogic.jar"/>
<!-- Some hack: I still don't understand why I need these jars
to make the cactus clovered jar work. It needs to be
@@ -45,11 +45,11 @@
<jvmarg value="-hotspot"/>
<jvmarg value="-ms64m"/>
<jvmarg value="-mx64m"/>
- <jvmarg
value="-Djava.library.path=${java.library.path};${weblogic.home.61}/wlserver6.1/bin"/>
+ <jvmarg
value="-Djava.library.path=${java.library.path};${home.weblogic.61}/wlserver6.1/bin"/>
<jvmarg value="-Dweblogic.RootDirectory=."/>
<jvmarg value="-Dweblogic.Domain=testdomain"/>
<jvmarg value="-Dweblogic.Name=testserver"/>
- <jvmarg value="-Dbea.home=${weblogic.home.61}"/>
+ <jvmarg value="-Dbea.home=${home.weblogic.61}"/>
<jvmarg value="-Dweblogic.management.password=password"/>
<jvmarg value="-Djava.security.policy==./lib/weblogic.policy"/>
@@ -67,8 +67,8 @@
<java classname="weblogic.Admin" fork="yes">
<classpath>
- <pathelement
location="${weblogic.home.61}/wlserver6.1/lib/weblogic.sp.jar"/>
- <pathelement
location="${weblogic.home.61}/wlserver6.1/lib/weblogic.jar"/>
+ <pathelement
location="${home.weblogic.61}/wlserver6.1/lib/weblogic.sp.jar"/>
+ <pathelement
location="${home.weblogic.61}/wlserver6.1/lib/weblogic.jar"/>
</classpath>
<arg line="-url t3://localhost:${test.port}"/>
@@ -86,11 +86,11 @@
is not set
========================================================================
-->
- <target name="check.test.weblogic.61" unless="weblogic.home.61">
+ <target name="check.test.weblogic.61" unless="home.weblogic.61">
<echo message=""/>
<echo message="******************************************************"/>
- <echo message="WARNING : The 'weblogic.home.61' property has not been"/>
+ <echo message="WARNING : The 'home.weblogic.61' property has not been"/>
<echo message="set. No test will be run on that servlet engine."/>
<echo message="******************************************************"/>
<echo message=""/>
@@ -102,10 +102,10 @@
Prepare directories and variables for running the tests
========================================================================
-->
- <target name="prepare.test.weblogic.61"
- depends="check.test.weblogic.61" if="weblogic.home.61">
+ <target name="prepare.weblogic.61"
+ depends="check.test.weblogic.61,init" if="home.weblogic.61">
- <echo message="weblogic.home.61 = ${weblogic.home.61}"/>
+ <echo message="home.weblogic.61 = ${home.weblogic.61}"/>
<property name="target.weblogic61.dir"
value="${target.test.dir}/weblogic61"/>
1.3 +9 -9 jakarta-cactus/Eclipse-Plugin/ant/build/build-tests-orion-14.xml
Index: build-tests-orion-14.xml
===================================================================
RCS file:
/home/cvs/jakarta-cactus/Eclipse-Plugin/ant/build/build-tests-orion-14.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build-tests-orion-14.xml 29 Oct 2002 17:12:28 -0000 1.2
+++ build-tests-orion-14.xml 30 Oct 2002 15:58:10 -0000 1.3
@@ -3,8 +3,8 @@
Run Orion 1.4 tests
========================================================================
-->
- <target name="test.orion.14" depends="prepare.test.orion.14"
- if="orion.home.14" description="Run tests on Orion 1.4">
+ <target name="test.orion.14" depends="prepare.orion.14"
+ if="home.orion.14" description="Run tests on Orion 1.4">
<!-- Start the servlet engine, wait for it to be started, run the
unit tests, stop the servlet engine, wait for it to be stopped.
@@ -29,7 +29,7 @@
<arg value="-config"/>
<arg value="${target.orion14.dir}/conf/server.xml"/>
<classpath>
- <fileset dir="${orion.home.14}">
+ <fileset dir="${home.orion.14}">
<include name="*.jar"/>
</fileset>
</classpath>
@@ -50,7 +50,7 @@
<arg value="password"/>
<arg value="-shutdown"/>
<classpath>
- <fileset dir="${orion.home.14}">
+ <fileset dir="${home.orion.14}">
<include name="*.jar"/>
</fileset>
</classpath>
@@ -64,11 +64,11 @@
is not set
========================================================================
-->
- <target name="check.test.orion.14" unless="orion.home.14">
+ <target name="check.test.orion.14" unless="home.orion.14">
<echo message=""/>
<echo message="******************************************************"/>
- <echo message="WARNING : The 'orion.home.14' property has not been"/>
+ <echo message="WARNING : The 'home.orion.14' property has not been"/>
<echo message="set. No test will be run on that servlet engine."/>
<echo message="******************************************************"/>
<echo message=""/>
@@ -80,10 +80,10 @@
Prepare directories and variables for running the tests
========================================================================
-->
- <target name="prepare.test.orion.14"
- depends="check.test.orion.14" if="orion.home.14">
+ <target name="prepare.orion.14"
+ depends="check.test.orion.14,init" if="home.orion.14">
- <echo message="orion.home.14 = ${orion.home.14}"/>
+ <echo message="home.orion.14 = ${home.orion.14}"/>
<property name="target.orion14.dir" value="${target.test.dir}/orion14"/>
<property name="conf.orion14.dir" value="${conf.test.dir}/orion14"/>
1.3 +10 -10 jakarta-cactus/Eclipse-Plugin/ant/build/build-tests-resin-20.xml
Index: build-tests-resin-20.xml
===================================================================
RCS file:
/home/cvs/jakarta-cactus/Eclipse-Plugin/ant/build/build-tests-resin-20.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build-tests-resin-20.xml 29 Oct 2002 17:12:28 -0000 1.2
+++ build-tests-resin-20.xml 30 Oct 2002 15:58:10 -0000 1.3
@@ -3,8 +3,8 @@
Run Resin 2.0 tests
========================================================================
-->
- <target name="test.resin.20" depends="prepare.test.resin.20"
- if="resin.home.20" description="Run tests on Resin 2.0">
+ <target name="test.resin.20" depends="prepare.resin.20"
+ if="home.resin.20" description="Run tests on Resin 2.0">
<!-- Start the servlet engine, wait for it to be started, run the
unit tests, stop the servlet engine, wait for it to be stopped.
@@ -32,13 +32,13 @@
<arg value="-conf"/>
<arg value="resin.conf"/>
- <!-- Needed so that Resin use the resin.home.20 variable as it's
+ <!-- Needed so that Resin use the home.resin.20 variable as it's
root directory for resolving file paths -->
<jvmarg value="-Dresin.home=${target.resin20.dir}"/>
<classpath>
<pathelement location="${cactus.ant.jar}"/>
- <fileset dir="${resin.home.20}/lib">
+ <fileset dir="${home.resin.20}/lib">
<include name="*.jar"/>
</fileset>
</classpath>
@@ -60,7 +60,7 @@
<classpath>
<pathelement location="${cactus.ant.jar}"/>
- <fileset dir="${resin.home.20}/lib">
+ <fileset dir="${home.resin.20}/lib">
<include name="*.jar"/>
</fileset>
</classpath>
@@ -75,11 +75,11 @@
is not set
========================================================================
-->
- <target name="check.test.resin.20" unless="resin.home.20">
+ <target name="check.test.resin.20" unless="home.resin.20">
<echo message=""/>
<echo message="******************************************************"/>
- <echo message="WARNING : The 'resin.home.20' property has not been"/>
+ <echo message="WARNING : The 'home.resin.20' property has not been"/>
<echo message="set. No test will be run on that servlet engine."/>
<echo message="******************************************************"/>
<echo message=""/>
@@ -91,10 +91,10 @@
Prepare directories and variables for running the tests
========================================================================
-->
- <target name="prepare.test.resin.20"
- depends="check.test.resin.20" if="resin.home.20">
+ <target name="prepare.resin.20"
+ depends="check.test.resin.20,init" if="home.resin.20">
- <echo message="resin.home.20 = ${resin.home.20}"/>
+ <echo message="home.resin.20 = ${home.resin.20}"/>
<property name="target.resin20.dir" value="${target.test.dir}/resin20"/>
<property name="conf.resin20.dir" value="${conf.test.dir}/resin20"/>
1.3 +19 -27
jakarta-cactus/Eclipse-Plugin/ant/build/build-tests-weblogic-70.xml
Index: build-tests-weblogic-70.xml
===================================================================
RCS file:
/home/cvs/jakarta-cactus/Eclipse-Plugin/ant/build/build-tests-weblogic-70.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build-tests-weblogic-70.xml 29 Oct 2002 17:12:28 -0000 1.2
+++ build-tests-weblogic-70.xml 30 Oct 2002 15:58:10 -0000 1.3
@@ -3,8 +3,8 @@
Run WebLogic 7.0 tests
========================================================================
-->
- <target name="test.weblogic.70" depends="prepare.test.weblogic.70"
- if="weblogic.home.70" description="Run tests on WebLogic 7.0">
+ <target name="test.weblogic.70" depends="prepare.weblogic.70"
+ if="home.weblogic.70" description="Run tests on WebLogic 7.0">
<!-- Start the servlet engine, wait for it to be started, run the
unit tests, stop the servlet engine, wait for it to be stopped.
@@ -24,30 +24,22 @@
========================================================================
-->
<target name="start.weblogic.70">
-
+ <property name="target.weblogic70.dir"
+ value="${target.test.dir}/weblogic70"/>
<java classname="weblogic.Server" fork="yes"
dir="${target.weblogic70.dir}/testdomain">
<classpath>
- <pathelement
location="${weblogic.home.70}/weblogic700/server/lib/weblogic.sp.jar"/>
- <pathelement
location="${weblogic.home.70}/weblogic700/server/lib/weblogic.jar"/>
-
- <!-- Some hack: I still don't understand why I need these jars
- to make the cactus clovered jar work. It needs to be
- removed as we don't want the mention of these jars in the
- sample script that are packaged in the Cactus
- distribution ! You can safely remove this if you don't use
- Clover -->
- <pathelement location="${clover.jar}"/>
- <pathelement location="${junit.jar}"/>
+ <pathelement
location="${home.weblogic.70}/weblogic700/server/lib/weblogic.sp.jar"/>
+ <pathelement
location="${home.weblogic.70}/weblogic700/server/lib/weblogic.jar"/>
</classpath>
<jvmarg value="-hotspot"/>
<jvmarg value="-ms64m"/>
<jvmarg value="-mx64m"/>
- <jvmarg
value="-Djava.library.path=${java.library.path};${weblogic.home.70}/weblogic700/server/bin"/>
+ <jvmarg
value="-Djava.library.path=${java.library.path};${home.weblogic.70}/weblogic700/server/bin"/>
<jvmarg value="-Dweblogic.Name=testserver"/>
- <jvmarg value="-Dbea.home=${weblogic.home.70}"/>
+ <jvmarg value="-Dbea.home=${home.weblogic.70}"/>
<jvmarg value="-Dweblogic.management.username=system"/>
<jvmarg value="-Dweblogic.management.password=password"/>
<jvmarg value="-Djava.security.policy==./server/lib/weblogic.policy"/>
@@ -66,8 +58,8 @@
<java classname="weblogic.Admin" fork="yes">
<classpath>
- <pathelement
location="${weblogic.home.70}/weblogic700/server/lib/weblogic.sp.jar"/>
- <pathelement
location="${weblogic.home.70}/weblogic700/server/lib/weblogic.jar"/>
+ <pathelement
location="${home.weblogic.70}/weblogic700/server/lib/weblogic.sp.jar"/>
+ <pathelement
location="${home.weblogic.70}/weblogic700/server/lib/weblogic.jar"/>
</classpath>
<arg line="-url t3://localhost:${test.port}"/>
@@ -85,11 +77,11 @@
is not set
========================================================================
-->
- <target name="check.test.weblogic.70" unless="weblogic.home.70">
+ <target name="check.test.weblogic.70" unless="home.weblogic.70">
<echo message=""/>
<echo message="******************************************************"/>
- <echo message="WARNING : The 'weblogic.home.70' property has not been"/>
+ <echo message="WARNING : The 'home.weblogic.70' property has not been"/>
<echo message="set. No test will be run on that servlet engine."/>
<echo message="******************************************************"/>
<echo message=""/>
@@ -101,10 +93,10 @@
Prepare directories and variables for running the tests
========================================================================
-->
- <target name="prepare.test.weblogic.70"
- depends="check.test.weblogic.70" if="weblogic.home.70">
+ <target name="prepare.weblogic.70"
+ depends="check.test.weblogic.70,init" if="home.weblogic.70">
- <echo message="weblogic.home.70 = ${weblogic.home.70}"/>
+ <echo message="home.weblogic.70 = ${home.weblogic.70}"/>
<property name="target.weblogic70.dir"
value="${target.test.dir}/weblogic70"/>
@@ -130,19 +122,19 @@
</copy>
<!-- Copy the war file -->
- <copy file="${target.test.dir}/test.war"
- todir="${target.weblogic70.dir}/testdomain/applications"/>
+ <copy file="${war.path}"
+
tofile="${target.weblogic70.dir}/testdomain/applications/${context.path}.war"/>
<!-- Update the war to include the proprietary weblogic.xml config
file. -->
<!-- Hack: Make sure weblogic.xml is always newer than the war so that
the later is always updated. Waiting for an Ant bug fix -->
- <touch file="${target.weblogic70.dir}/testdomain/applications/test.war"
+ <touch
file="${target.weblogic70.dir}/testdomain/applications/${context.path}.war"
datetime="06/28/2000 2:02 pm"/>
<war update="true"
- warfile="${target.weblogic70.dir}/testdomain/applications/test.war">
+
warfile="${target.weblogic70.dir}/testdomain/applications/${context.path}.war">
<webinf dir="${conf.weblogic70.dir}">
<include name="weblogic.xml"/>
1.3 +2 -2 jakarta-cactus/Eclipse-Plugin/ant/build/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/Eclipse-Plugin/ant/build/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 29 Oct 2002 17:12:28 -0000 1.2
+++ build.xml 30 Oct 2002 15:58:10 -0000 1.3
@@ -71,7 +71,7 @@
target is "dist"
=============================================================================
-->
-<project name="Cactus Servlet Sample for Servlet API 2.3" default="dist"
+<project name="Cactus Servlet Sample for Servlet API 2.3" default="init"
basedir="..">
&build-share;
@@ -87,7 +87,7 @@
</target>
<target name="prepare.all"
- depends="init, prepare.test.tomcat.40"
+ depends="init, prepare.tomcat.40"
description="Prepare tests on all defined containers">
</target>
1.3 +10 -10 jakarta-cactus/Eclipse-Plugin/ant/build/build-tests-resin-13.xml
Index: build-tests-resin-13.xml
===================================================================
RCS file:
/home/cvs/jakarta-cactus/Eclipse-Plugin/ant/build/build-tests-resin-13.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build-tests-resin-13.xml 29 Oct 2002 17:12:28 -0000 1.2
+++ build-tests-resin-13.xml 30 Oct 2002 15:58:10 -0000 1.3
@@ -3,8 +3,8 @@
Run Resin 1.3 tests
========================================================================
-->
- <target name="test.resin.13" depends="prepare.test.resin.13"
- if="resin.home.13" description="Run tests on Resin 1.3">
+ <target name="test.resin.13" depends="prepare.resin.13"
+ if="home.resin.13" description="Run tests on Resin 1.3">
<!-- Start the servlet engine, wait for it to be started, run the
unit tests, stop the servlet engine, wait for it to be stopped.
@@ -32,13 +32,13 @@
<arg value="-conf"/>
<arg value="resin.conf"/>
- <!-- Needed so that Resin use the resin.home.13 variable as it's
+ <!-- Needed so that Resin use the home.resin.13 variable as it's
root directory for resolving file paths -->
<jvmarg value="-Dresin.home=${target.resin13.dir}"/>
<classpath>
<pathelement location="${cactus.ant.jar}"/>
- <fileset dir="${resin.home.13}/lib">
+ <fileset dir="${home.resin.13}/lib">
<include name="*.jar"/>
</fileset>
</classpath>
@@ -60,7 +60,7 @@
<classpath>
<pathelement location="${cactus.ant.jar}"/>
- <fileset dir="${resin.home.13}/lib">
+ <fileset dir="${home.resin.13}/lib">
<include name="*.jar"/>
</fileset>
</classpath>
@@ -75,11 +75,11 @@
is not set
========================================================================
-->
- <target name="check.test.resin.13" unless="resin.home.13">
+ <target name="check.test.resin.13" unless="home.resin.13">
<echo message=""/>
<echo message="******************************************************"/>
- <echo message="WARNING : The 'resin.home.13' property has not been "/>
+ <echo message="WARNING : The 'home.resin.13' property has not been "/>
<echo message="set. No test will be run on that servlet engine."/>
<echo message="******************************************************"/>
<echo message=""/>
@@ -91,10 +91,10 @@
Prepare directories and variables for running the tests
========================================================================
-->
- <target name="prepare.test.resin.13"
- depends="check.test.resin.13" if="resin.home.13">
+ <target name="prepare.resin.13"
+ depends="check.test.resin.13,init" if="home.resin.13">
- <echo message="resin.home.13 = ${resin.home.13}"/>
+ <echo message="home.resin.13 = ${home.resin.13}"/>
<property name="target.resin13.dir" value="${target.test.dir}/resin13"/>
<property name="conf.resin13.dir" value="${conf.test.dir}/resin13"/>
1.3 +12 -12
jakarta-cactus/Eclipse-Plugin/ant/build/build-tests-tomcat-40.xml
Index: build-tests-tomcat-40.xml
===================================================================
RCS file:
/home/cvs/jakarta-cactus/Eclipse-Plugin/ant/build/build-tests-tomcat-40.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build-tests-tomcat-40.xml 29 Oct 2002 17:12:28 -0000 1.2
+++ build-tests-tomcat-40.xml 30 Oct 2002 15:58:10 -0000 1.3
@@ -3,8 +3,8 @@
Run Tomcat 4.0 tests
========================================================================
-->
- <target name="test.tomcat.40" depends="prepare.test.tomcat.40"
- if="tomcat.home.40" description="Run tests on Tomcat 4.0">
+ <target name="test.tomcat.40" depends="prepare.tomcat.40"
+ if="home.tomcat.40" description="Run tests on Tomcat 4.0">
<!-- Start the servlet engine, wait for it to be started, run the
unit tests, stop the servlet engine, wait for it to be stopped.
@@ -28,7 +28,7 @@
value="${target.test.dir}/tomcat40"/>
<java classname="org.apache.catalina.startup.Bootstrap" fork="yes">
- <jvmarg value="-Dcatalina.home=${tomcat.home.40}"/>
+ <jvmarg value="-Dcatalina.home=${home.tomcat.40}"/>
<jvmarg value="-Dcatalina.base=${target.tomcat40.dir}"/>
<arg value="start"/>
@@ -36,7 +36,7 @@
<!-- These are ignored if -Dbuild.sysclasspath=only is used -->
<pathelement path="${java.home}/../lib/tools.jar"/>
- <fileset dir="${tomcat.home.40}">
+ <fileset dir="${home.tomcat.40}">
<include name="bin/bootstrap.jar"/>
</fileset>
@@ -59,7 +59,7 @@
<property name="target.tomcat40.dir"
value="${target.test.dir}/tomcat40"/>
<java classname="org.apache.catalina.startup.Bootstrap" fork="yes">
- <jvmarg value="-Dcatalina.home=${tomcat.home.40}"/>
+ <jvmarg value="-Dcatalina.home=${home.tomcat.40}"/>
<jvmarg value="-Dcatalina.base=${target.tomcat40.dir}"/>
<arg value="stop"/>
<classpath>
@@ -70,7 +70,7 @@
<pathelement path="${java.class.path}"/>
<!-- These are ignored if -Dbuild.sysclasspath=only is used -->
- <fileset dir="${tomcat.home.40}">
+ <fileset dir="${home.tomcat.40}">
<include name="bin/bootstrap.jar"/>
</fileset>
</classpath>
@@ -84,11 +84,11 @@
is not set
========================================================================
-->
- <target name="check.test.tomcat.40" unless="tomcat.home.40">
+ <target name="check.test.tomcat.40" unless="home.tomcat.40">
<echo message=""/>
<echo message="******************************************************"/>
- <echo message="WARNING : The 'tomcat.home.40' property has not been"/>
+ <echo message="WARNING : The 'home.tomcat.40' property has not been"/>
<echo message="set. No test will be run on that servlet engine."/>
<echo message="******************************************************"/>
<echo message=""/>
@@ -100,10 +100,10 @@
Prepare directories and variables for running the tests
========================================================================
-->
- <target name="prepare.test.tomcat.40"
- depends="check.test.tomcat.40" if="tomcat.home.40">
+ <target name="prepare.tomcat.40"
+ depends="check.test.tomcat.40,init" if="home.tomcat.40">
- <echo message="tomcat.home.40 = ${tomcat.home.40}"/>
+ <echo message="home.tomcat.40 = ${home.tomcat.40}"/>
<property name="target.tomcat40.dir"
value="${target.test.dir}/tomcat40"/>
@@ -128,7 +128,7 @@
<!-- 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"
+ <copy file="${home.tomcat.40}/conf/web.xml"
todir="${target.tomcat40.dir}/conf"/>
<!-- Copy the war file -->
1.3 +9 -9 jakarta-cactus/Eclipse-Plugin/ant/build/build-tests-orion-16.xml
Index: build-tests-orion-16.xml
===================================================================
RCS file:
/home/cvs/jakarta-cactus/Eclipse-Plugin/ant/build/build-tests-orion-16.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build-tests-orion-16.xml 29 Oct 2002 17:12:28 -0000 1.2
+++ build-tests-orion-16.xml 30 Oct 2002 15:58:10 -0000 1.3
@@ -3,8 +3,8 @@
Run Orion 1.6 tests
========================================================================
-->
- <target name="test.orion.16" depends="prepare.test.orion.16"
- if="orion.home.16" description="Run tests on Orion 1.6">
+ <target name="test.orion.16" depends="prepare.orion.16"
+ if="home.orion.16" description="Run tests on Orion 1.6">
<!-- Start the servlet engine, wait for it to be started, run the
unit tests, stop the servlet engine, wait for it to be stopped.
@@ -29,7 +29,7 @@
<arg value="-config"/>
<arg value="${target.orion16.dir}/conf/server.xml"/>
<classpath>
- <fileset dir="${orion.home.16}">
+ <fileset dir="${home.orion.16}">
<include name="*.jar"/>
</fileset>
</classpath>
@@ -51,7 +51,7 @@
<arg value="password"/>
<arg value="-shutdown"/>
<classpath>
- <fileset dir="${orion.home.16}">
+ <fileset dir="${home.orion.16}">
<include name="*.jar"/>
</fileset>
</classpath>
@@ -65,11 +65,11 @@
is not set
========================================================================
-->
- <target name="check.test.orion.16" unless="orion.home.16">
+ <target name="check.test.orion.16" unless="home.orion.16">
<echo message=""/>
<echo message="******************************************************"/>
- <echo message="WARNING : The 'orion.home.16' property has not been"/>
+ <echo message="WARNING : The 'home.orion.16' property has not been"/>
<echo message="set. No test will be run on that servlet engine."/>
<echo message="******************************************************"/>
<echo message=""/>
@@ -81,10 +81,10 @@
Prepare directories and variables for running the tests
========================================================================
-->
- <target name="prepare.test.orion.16"
- depends="check.test.orion.16" if="orion.home.16">
+ <target name="prepare.orion.16"
+ depends="check.test.orion.16,init" if="home.orion.16">
- <echo message="orion.home.16 = ${orion.home.16}"/>
+ <echo message="home.orion.16 = ${home.orion.16}"/>
<property name="target.orion16.dir" value="${target.test.dir}/orion16"/>
<property name="conf.orion16.dir" value="${conf.test.dir}/orion16"/>
--
To unsubscribe, e-mail: <mailto:cactus-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:cactus-dev-help@;jakarta.apache.org>
