vmassol 2003/01/25 12:57:43
Modified: petals/ant/src/scripts/j2ee13 build.xml
Added: petals/ant/src/confs/share/resin2x resin.conf
petals/ant/src/scripts/share build-tests-resin2x.xml
Removed: petals/ant/src/confs/j2ee12/resin12 resin.conf
petals/ant/src/confs/j2ee13/resin13 resin.conf
petals/ant/src/confs/share/resin20 resin.conf
Log:
- Removed Resin 1.2 and 1.3 support files
- Added support script for Resin 2.x
Revision Changes Path
1.4 +2 -4 jakarta-cactus/petals/ant/src/scripts/j2ee13/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/petals/ant/src/scripts/j2ee13/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 25 Jan 2003 11:29:18 -0000 1.3
+++ build.xml 25 Jan 2003 20:57:43 -0000 1.4
@@ -4,9 +4,8 @@
<!ENTITY build-share SYSTEM "file:./scripts/build-share.xml">
<!ENTITY build-tests-tomcat4x SYSTEM "file:./scripts/build-tests-tomcat4x.xml">
<!ENTITY build-tests-jboss3x SYSTEM "file:./scripts/build-tests-jboss3x.xml">
+ <!ENTITY build-tests-resin2x SYSTEM "file:./scripts/build-tests-resin2x.xml">
<!--
- <!ENTITY build-tests-resin-20 SYSTEM "file:./scripts/build-tests-resin-20.xml">
- <!ENTITY build-tests-resin-13 SYSTEM "file:./scripts/build-tests-resin-13.xml">
<!ENTITY build-tests-orion-14 SYSTEM "file:./scripts/build-tests-orion-14.xml">
<!ENTITY build-tests-orion-15 SYSTEM "file:./scripts/build-tests-orion-15.xml">
<!ENTITY build-tests-orion-16 SYSTEM "file:./scripts/build-tests-orion-16.xml">
@@ -68,9 +67,8 @@
&build-tests-tomcat4x;
&build-tests-jboss3x;
+ &build-tests-resin2x;
<!--
- &build-tests-resin-20;
- &build-tests-resin-13;
&build-tests-orion-14;
&build-tests-orion-15;
&build-tests-orion-16;
1.1 jakarta-cactus/petals/ant/src/confs/share/resin2x/resin.conf
Index: resin.conf
===================================================================
<caucho.com>
<http-server>
<app-dir>.</app-dir>
<http port='@cactus.port@'/>
<host id=''>
<authenticator class-name='com.caucho.http.security.XmlAuthenticator'>
<init-param user='testuser:testpassword:test'/>
</authenticator>
<war-dir id='.'/>
</host>
</http-server>
</caucho.com>
1.1
jakarta-cactus/petals/ant/src/scripts/share/build-tests-resin2x.xml
Index: build-tests-resin2x.xml
===================================================================
<!-- Global properties -->
<property name="cactus.conf.resin2x" value="${cactus.conf.dir}/resin2x"/>
<property name="cactus.target.resin2x" value="${cactus.target.dir}/resin2x"/>
<!--
========================================================================
Run Resin 2.x tests
========================================================================
-->
<target name="cactus.run.resin2x"
depends="cactus.init,cactus.setup.resin2x,cactus.war,cactus.deploy.resin2x"
if="cactus.home.resin2x" description="Run tests on Resin 2.x">
<!-- 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:${cactus.port}/${cactus.context}/ServletRedirector?Cactus_Service=RUN_TEST";
startTarget="cactus.start.resin2x"
stopTarget="cactus.stop.resin2x"
testTarget="cactus.test"/>
</target>
<!--
========================================================================
Start Resin 2.x
========================================================================
-->
<target name="cactus.start.resin2x" description="Start Resin 2.x"
depends="cactus.check.resin2x" if="cactus.home.resin2x">
<java jvm="${cactus.jvm}" classname="org.apache.cactus.petal.ant.ResinRun"
fork="yes">
<arg value="-start"/>
<arg value="-conf"/>
<arg value="resin.conf"/>
<!-- Needed so that Resin use the cactus.home.resin2x variable as
it's root directory for resolving file paths -->
<jvmarg value="-Dresin.home=${cactus.target.resin2x}"/>
<classpath>
<pathelement location="${cactus.petal.ant.jar}"/>
<fileset dir="${cactus.home.resin2x}/lib">
<include name="*.jar"/>
</fileset>
</classpath>
</java>
</target>
<!--
========================================================================
Stop Resin 2.x
========================================================================
-->
<target name="cactus.stop.resin2x" description="Stop Resin 2.x"
depends="cactus.check.resin2x" if="cactus.home.resin2x">
<java jvm="${cactus.jvm}" classname="org.apache.cactus.petal.ant.ResinRun"
fork="yes">
<arg value="-stop"/>
<classpath>
<pathelement location="${cactus.petal.ant.jar}"/>
<fileset dir="${cactus.home.resin2x}/lib">
<include name="*.jar"/>
</fileset>
</classpath>
</java>
</target>
<!--
========================================================================
Display a warning message if the needed servlet engine home property
is not set
========================================================================
-->
<target name="cactus.check.resin2x" unless="cactus.home.resin2x">
<echo message=""/>
<echo message="******************************************************"/>
<echo message="WARNING : The 'cactus.home.resin2x' property has not"/>
<echo message="been set. No test will be run on that servlet engine."/>
<echo message="******************************************************"/>
<echo message=""/>
</target>
<!--
========================================================================
Deploy the cactified webapp
========================================================================
-->
<target name="cactus.deploy.resin2x"
description="Deploy the webapp on Resin 2.x">
<jar destfile="${cactus.target.resin2x}/${cactus.context}.war">
<fileset dir="${cactus.target.dir}/${cactus.context}"/>
</jar>
</target>
<!--
========================================================================
Set up a valid Resin 2.x directory structure in the
cactus.target.resin2x directory.
========================================================================
-->
<target name="cactus.setup.resin2x"
depends="cactus.check.resin2x" if="cactus.home.resin2x"
description="Set up a Resin 2.x directory structure">
<mkdir dir="${cactus.target.resin2x}"/>
<!-- Copy resin configuration files -->
<copy file="${cactus.conf.resin2x}/resin.conf"
tofile="${cactus.target.resin2x}/resin.conf" filtering="on"/>
</target>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
