Author: niallp
Date: Wed Apr 27 21:23:32 2005
New Revision: 165097
URL: http://svn.apache.org/viewcvs?rev=165097&view=rev
Log:
Bug 33989 Fix cactus tests to work with Cactus 1.7 reported by Ralf Hauser
* The package for RunServerTestsTask has changed in Cactus 1.7 - made this
configurable now.
* jspRedirector.jsp has changed in Cactus 1.7 - change the test build to copy
it from ${cactus.home}/web
* add sample Cactus 1.7 properties to build.properties.sample
Modified:
struts/core/branches/STRUTS_1_2_BRANCH/build-tests.xml
struts/core/branches/STRUTS_1_2_BRANCH/build.properties.sample
Modified: struts/core/branches/STRUTS_1_2_BRANCH/build-tests.xml
URL:
http://svn.apache.org/viewcvs/struts/core/branches/STRUTS_1_2_BRANCH/build-tests.xml?rev=165097&r1=165096&r2=165097&view=diff
==============================================================================
--- struts/core/branches/STRUTS_1_2_BRANCH/build-tests.xml (original)
+++ struts/core/branches/STRUTS_1_2_BRANCH/build-tests.xml Wed Apr 27 21:23:32
2005
@@ -98,6 +98,9 @@
<!-- This is only used if you execute "ant download-dependencies" -->
<property name="libdir" value="lib" />
+
+ <!-- Cactus Test Runner -->
+ <property name="cactus.servertest.class"
value="org.apache.cactus.ant.RunServerTestsTask" />
<path id="downloaded.lib.classpath">
<fileset dir="${libdir}">
@@ -138,7 +141,7 @@
<target name="init">
<taskdef name="runservertests"
- classname="org.apache.cactus.ant.RunServerTestsTask">
+ classname="${cactus.servertest.class}">
<classpath>
<pathelement location="${cactus.ant.jar}"/>
@@ -222,7 +225,13 @@
<war warfile="${out.test.dir}/test.war"
webxml="${conf.test.dir}/web.xml">
- <fileset dir="${web.dir}/test"/>
+ <!-- copy JspRedirector.jsp from cactus home -->
+ <fileset file="${cactus.home}/web/jspRedirector.jsp"/>
+
+ <!-- copy jsps (except JspRedirector.jsp) -->
+ <fileset dir="${web.dir}/test" >
+ <exclude name="jspRedirector.jsp" />
+ </fileset>
<classes dir="${out.test.dir}/classes"/>
Modified: struts/core/branches/STRUTS_1_2_BRANCH/build.properties.sample
URL:
http://svn.apache.org/viewcvs/struts/core/branches/STRUTS_1_2_BRANCH/build.properties.sample?rev=165097&r1=165096&r2=165097&view=diff
==============================================================================
--- struts/core/branches/STRUTS_1_2_BRANCH/build.properties.sample (original)
+++ struts/core/branches/STRUTS_1_2_BRANCH/build.properties.sample Wed Apr 27
21:23:32 2005
@@ -282,6 +282,36 @@
commons-httpclient.jar =
${cactus.lib}/commons-httpclient-2.0alpha1-20020606.jar
# -----------------------------------------
+# Cactus 13-1.7 home
+# cactus.home=${apache.home}/jakarta-cactus-13-1.7
+# cactus.lib=${cactus.home}/lib
+
+# Server Test Task class name
+# cactus.servertest.class=org.apache.cactus.integration.ant.RunServerTestsTask
+
+# Cactus jar for the Servlet API corresponding to the servlet.jar file
+# selected above (either 2.2 or 2.3)
+# cactus.jar = ${cactus.lib}/cactus-1.7.jar
+
+# Cactus Ant custom tasks jar
+# cactus.ant.jar = ${cactus.lib}/cactus-ant-1.7.jar
+
+# AspectJ from Cactus distribution
+aspectjrt.jar = ${cactus.lib}/aspectjrt-1.2.1.jar
+
+# The httpunit runtime jar
+# httpunit.jar = ${cactus.lib}/httpunit-1.6.jar
+
+# Log4J has been replaced by commons logging in cactus
+# log4j.jar = ${commons-logging.jar}
+
+# JUnit jar file, version 3.81 or newer required.
+# junit.jar = ${cactus.lib}/junit-3.8.1.jar
+
+# Httpclient from Jakarta-Commons
+# commons-httpclient.jar = ${cactus.lib}/commons-httpclient-2.0.2.jar
+
+# -----------------------------------------
# Scheme used to run tests for cactus, http, https.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
