vmassol 01/06/30 15:37:10
Modified: cactus/conf/sample/build/servlet22 build.xml
cactus/docs/framework/xdocs changes.xml
Added: cactus/conf/sample/build/servlet22 build-tests-tomcat-33.xml
cactus/conf/sample/conf/test/servlet22/tomcat33 server.xml
Log:
added automatic Ant script support for Tomcat 3.3
Revision Changes Path
1.3 +4 -1 jakarta-commons/cactus/conf/sample/build/servlet22/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/cactus/conf/sample/build/servlet22/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 2001/06/18 12:53:34 1.2
+++ build.xml 2001/06/30 22:37:05 1.3
@@ -6,6 +6,7 @@
<!ENTITY build-tests-resin-12 SYSTEM "file:./build-tests-resin-12.xml">
<!ENTITY build-tests-orion-14 SYSTEM "file:./build-tests-orion-14.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-weblogic-51 SYSTEM "file:./build-tests-weblogic-51.xml">
<!ENTITY build-tests-enhydra-31 SYSTEM "file:./build-tests-enhydra-31.xml">
]>
@@ -77,6 +78,7 @@
<echo message=" tests_resin_20 --> run tests for Resin 2.0"/>
<echo message=" tests_resin_12 --> run tests for Resin 1.2"/>
<echo message=" tests_tomcat_32 --> run tests for Tomcat 3.2"/>
+ <echo message=" tests_tomcat_33 --> run tests for Tomcat 3.3"/>
<echo message=" tests_weblogic_51 --> run tests for WebLogic 5.1"/>
<echo message=" tests_orion_14 --> run tests for Orion 1.4"/>
<echo message=" tests_enhydra_31 --> run tests for Enhydra 3.1"/>
@@ -90,13 +92,14 @@
========================================================================
-->
<target name="tests_all"
-
depends="tests_resin_20,tests_resin_12,tests_tomcat_32,tests_orion_14,tests_weblogic_51,tests_enhydra_31">
+
depends="tests_resin_20,tests_resin_12,tests_tomcat_32,tests_tomcat_33,tests_orion_14,tests_weblogic_51,tests_enhydra_31">
</target>
&build-tests-resin-20;
&build-tests-resin-12;
&build-tests-orion-14;
&build-tests-tomcat-32;
+ &build-tests-tomcat-33;
&build-tests-weblogic-51;
&build-tests-enhydra-31;
1.1
jakarta-commons/cactus/conf/sample/build/servlet22/build-tests-tomcat-33.xml
Index: build-tests-tomcat-33.xml
===================================================================
<!--
========================================================================
Run Tomcat 3.3 tests
========================================================================
-->
<target name="tests_tomcat_33" depends="prepare_tests_tomcat_33"
if="tomcat.home.33">
<!-- 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:8080/test";
startTarget="start_tomcat_33"
stopTarget="stop_tomcat_33"
testTarget="tests"/>
</target>
<!--
========================================================================
Start Tomcat 3.3
========================================================================
-->
<target name="start_tomcat_33">
<java classname="org.apache.tomcat.startup.Main" fork="yes">
<jvmarg value="-Dtomcat.home=${tomcat.home.33}"/>
<arg value="-config"/>
<arg value="${out.tomcat33.full.dir}/conf/server.xml"/>
<classpath>
<pathelement location="${java.home}/../lib/tools.jar"/>
<fileset dir="${tomcat.home.33}/lib">
<include name="tomcat.jar"/>
</fileset>
</classpath>
</java>
</target>
<!--
========================================================================
Stop Tomcat 3.3
========================================================================
-->
<target name="stop_tomcat_33">
<java classname="org.apache.tomcat.startup.Main" fork="yes">
<jvmarg value="-Dtomcat.home=${tomcat.home.33}"/>
<arg value="-stop"/>
<classpath>
<pathelement location="${java.home}/../lib/tools.jar"/>
<fileset dir="${tomcat.home.33}/lib">
<include name="tomcat.jar"/>
</fileset>
</classpath>
</java>
</target>
<!--
========================================================================
Display a warning message if the needed servlet engine home property
is not set
========================================================================
-->
<target name="check_tests_tomcat_33" depends="testwar" unless="tomcat.home.33">
<echo message=""/>
<echo message="*********************************************************"/>
<echo message="WARNING : The 'tomcat.home.33' property has not been set."/>
<echo message=" 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_tests_tomcat_33" depends="check_tests_tomcat_33"
if="tomcat.home.33">
<echo message="tomcat.home.33 = ${tomcat.home.33}"/>
<property name="out.tomcat33.dir" value="${out.test.dir}/tomcat33"/>
<property name="conf.tomcat33.dir" value="${conf.test.dir}/tomcat33"/>
<property name="out.tomcat33.full.dir"
value="${basedir}/${out.tomcat33.dir}"/>
<filter token="out.tomcat33.dir" value="${out.tomcat33.dir}"/>
<!-- Create work and conf directories and copy configuration files -->
<mkdir dir="${out.tomcat33.dir}/conf"/>
<mkdir dir="${out.tomcat33.dir}/work"/>
<mkdir dir="${out.tomcat33.dir}/webapps"/>
<!-- Delete some config file so that they will be copied every time -->
<delete file="${out.tomcat33.dir}/conf/testserver.xml"/>
<copy file="${conf.tomcat33.dir}/server.xml"
todir="${out.tomcat33.dir}/conf" filtering="on"/>
<!-- Copy the war file -->
<copy file="${out.test.dir}/test.war"
tofile="${out.tomcat33.dir}/webapps/test.war"/>
</target>
1.26 +3 -0 jakarta-commons/cactus/docs/framework/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/cactus/docs/framework/xdocs/changes.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- changes.xml 2001/06/28 21:26:58 1.25
+++ changes.xml 2001/06/30 22:37:08 1.26
@@ -23,6 +23,9 @@
</devs>
<release version="1.2 in CVS">
+ <action dev="VMA" type="add">
+ Added automatic Ant script support for Tomcat 3.3.
+ </action>
<action dev="VMA" type="add" due-to="Jari Worsley"
due-to-email="[EMAIL PROTECTED]">
Now all HTTP parameters specified in the URL when using the
<code>ServletTestRequest.setURL()</code> method are automatically
1.1
jakarta-commons/cactus/conf/sample/conf/test/servlet22/tomcat33/server.xml
Index: server.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<Server>
<ContextManager home="@out.tomcat33.dir@" debug="0" workDir="work"
showDebugInfo="true">
<!-- ==================== Global modules ==================== -->
<LogSetter name="tc_log" timestamps="true"
verbosityLevel="DEBUG" />
<LogEvents enabled="false" />
<AutoDeploy source="webapps" target="webapps" />
<AutoWebApp dir="webapps" host="DEFAULT" />
<SimpleMapper1 debug="0" />
<SessionExpirer checkInterval="60" />
<SessionIdGenerator randomClass="java.util.Random"
randomFile="/dev/urandom" />
<!-- ========== context processing modules ========== -->
<!-- This will be the "default" profile
( all except the "global" modules can be set per context )
-->
<LogSetter name="servlet_log"
timestamps="true"
verbosityLevel = "INFORMATION"
path="servlet-${yyyyMMdd}.log"
/>
<LogSetter name="JASPER_LOG"
timestamps="true"
path="jasper-${yyyyMMdd}.log"
verbosityLevel = "INFORMATION" />
<LoaderInterceptor11 useApplicationLoader="true" />
<WebXmlReader validate="true" />
<ErrorHandler showDebugInfo="true" />
<WorkDirSetup cleanWorkDir="false" />
<Jdk12Interceptor />
<!-- Non-standard invoker, for backward compat. ( /servlet/* ) -->
<InvokerInterceptor />
<!-- you can add javaCompiler="jikes" -->
<JspInterceptor keepGenerated="true"
largeFile="false"
sendErrToClient="true"
useJspServlet="false"
/>
<StaticInterceptor debug="0" listings="true" />
<ReloadInterceptor fullReload="true" />
<SimpleSessionStore maxActiveSessions="-1" />
<AccessInterceptor />
<CredentialsInterceptor />
<LoadOnStartupInterceptor />
<Servlet22Interceptor />
<!-- Request processing -->
<DecodeInterceptor debug="0" />
<SessionId cookiesFirst="true" noCookies="false" />
<!-- ==================== Connectors ==================== -->
<!-- new http adapter. Attributes:
secure - use SSL ( https )
keystore, keypass - certs for SSL
port -->
<Http10Interceptor port="8080"
secure="false"
maxThreads="100"
maxSpareThreads="50"
minSpareThreads="10" />
<RequestInterceptor
className="org.apache.tomcat.modules.server.Ajp12Interceptor"
tomcatAuthentication="false"
port="8007" />
</ContextManager>
</Server>
