Author: ptahchiev
Date: Sat Feb 2 09:41:15 2008
New Revision: 617840
URL: http://svn.apache.org/viewvc?rev=617840&view=rev
Log:
Changes over the servlet tets so that now they pass.
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/servlet/build.xml
Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/servlet/build.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/servlet/build.xml?rev=617840&r1=617839&r2=617840&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/servlet/build.xml
(original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/servlet/build.xml Sat
Feb 2 09:41:15 2008
@@ -120,9 +120,9 @@
</fileset>
<classes dir="${build.dir}"/>
<lib dir="${ivy.lib.dir}">
- <include name="**.jar"/>
- <exclude name="jsp-api-2.0.jar"/>
- <exclude name="servlet-api-2.5.jar"/>
+ <include name="httpunit-1.6.jar"/>
+ <include name="jstl-1.1.2.jar"/>
+ <include name="standard-1.1.2.jar"/>
</lib>
</war>
</target>
@@ -133,12 +133,10 @@
========================================================================
-->
<target name="cactifywar" depends="package-war">
- <cactifywar srcfile="${servlet.archive.name}"
destfile="${cactified.servlet.archive.name}"
mergewebxml="${basedir}/src/main/webapp/WEB-INF/cactus-web.xml"/>
-
<cactifywar srcfile="${servlet.archive.name}"
destfile="${cactified.servlet.archive.name}"
mergewebxml="${basedir}/src/main/webapp/WEB-INF/cactus-web.xml">
- <classes dir="${build.dir}"/>
+
<!-- Provide a secured servlet redirector in addition to the
default servlet redirector -->
<servletredirector/>
@@ -177,7 +175,7 @@
<cargo containerId="${tomcat.container.id}"
output="${logs.dir}/output.log" log="${logs.dir}/cargo.log">
<zipUrlInstaller
installUrl="http://apache.speedbone.de/tomcat/tomcat-5/v5.5.25/bin/apache-tomcat-5.5.25.zip";
- installDir="target/${tomcat.container.id}"/>
+ installDir="${target.dir}/${tomcat.container.id}"/>
<configuration>
<property
name="cargo.servlet.port" value="${cargo.servlet.port}"/>
<property name="cargo.logging"
value="${cargo.logging}"/>
@@ -194,7 +192,7 @@
</batchtest>
</cactus>
<junitreport todir="${reports.dir}">
- <fileset dir="target/tomcat5x" includes="TEST-*.xml"/>
+ <fileset dir="${target.dir}/${tomcat.container.id}"
includes="TEST-*.xml"/>
<report todir="${reports.dir}" format="frames"/>
</junitreport>
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
