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 vm...@apache.org on 2002/04/21 14:51:59 UTC
cvs commit: jakarta-cactus/sample-servlet/conf/sample/conf/test/j2ee13/tomcat40 server.xml tomcat-users.xml
vmassol 02/04/21 05:51:59
Modified: sample-servlet/conf/sample/build/j2ee12 build.xml
Added: sample-servlet/conf/sample/build/share
build-tests-tomcat-40.xml
sample-servlet/conf/sample/conf/test/share/tomcat40
server.xml tomcat-users.xml
Removed: sample-servlet/conf/sample/build/j2ee13
build-tests-tomcat-40.xml
sample-servlet/conf/sample/conf/test/j2ee13/tomcat40
server.xml tomcat-users.xml
Log:
Run Tomcat 4.x tests both for J2EE API 1.2 and 1.3
Revision Changes Path
1.2 +3 -1 jakarta-cactus/sample-servlet/conf/sample/build/j2ee12/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/sample-servlet/conf/sample/build/j2ee12/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 10 Mar 2002 14:26:01 -0000 1.1
+++ build.xml 21 Apr 2002 12:51:58 -0000 1.2
@@ -8,6 +8,7 @@
<!ENTITY build-tests-orion-15 SYSTEM "file:./build-tests-orion-15.xml">
<!ENTITY build-tests-tomcat-32 SYSTEM "file:./build-tests-tomcat-32.xml">
<!ENTITY build-tests-tomcat-33 SYSTEM "file:./build-tests-tomcat-33.xml">
+ <!ENTITY build-tests-tomcat-40 SYSTEM "file:./build-tests-tomcat-40.xml">
<!ENTITY build-tests-weblogic-51 SYSTEM "file:./build-tests-weblogic-51.xml">
<!ENTITY build-tests-enhydra-31 SYSTEM "file:./build-tests-enhydra-31.xml">
]>
@@ -82,7 +83,7 @@
========================================================================
-->
<target name="test.all"
- depends="test.resin.20,test.resin.12,test.tomcat.32,test.tomcat.33,test.orion.14,test.orion.15,test.weblogic.51,test.enhydra.31"
+ depends="test.resin.20,test.resin.12,test.tomcat.32,test.tomcat.33,test.tomcat.40,test.orion.14,test.orion.15,test.weblogic.51,test.enhydra.31"
description="Run tests on all defined containers">
</target>
@@ -92,6 +93,7 @@
&build-tests-orion-15;
&build-tests-tomcat-32;
&build-tests-tomcat-33;
+ &build-tests-tomcat-40;
&build-tests-weblogic-51;
&build-tests-enhydra-31;
1.1 jakarta-cactus/sample-servlet/conf/sample/build/share/build-tests-tomcat-40.xml
Index: build-tests-tomcat-40.xml
===================================================================
<!--
========================================================================
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">
<!-- Start the servlet engine, wait for it to be started, run the
unit tests, stop the servlet engine, wait for it to be stopped.
The servlet engine is stopped if the tests fail for any reason -->
<runservertests
testURL="http://localhost:${test.port}/test/ServletRedirector?Cactus_Service=RUN_TEST"
startTarget="start.tomcat.40"
stopTarget="stop.tomcat.40"
testTarget="test"/>
</target>
<!--
========================================================================
Start Tomcat 4.0
========================================================================
-->
<target name="start.tomcat.40">
<java classname="org.apache.catalina.startup.Bootstrap" fork="yes">
<jvmarg value="-Dcatalina.home=${tomcat.home.40}"/>
<jvmarg value="-Dcatalina.base=${target.tomcat40.dir}"/>
<arg value="start"/>
<classpath>
<!-- These are ignored if -Dbuild.sysclasspath=only is used -->
<pathelement path="${java.home}/../lib/tools.jar"/>
<fileset dir="${tomcat.home.40}">
<include name="bin/bootstrap.jar"/>
</fileset>
<!-- This is to allow the use of -Dbuild.sysclasspath=only when
starting Ant - Meaning that all jars need to be on the
initial classpath. -->
<pathelement path="${java.class.path}"/>
</classpath>
</java>
</target>
<!--
========================================================================
Stop Tomcat 4.0
========================================================================
-->
<target name="stop.tomcat.40">
<java classname="org.apache.catalina.startup.Bootstrap" fork="yes">
<jvmarg value="-Dcatalina.home=${tomcat.home.40}"/>
<jvmarg value="-Dcatalina.base=${target.tomcat40.dir}"/>
<arg value="stop"/>
<classpath>
<!-- This is to allow the use of -Dbuild.sysclasspath=only when
starting Ant - Meaning that all jars need to be on the
initial classpath -->
<pathelement path="${java.class.path}"/>
<!-- These are ignored if -Dbuild.sysclasspath=only is used -->
<fileset dir="${tomcat.home.40}">
<include name="bin/bootstrap.jar"/>
</fileset>
</classpath>
</java>
</target>
<!--
========================================================================
Display a warning message if the needed servlet engine home property
is not set
========================================================================
-->
<target name="check.test.tomcat.40" unless="tomcat.home.40">
<echo message=""/>
<echo message="******************************************************"/>
<echo message="WARNING : The 'tomcat.home.40' property has not been"/>
<echo message="set. No test will be run on that servlet engine."/>
<echo message="******************************************************"/>
<echo message=""/>
</target>
<!--
========================================================================
Prepare directories and variables for running the tests
========================================================================
-->
<target name="prepare.test.tomcat.40"
depends="check.test.tomcat.40,testwar" if="tomcat.home.40">
<echo message="tomcat.home.40 = ${tomcat.home.40}"/>
<property name="target.tomcat40.dir"
value="${target.test.dir}/tomcat40"/>
<property name="conf.tomcat40.dir" value="${conf.test.dir}/tomcat40"/>
<!-- Create work and conf directories and copy configuration files -->
<mkdir dir="${target.tomcat40.dir}/conf"/>
<mkdir dir="${target.tomcat40.dir}/work"/>
<mkdir dir="${target.tomcat40.dir}/webapps"/>
<!-- Delete some config file so that they will be copied every time -->
<delete file="${target.tomcat40.dir}/conf/server.xml"/>
<!-- Remove the auto deployed webapp so that it is redeployed every
time -->
<delete dir="${target.tomcat40.dir}/webapps/test"/>
<copy todir="${target.tomcat40.dir}/conf" filtering="on">
<fileset dir="${conf.tomcat40.dir}"/>
</copy>
<!-- 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="${target.tomcat40.dir}/conf"/>
<!-- Copy the war file -->
<copy file="${target.test.dir}/test.war"
tofile="${target.tomcat40.dir}/webapps/test.war"/>
</target>
1.1 jakarta-cactus/sample-servlet/conf/sample/conf/test/share/tomcat40/server.xml
Index: server.xml
===================================================================
<Server port="8005" shutdown="SHUTDOWN" debug="0">
<Service name="Tomcat-Standalone">
<Connector className="org.apache.catalina.connector.http.HttpConnector"
port="@test.port@" minProcessors="5" maxProcessors="75"
acceptCount="10" debug="0"/>
<Engine name="Standalone" defaultHost="localhost" debug="0">
<Realm className="org.apache.catalina.realm.MemoryRealm" />
<Host name="localhost" debug="0" appBase="webapps" unpackWARs="true">
</Host>
</Engine>
</Service>
</Server>
1.1 jakarta-cactus/sample-servlet/conf/sample/conf/test/share/tomcat40/tomcat-users.xml
Index: tomcat-users.xml
===================================================================
<tomcat-users>
<user name="testuser" password="testpwd" roles="test" />
</tomcat-users>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>