You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by ma...@apache.org on 2004/12/12 05:28:56 UTC
svn commit: r111635 - /struts/core/trunk/build-tests.xml /struts/core/trunk/build.properties.sample /struts/core/trunk/build.properties.sample.lib /struts/core/trunk/build.xml
Author: martinc
Date: Sat Dec 11 20:28:55 2004
New Revision: 111635
URL: http://svn.apache.org/viewcvs?view=rev&rev=111635
Log:
Remove test support for Tomcat 3.2, 3.3, and 4.0, and add support for Tomcat 5.5. Update the Cactus Ant task class, to avoid using the deprecated one.
Note that the Cactus tests fail on JDK 1.5 / Tomcat 5.5. It looks to me to be a Cactus problem, but I haven't spent a lot of time looking into it.
Modified:
struts/core/trunk/build-tests.xml
struts/core/trunk/build.properties.sample
struts/core/trunk/build.properties.sample.lib
struts/core/trunk/build.xml
Modified: struts/core/trunk/build-tests.xml
Url: http://svn.apache.org/viewcvs/struts/core/trunk/build-tests.xml?view=diff&rev=111635&p1=struts/core/trunk/build-tests.xml&r1=111634&p2=struts/core/trunk/build-tests.xml&r2=111635
==============================================================================
--- struts/core/trunk/build-tests.xml (original)
+++ struts/core/trunk/build-tests.xml Sat Dec 11 20:28:55 2004
@@ -125,7 +125,7 @@
<target name="init">
<taskdef name="runservertests"
- classname="org.apache.cactus.ant.RunServerTestsTask">
+ classname="org.apache.cactus.integration.ant.RunServerTestsTask">
<classpath>
<pathelement location="${cactus.ant.jar}"/>
@@ -292,204 +292,33 @@
</target>
<!--
- Prepare test directory structure for Tomcat 3.2 servlet engine
--->
- <target name="prepare.test.tomcat.32" depends="prepare.test.war" if="tomcat.home.32">
-
- <property name="out.tomcat.32.dir" value="${out.test.dir}/servers/tomcat32"/>
- <filter token="out.tomcat.32.dir" value="${out.tomcat.32.dir}"/>
- <filter token="tomcat.connector.port" value="${cactus.contextPort}"/>
-
- <mkdir dir="${out.tomcat.32.dir}/webapps"/>
- <mkdir dir="${out.tomcat.32.dir}/conf"/>
-
- <!-- Delete old directory so new war is unzipped -->
- <delete dir="${out.tomcat.32.dir}/webapps/test"/>
-
- <!-- Copy war file -->
- <copy file="${out.test.dir}/test.war" todir="${out.tomcat.32.dir}/webapps"/>
-
- <!-- Copy configuration files -->
- <copy file="${conf.test.dir}/tomcat32/server.xml"
- todir="${out.tomcat.32.dir}/conf" filtering="on"/>
-
- </target>
-
-<!--
- Run unit tests on Tomcat 3.2 servlet engine
--->
- <target name="test.tomcat.32" depends="prepare.test.tomcat.32">
-
- <!-- 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 automatically stopped if the tests fail for
- any reason.-->
-
- <runservertests testURL="${cactus.contextURL}"
- startTarget="start.tomcat.32"
- stopTarget="stop.tomcat.32"
- testTarget="run.test"/>
-
- </target>
-
-<!--
- Start Tomcat 3.2 servlet engine
--->
- <target name="start.tomcat.32">
-
- <java classname="org.apache.tomcat.startup.Tomcat" fork="yes">
- <arg value="-config"/>
- <arg value="${out.tomcat.32.dir}/conf/server.xml"/>
- <classpath>
- <pathelement location="${java.home}/../lib/tools.jar"/>
- <fileset dir="${tomcat.home.32}/lib">
- <include name="*.jar"/>
- </fileset>
- </classpath>
- </java>
-
- </target>
-
-<!--
- Stop Tomcat 3.2 servlet engine
--->
- <target name="stop.tomcat.32">
-
- <java classname="org.apache.tomcat.startup.Tomcat" fork="yes">
- <jvmarg value="-Dtomcat.home=${tomcat.home.32}"/>
- <arg value="-stop"/>
- <classpath>
- <pathelement location="${java.home}/../lib/tools.jar"/>
- <fileset dir="${tomcat.home.32}/lib">
- <include name="*.jar"/>
- </fileset>
- </classpath>
- </java>
-
- </target>
-
-<!--
- Prepare test directory structure for Tomcat 3.3 servlet engine
--->
- <target name="prepare.test.tomcat.33" depends="prepare.test.war" if="tomcat.home.33">
-
- <property name="out.tomcat.33.dir" value="${out.test.dir}/servers/tomcat33"/>
- <filter token="out.tomcat.33.dir" value="${out.tomcat.33.dir}"/>
- <filter token="tomcat.connector.port" value="${cactus.contextPort}"/>
-
- <mkdir dir="${out.tomcat.33.dir}/webapps"/>
- <mkdir dir="${out.tomcat.33.dir}/conf"/>
-
- <!-- Delete old directory so new war is unzipped -->
- <delete dir="${out.tomcat.33.dir}/webapps/test"/>
-
- <!-- Copy war file -->
- <copy file="${out.test.dir}/test.war" todir="${out.tomcat.33.dir}/webapps"/>
-
- <!-- Copy configuration files -->
- <copy file="${conf.test.dir}/tomcat33/server.xml"
- todir="${out.tomcat.33.dir}/conf" filtering="on"/>
- <copy file="${conf.test.dir}/tomcat33/modules.xml"
- todir="${out.tomcat.33.dir}/conf" filtering="on"/>
-
- </target>
-
-<!--
- Run unit tests on Tomcat 3.3 servlet engine
--->
- <target name="test.tomcat.33" depends="prepare.test.tomcat.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 automatically stopped if the tests fail for
- any reason.-->
-
- <runservertests testURL="${cactus.contextURL}"
- startTarget="start.tomcat.33"
- stopTarget="stop.tomcat.33"
- testTarget="run.test"/>
-
- </target>
-
-<!--
- Start Tomcat 3.3 servlet engine
--->
- <target name="start.tomcat.33">
-
- <java classname="org.apache.tomcat.startup.Main" fork="yes">
- <arg value="-home"/>
- <arg value="${out.tomcat.33.dir}"/>
- <arg value="-config"/>
- <arg value="${out.tomcat.33.dir}/conf/server.xml"/>
- <arg value="run"/>
- <classpath>
- <pathelement location="${java.home}/../lib/tools.jar"/>
- <fileset dir="${tomcat.home.33}/lib">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${tomcat.home.33}/lib/common">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${tomcat.home.33}/lib/container">
- <include name="*.jar"/>
- </fileset>
- </classpath>
- </java>
-
- </target>
-
-<!--
- Stop Tomcat 3.3 servlet engine
--->
- <target name="stop.tomcat.33">
-
- <java classname="org.apache.tomcat.startup.Main" fork="yes">
- <jvmarg value="-Dtomcat.home=${out.tomcat.33.dir}"/>
- <arg value="stop"/>
- <classpath>
- <pathelement location="${java.home}/../lib/tools.jar"/>
- <fileset dir="${tomcat.home.33}/lib">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${tomcat.home.33}/lib/common">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${tomcat.home.33}/lib/container">
- <include name="*.jar"/>
- </fileset>
- </classpath>
- </java>
-
- </target>
-
-<!--
- Prepare test directory structure for Tomcat 4.0 servlet engine
+ Prepare test directory structure for Tomcat 4.1 servlet engine
-->
- <target name="prepare.test.tomcat.40" depends="prepare.test.war" if="tomcat.home.40">
+ <target name="prepare.test.tomcat.41" depends="prepare.test.war" if="tomcat.home.41">
- <property name="out.tomcat.40.dir" value="${out.test.dir}/servers/tomcat40"/>
- <filter token="out.tomcat.40.full.dir" value="${out.tomcat.40.dir}"/>
+ <property name="out.tomcat.41.dir" value="${out.test.dir}/servers/tomcat41"/>
+ <filter token="out.tomcat.41.full.dir" value="${out.tomcat.41.dir}"/>
<filter token="tomcat.connector.port" value="${cactus.contextPort}"/>
- <mkdir dir="${out.tomcat.40.dir}/webapps"/>
- <mkdir dir="${out.tomcat.40.dir}/conf"/>
+ <mkdir dir="${out.tomcat.41.dir}/webapps"/>
+ <mkdir dir="${out.tomcat.41.dir}/conf"/>
<!-- Delete old directory so new war is unzipped -->
- <delete dir="${out.tomcat.40.dir}/webapps/test"/>
+ <delete dir="${out.tomcat.41.dir}/webapps/test"/>
<!-- Copy war file -->
- <copy file="${out.test.dir}/test.war" todir="${out.tomcat.40.dir}/webapps"/>
+ <copy file="${out.test.dir}/test.war" todir="${out.tomcat.41.dir}/webapps"/>
<!-- Copy configuration files -->
- <copy file="${conf.test.dir}/tomcat40/server.xml"
- todir="${out.tomcat.40.dir}/conf" filtering="on"/>
+ <copy file="${conf.test.dir}/tomcat41/server.xml"
+ todir="${out.tomcat.41.dir}/conf" filtering="on"/>
</target>
<!--
- Run unit tests on Tomcat 4.0 servlet engine
+ Run unit tests on Tomcat 4.1 servlet engine
-->
- <target name="test.tomcat.40" depends="prepare.test.tomcat.40">
+ <target name="test.tomcat.41" depends="prepare.test.tomcat.41">
<!-- Start the servlet engine, wait for it to be started, run the
unit tests, stop the servlet engine, wait for it to be stopped.
@@ -497,26 +326,26 @@
any reason.-->
<runservertests testURL="${cactus.contextURL}"
- startTarget="start.tomcat.40"
- stopTarget="stop.tomcat.40"
+ startTarget="start.tomcat.41"
+ stopTarget="stop.tomcat.41"
testTarget="run.test"/>
</target>
<!--
- Start Tomcat 4.0 servlet engine
+ Start Tomcat 4.1 servlet engine
-->
- <target name="start.tomcat.40">
+ <target name="start.tomcat.41">
<java classname="org.apache.catalina.startup.Bootstrap" fork="yes">
- <jvmarg value="-Dcatalina.home=${tomcat.home.40}"/>
- <jvmarg value="-Dcatalina.base=${tomcat.home.40}"/>
+ <jvmarg value="-Dcatalina.home=${tomcat.home.41}"/>
+ <jvmarg value="-Dcatalina.base=${tomcat.home.41}"/>
<arg value="-config"/>
- <arg value="${out.tomcat.40.dir}/conf/server.xml"/>
+ <arg value="${out.tomcat.41.dir}/conf/server.xml"/>
<arg value="start"/>
<classpath>
<pathelement location="${java.home}/../lib/tools.jar"/>
- <fileset dir="${tomcat.home.40}">
+ <fileset dir="${tomcat.home.41}">
<include name="bin/bootstrap.jar"/>
<!-- <include name="server/catalina.jar"/> -->
</fileset>
@@ -526,18 +355,18 @@
</target>
<!--
- Stop Tomcat 4.0 servlet engine
+ Stop Tomcat 4.1 servlet engine
-->
- <target name="stop.tomcat.40">
+ <target name="stop.tomcat.41">
<java classname="org.apache.catalina.startup.Bootstrap" fork="yes">
- <jvmarg value="-Dcatalina.home=${tomcat.home.40}"/>
- <jvmarg value="-Dcatalina.base=${tomcat.home.40}"/>
+ <jvmarg value="-Dcatalina.home=${tomcat.home.41}"/>
+ <jvmarg value="-Dcatalina.base=${tomcat.home.41}"/>
<arg value="-config"/>
- <arg value="${out.tomcat.40.dir}/conf/server.xml"/>
+ <arg value="${out.tomcat.41.dir}/conf/server.xml"/>
<arg value="stop"/>
<classpath>
- <fileset dir="${tomcat.home.40}">
+ <fileset dir="${tomcat.home.41}">
<include name="bin/bootstrap.jar"/>
<!-- <include name="server/catalina.jar"/> -->
</fileset>
@@ -547,33 +376,33 @@
</target>
<!--
- Prepare test directory structure for Tomcat 4.1 servlet engine
+ Prepare test directory structure for Tomcat 5.0 servlet engine
-->
- <target name="prepare.test.tomcat.41" depends="prepare.test.war" if="tomcat.home.41">
+ <target name="prepare.test.tomcat.50" depends="prepare.test.war" if="tomcat.home.50">
- <property name="out.tomcat.41.dir" value="${out.test.dir}/servers/tomcat41"/>
- <filter token="out.tomcat.41.full.dir" value="${out.tomcat.41.dir}"/>
+ <property name="out.tomcat.50.dir" value="${out.test.dir}/servers/tomcat50"/>
+ <filter token="out.tomcat.50.full.dir" value="${out.tomcat.50.dir}"/>
<filter token="tomcat.connector.port" value="${cactus.contextPort}"/>
- <mkdir dir="${out.tomcat.41.dir}/webapps"/>
- <mkdir dir="${out.tomcat.41.dir}/conf"/>
+ <mkdir dir="${out.tomcat.50.dir}/webapps"/>
+ <mkdir dir="${out.tomcat.50.dir}/conf"/>
<!-- Delete old directory so new war is unzipped -->
- <delete dir="${out.tomcat.41.dir}/webapps/test"/>
+ <delete dir="${out.tomcat.50.dir}/webapps/test"/>
<!-- Copy war file -->
- <copy file="${out.test.dir}/test.war" todir="${out.tomcat.41.dir}/webapps"/>
+ <copy file="${out.test.dir}/test.war" todir="${out.tomcat.50.dir}/webapps"/>
<!-- Copy configuration files -->
- <copy file="${conf.test.dir}/tomcat41/server.xml"
- todir="${out.tomcat.41.dir}/conf" filtering="on"/>
+ <copy file="${conf.test.dir}/tomcat50/server.xml"
+ todir="${out.tomcat.50.dir}/conf" filtering="on"/>
</target>
<!--
- Run unit tests on Tomcat 4.1 servlet engine
+ Run unit tests on Tomcat 5.0 servlet engine
-->
- <target name="test.tomcat.41" depends="prepare.test.tomcat.41">
+ <target name="test.tomcat.50" depends="prepare.test.tomcat.50">
<!-- Start the servlet engine, wait for it to be started, run the
unit tests, stop the servlet engine, wait for it to be stopped.
@@ -581,26 +410,26 @@
any reason.-->
<runservertests testURL="${cactus.contextURL}"
- startTarget="start.tomcat.41"
- stopTarget="stop.tomcat.41"
+ startTarget="start.tomcat.50"
+ stopTarget="stop.tomcat.50"
testTarget="run.test"/>
</target>
<!--
- Start Tomcat 4.1 servlet engine
+ Start Tomcat 5.0 servlet engine
-->
- <target name="start.tomcat.41">
+ <target name="start.tomcat.50">
<java classname="org.apache.catalina.startup.Bootstrap" fork="yes">
- <jvmarg value="-Dcatalina.home=${tomcat.home.41}"/>
- <jvmarg value="-Dcatalina.base=${tomcat.home.41}"/>
+ <jvmarg value="-Dcatalina.home=${tomcat.home.50}"/>
+ <jvmarg value="-Dcatalina.base=${tomcat.home.50}"/>
<arg value="-config"/>
- <arg value="${out.tomcat.41.dir}/conf/server.xml"/>
+ <arg value="${out.tomcat.50.dir}/conf/server.xml"/>
<arg value="start"/>
<classpath>
<pathelement location="${java.home}/../lib/tools.jar"/>
- <fileset dir="${tomcat.home.41}">
+ <fileset dir="${tomcat.home.50}">
<include name="bin/bootstrap.jar"/>
<!-- <include name="server/catalina.jar"/> -->
</fileset>
@@ -610,18 +439,18 @@
</target>
<!--
- Stop Tomcat 4.1 servlet engine
+ Stop Tomcat 5.0 servlet engine
-->
- <target name="stop.tomcat.41">
+ <target name="stop.tomcat.50">
<java classname="org.apache.catalina.startup.Bootstrap" fork="yes">
- <jvmarg value="-Dcatalina.home=${tomcat.home.41}"/>
- <jvmarg value="-Dcatalina.base=${tomcat.home.41}"/>
+ <jvmarg value="-Dcatalina.home=${tomcat.home.50}"/>
+ <jvmarg value="-Dcatalina.base=${tomcat.home.50}"/>
<arg value="-config"/>
- <arg value="${out.tomcat.41.dir}/conf/server.xml"/>
+ <arg value="${out.tomcat.50.dir}/conf/server.xml"/>
<arg value="stop"/>
<classpath>
- <fileset dir="${tomcat.home.41}">
+ <fileset dir="${tomcat.home.50}">
<include name="bin/bootstrap.jar"/>
<!-- <include name="server/catalina.jar"/> -->
</fileset>
@@ -631,33 +460,33 @@
</target>
<!--
- Prepare test directory structure for Tomcat 5.0 servlet engine
+ Prepare test directory structure for Tomcat 5.5 servlet engine
-->
- <target name="prepare.test.tomcat.50" depends="prepare.test.war" if="tomcat.home.50">
+ <target name="prepare.test.tomcat.55" depends="prepare.test.war" if="tomcat.home.55">
- <property name="out.tomcat.50.dir" value="${out.test.dir}/servers/tomcat50"/>
- <filter token="out.tomcat.50.full.dir" value="${out.tomcat.50.dir}"/>
+ <property name="out.tomcat.55.dir" value="${out.test.dir}/servers/tomcat55"/>
+ <filter token="out.tomcat.55.full.dir" value="${out.tomcat.55.dir}"/>
<filter token="tomcat.connector.port" value="${cactus.contextPort}"/>
- <mkdir dir="${out.tomcat.50.dir}/webapps"/>
- <mkdir dir="${out.tomcat.50.dir}/conf"/>
+ <mkdir dir="${out.tomcat.55.dir}/webapps"/>
+ <mkdir dir="${out.tomcat.55.dir}/conf"/>
<!-- Delete old directory so new war is unzipped -->
- <delete dir="${out.tomcat.50.dir}/webapps/test"/>
+ <delete dir="${out.tomcat.55.dir}/webapps/test"/>
<!-- Copy war file -->
- <copy file="${out.test.dir}/test.war" todir="${out.tomcat.50.dir}/webapps"/>
+ <copy file="${out.test.dir}/test.war" todir="${out.tomcat.55.dir}/webapps"/>
<!-- Copy configuration files -->
- <copy file="${conf.test.dir}/tomcat50/server.xml"
- todir="${out.tomcat.50.dir}/conf" filtering="on"/>
+ <copy file="${conf.test.dir}/tomcat55/server.xml"
+ todir="${out.tomcat.55.dir}/conf" filtering="on"/>
</target>
<!--
- Run unit tests on Tomcat 5.0 servlet engine
+ Run unit tests on Tomcat 5.5 servlet engine
-->
- <target name="test.tomcat.50" depends="prepare.test.tomcat.50">
+ <target name="test.tomcat.55" depends="prepare.test.tomcat.55">
<!-- Start the servlet engine, wait for it to be started, run the
unit tests, stop the servlet engine, wait for it to be stopped.
@@ -665,26 +494,26 @@
any reason.-->
<runservertests testURL="${cactus.contextURL}"
- startTarget="start.tomcat.50"
- stopTarget="stop.tomcat.50"
+ startTarget="start.tomcat.55"
+ stopTarget="stop.tomcat.55"
testTarget="run.test"/>
</target>
<!--
- Start Tomcat 5.0 servlet engine
+ Start Tomcat 5.5 servlet engine
-->
- <target name="start.tomcat.50">
+ <target name="start.tomcat.55">
<java classname="org.apache.catalina.startup.Bootstrap" fork="yes">
- <jvmarg value="-Dcatalina.home=${tomcat.home.50}"/>
- <jvmarg value="-Dcatalina.base=${tomcat.home.50}"/>
+ <jvmarg value="-Dcatalina.home=${tomcat.home.55}"/>
+ <jvmarg value="-Dcatalina.base=${tomcat.home.55}"/>
<arg value="-config"/>
- <arg value="${out.tomcat.50.dir}/conf/server.xml"/>
+ <arg value="${out.tomcat.55.dir}/conf/server.xml"/>
<arg value="start"/>
<classpath>
<pathelement location="${java.home}/../lib/tools.jar"/>
- <fileset dir="${tomcat.home.50}">
+ <fileset dir="${tomcat.home.55}">
<include name="bin/bootstrap.jar"/>
<!-- <include name="server/catalina.jar"/> -->
</fileset>
@@ -694,18 +523,18 @@
</target>
<!--
- Stop Tomcat 5.0 servlet engine
+ Stop Tomcat 5.5 servlet engine
-->
- <target name="stop.tomcat.50">
+ <target name="stop.tomcat.55">
<java classname="org.apache.catalina.startup.Bootstrap" fork="yes">
- <jvmarg value="-Dcatalina.home=${tomcat.home.50}"/>
- <jvmarg value="-Dcatalina.base=${tomcat.home.50}"/>
+ <jvmarg value="-Dcatalina.home=${tomcat.home.55}"/>
+ <jvmarg value="-Dcatalina.base=${tomcat.home.55}"/>
<arg value="-config"/>
- <arg value="${out.tomcat.50.dir}/conf/server.xml"/>
+ <arg value="${out.tomcat.55.dir}/conf/server.xml"/>
<arg value="stop"/>
<classpath>
- <fileset dir="${tomcat.home.50}">
+ <fileset dir="${tomcat.home.55}">
<include name="bin/bootstrap.jar"/>
<!-- <include name="server/catalina.jar"/> -->
</fileset>
@@ -713,6 +542,7 @@
</java>
</target>
+
<!-- ================ Non-Cactus JUnit Based Tests ======================== -->
Modified: struts/core/trunk/build.properties.sample
Url: http://svn.apache.org/viewcvs/struts/core/trunk/build.properties.sample?view=diff&rev=111635&p1=struts/core/trunk/build.properties.sample&r1=111634&p2=struts/core/trunk/build.properties.sample&r2=111635
==============================================================================
--- struts/core/trunk/build.properties.sample (original)
+++ struts/core/trunk/build.properties.sample Sat Dec 11 20:28:55 2004
@@ -26,11 +26,11 @@
# apache.home - Where precompiled jar files from Apache live.
apache.home=D:/Java/Programs/Apache
-# The directory containing your binary distribution of Tomcat 4.0 ("Catalina"
+# The directory containing your binary distribution of Tomcat 4.1 ("Catalina"
# is the servlet container part of this distribution), from CVS module
-# "jakarta-tomcat-4.0" at jakarta.apache.org). This is only required
+# "jakarta-tomcat-4.1" at jakarta.apache.org). This is only required
# if you are going to execute the "deploy.catalina" target.
-catalina.home=${apache.home}/jakarta-tomcat-4.0.6
+catalina.home=${apache.home}/jakarta-tomcat-4.1.30
# The JAR file containing the Beanutils package (see Installation page)
# from the Jakarta Commons project.
@@ -72,10 +72,10 @@
# version 2.2 or 2.3)
servlet.jar=${apache.home}/jakarta-servletapi/lib/servlet.jar
-# The directory containing your binary distribution of Tomcat 3.3, from CVS
-# module "jakarta-tomcat" (and branch "TOMCAT_32") at jakarta.apache.org.
-# This is only required if you are going to execute the "deploy.tomcat" target.
-tomcat.home=${apache.home}/jakarta-tomcat-3.3.1
+# The directory containing your binary distribution of Tomcat 4.1, from CVS
+# module "jakarta-tomcat-4.0" at jakarta.apache.org. This is only required
+# if you are going to execute the "deploy.tomcat" target.
+tomcat.home=${apache.home}/jakarta-tomcat-4.1.30
# The JAR file containing the Xerces parser. This is only required if you are
# going to execute the "deploy.catalina" target.
@@ -304,10 +304,10 @@
# Note: If you don't want to run the test on a given servlet engine, just
# comment it's home property. For example, if you don't want to run the
-# tests on Tomcat 4.0, comment the "tomcat.home.40" property.
+# tests on Tomcat 4.1, comment the "tomcat.home.41" property.
-tomcat.home.33 = ${apache.home}/jakarta-tomcat-3.3.1
-tomcat.home.40 = ${apache.home}/jakarta-tomcat-4.0.6
-tomcat.home.41 = ${apache.home}/jakarta-tomcat-4.1.27
+tomcat.home.41 = ${apache.home}/jakarta-tomcat-4.1.30
+tomcat.home.50 = ${apache.home}/jakarta-tomcat-5.0.28
+tomcat.home.55 = ${apache.home}/jakarta-tomcat-5.5.4
# use value of tomcat.home.41 to set equivalent property for Maven-Cactus plug-in
cactus.home.tomcat4x=${tomcat.home.41}
Modified: struts/core/trunk/build.properties.sample.lib
Url: http://svn.apache.org/viewcvs/struts/core/trunk/build.properties.sample.lib?view=diff&rev=111635&p1=struts/core/trunk/build.properties.sample.lib&r1=111634&p2=struts/core/trunk/build.properties.sample.lib&r2=111635
==============================================================================
--- struts/core/trunk/build.properties.sample.lib (original)
+++ struts/core/trunk/build.properties.sample.lib Sat Dec 11 20:28:55 2004
@@ -285,11 +285,11 @@
# Note: If you don't want to run the test on a given servlet engine, just
# comment it's home property. For example, if you don't want to run the
-# tests on Tomcat 4.0, comment the "tomcat.home.40" property.
+# tests on Tomcat 4.1, comment the "tomcat.home.41" property.
-tomcat.home.33 = ${apache.home}/jakarta-tomcat-3.3.1
-tomcat.home.40 = ${apache.home}/jakarta-tomcat-4.0.6
tomcat.home.41 = ${apache.home}/jakarta-tomcat-4.1.30
+tomcat.home.50 = ${apache.home}/jakarta-tomcat-5.0.28
+tomcat.home.55 = ${apache.home}/jakarta-tomcat-5.5.4
# use value of tomcat.home.41 to set equivalent property for Maven-Cactus plug-in
cactus.home.tomcat4x=${tomcat.home.41}
@@ -297,21 +297,21 @@
# Properties related to optional Tomcat tasks
# ------------------------------------
-# The directory containing your binary distribution of Tomcat 4.0 ("Catalina"
+# The directory containing your binary distribution of Tomcat 4.1 ("Catalina"
# is the servlet container part of this distribution), from CVS module
-# "jakarta-tomcat-4.0" at jakarta.apache.org). This is only required
+# "jakarta-tomcat-4.1" at jakarta.apache.org). This is only required
# if you are going to execute the "deploy.catalina" target.
-catalina.home=${apache.home}/jakarta-tomcat-4.0.6
+catalina.home=${tomcat.home.41}
# The JAR file containing the JSP API classes to compile against if you are
# using JSP 2.0 or later (where these classes are separated from servlet.jar).
# If you are using JSP 1.1 or 1.2, leave this property unset
#jsp.jar=${apache.home}/jakarta-servletapi/lib/jsp.jar
-# The directory containing your binary distribution of Tomcat 3.3, from CVS
-# module "jakarta-tomcat" (and branch "TOMCAT_32") at jakarta.apache.org.
-# This is only required if you are going to execute the "deploy.tomcat" target.
-tomcat.home=${apache.home}/jakarta-tomcat-3.3.1
+# The directory containing your binary distribution of Tomcat 4.1, from CVS
+# module "jakarta-tomcat-4.0" at jakarta.apache.org. This is only required
+# if you are going to execute the "deploy.tomcat" target.
+tomcat.home=${apache.home}/jakarta-tomcat-4.1.30
# The JAR file containing the Xerces parser. This is only required if you are
# going to execute the "deploy.catalina" target.
Modified: struts/core/trunk/build.xml
Url: http://svn.apache.org/viewcvs/struts/core/trunk/build.xml?view=diff&rev=111635&p1=struts/core/trunk/build.xml&r1=111634&p2=struts/core/trunk/build.xml&r2=111635
==============================================================================
--- struts/core/trunk/build.xml (original)
+++ struts/core/trunk/build.xml Sat Dec 11 20:28:55 2004
@@ -71,7 +71,7 @@
required only when executing the
"generate.taglib.doc" target.
- catalina.home The path to the Tomcat 4.0 installation.
+ catalina.home The path to the Tomcat installation.
This is required only when executing the
"deploy.catalina" target.
@@ -106,7 +106,7 @@
<property file="${user.home}/build.properties"/>
<!-- Default values for unspecified properties -->
- <property name="catalina.home" value="../jakarta-tomcat-4.0/build"/>
+ <property name="catalina.home" value="../jakarta-tomcat-5.0/build"/>
<property name="pmd.rulesets" value="rulesets/imports.xml,rulesets/unusedcode.xml,rulesets/basic.xml,rulesets/strings.xml"/>
<property name="pmd.report" value="pmdreport.html"/>
@@ -842,60 +842,13 @@
<target name="test.tomcat.all"
- depends="skip.tomcat.32,test.tomcat.32,
- skip.tomcat.33,test.tomcat.33,
- skip.tomcat.40,test.tomcat.40,
- skip.tomcat.41,test.tomcat.41"
+ depends="compile.library,
+ skip.tomcat.41,test.tomcat.41,
+ skip.tomcat.50,test.tomcat.50,
+ skip.tomcat.55,test.tomcat.55"
description="Run Cactus-based unit tests on all servlet engines">
</target>
- <target name="skip.tomcat.32" unless="tomcat.home.32">
- <echo message="*****************************************************"/>
- <echo message="WARNING : Property 'tomcat.home.32' has not been set."/>
- <echo message=" No test will be run on that servlet engine."/>
- <echo message="*****************************************************"/>
- <echo message=""/>
- </target>
-
- <target name="test.tomcat.32" if="tomcat.home.32"
- depends="skip.tomcat.32,compile.library"
- description="Run Cactus-based unit tests on Tomcat 3.2">
- <echo message="tomcat.home.32 = ${tomcat.home.32}"/>
- <ant antfile="build-tests.xml" target="test.tomcat.32"/>
- </target>
-
-
- <target name="skip.tomcat.33" unless="tomcat.home.33">
- <echo message="*****************************************************"/>
- <echo message="WARNING : Property 'tomcat.home.33' has not been set."/>
- <echo message=" No test will be run on that servlet engine."/>
- <echo message="*****************************************************"/>
- <echo message=""/>
- </target>
-
- <target name="test.tomcat.33" if="tomcat.home.33"
- depends="skip.tomcat.33,compile.library"
- description="Run Cactus-based unit tests on Tomcat 3.3">
- <echo message="tomcat.home.33 = ${tomcat.home.33}"/>
- <ant antfile="build-tests.xml" target="test.tomcat.33"/>
- </target>
-
- <target name="skip.tomcat.40" unless="tomcat.home.40">
- <echo message="*****************************************************"/>
- <echo message="WARNING : Property 'tomcat.home.40' has not been set."/>
- <echo message=" No test will be run on that servlet engine."/>
- <echo message="*****************************************************"/>
- <echo message=""/>
- </target>
-
- <target name="test.tomcat.40" if="tomcat.home.40"
- depends="skip.tomcat.40,compile.library"
- description="Run Cactus-based unit tests on Tomcat 4.0">
- <echo message="tomcat.home.40 = ${tomcat.home.40}"/>
- <ant antfile="build-tests.xml" target="test.tomcat.40"/>
- </target>
-
-
<target name="skip.tomcat.41" unless="tomcat.home.41">
<echo message="*****************************************************"/>
<echo message="WARNING : Property 'tomcat.home.41' has not been set."/>
@@ -925,6 +878,22 @@
description="Run unit tests on Tomcat 5.0">
<echo message="tomcat.home.50 = ${tomcat.home.50}"/>
<ant antfile="build-tests.xml" target="test.tomcat.50"/>
+ </target>
+
+
+ <target name="skip.tomcat.55" unless="tomcat.home.55">
+ <echo message="*****************************************************"/>
+ <echo message="WARNING : Property 'tomcat.home.55' has not been set."/>
+ <echo message=" No test will be run on that servlet engine."/>
+ <echo message="*****************************************************"/>
+ <echo message=""/>
+ </target>
+
+ <target name="test.tomcat.55" if="tomcat.home.55"
+ depends="skip.tomcat.55,compile.library"
+ description="Run unit tests on Tomcat 5.5">
+ <echo message="tomcat.home.55 = ${tomcat.home.55}"/>
+ <ant antfile="build-tests.xml" target="test.tomcat.55"/>
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org