Diff of /struts/core/branches/STRUTS_1_2_BRANCH/build-tests.xml

Parent Directory | Revision Log | Patch

--- struts/core/branches/STRUTS_1_2_BRANCH/build-tests.xml	2005/05/06 02:39:35	168501
+++ struts/core/branches/STRUTS_1_2_BRANCH/build-tests.xml	2005/05/06 02:47:10	168502
@@ -93,6 +93,21 @@
     <!-- Output directory for tests -->
     <property name="out.test.dir" value="${build.home}/test"/>
 
+    <!-- cactus lib -->
+    <property name="cactus.lib" value="${cactus.home}/lib"/>
+
+    <!-- Default Cactus Context Scheme -->
+    <property name="cactus.contextScheme" value="http" />
+
+    <!-- Default Cactus Context Host -->
+    <property name="cactus.contextHost"   value="localhost" />
+
+    <!-- Default Cactus Context Port -->
+    <property name="cactus.contextPort"   value="8080" />
+
+    <!-- Default Cactus Context Application -->
+    <property name="cactus.contextApp"    value="test" />
+
     <!-- Context test is taking place on -->
     <property name="cactus.contextURL" value="${cactus.contextScheme}://${cactus.contextHost}:${cactus.contextPort}/${cactus.contextApp}"/>
 
@@ -100,7 +115,11 @@
     <property name="libdir" value="lib" />
 
     <!-- Cactus Test Runner -->
-    <property name="cactus.servertest.class" value="org.apache.cactus.ant.RunServerTestsTask" />
+    <property name="cactus.servertest.class" value="org.apache.cactus.integration.ant.RunServerTestsTask" />
+
+    <!-- Cactus jspRedirector.jsp -->
+    <!-- N.B. The one in cactus home works except for cactus 1.3 (because session="false") -->
+    <property name="cactus.jspRedirector" value="${cactus.home}/web/jspRedirector.jsp" />
     	
     <path id="downloaded.lib.classpath">
       <fileset dir="${libdir}">
@@ -108,6 +127,23 @@
       </fileset>
     </path>
 
+    <path id="cactus.ant.classpath">
+      <fileset dir="${cactus.lib}">
+        <include name="cactus-ant*.jar"/>
+      </fileset>
+    </path>
+
+
+    <path id="cactus.lib.classpath">
+      <fileset dir="${cactus.lib}">
+        <include name="cactus*.jar"/>
+        <exclude name="cactus-ant*.jar"/>
+        <include name="aspectjrt*.jar"/>
+        <include name="httpunit*.jar"/>
+        <include name="commons-httpclient*.jar"/>
+      </fileset>
+    </path>
+
     <!-- Compilation Classpath -->
     <path id="compile.classpath">
       <pathelement location="${build.home}/library/${app.name}.jar"/>
@@ -115,17 +151,16 @@
       <pathelement location="${commons-beanutils.jar}"/>
       <pathelement location="${commons-digester.jar}"/>
       <pathelement location="${commons-fileupload.jar}"/>
-      <pathelement location="${commons-httpclient.jar}"/>
       <pathelement location="${commons-logging.jar}"/>
       <pathelement location="${commons-validator.jar}"/>
-      <pathelement location="${httpunit.jar}"/>
-      <pathelement location="${aspectjrt.jar}"/>
       <pathelement location="${jakarta-oro.jar}"/>
-      <pathelement location="${cactus.jar}"/>
       <pathelement location="${junit.jar}"/>
       <pathelement location="${servlet.jar}"/>
       <pathelement location="${struts.jar}"/>
       <pathelement location="${antlr.jar}"/>
+
+      <!-- cactus lib jars -->
+      <path refid="cactus.lib.classpath"/>
       
 		<!-- this is harmless if not used -->
 		<path refid="downloaded.lib.classpath"/>
@@ -144,7 +179,7 @@
             classname="${cactus.servertest.class}">
 
             <classpath>
-                <pathelement location="${cactus.ant.jar}"/>
+                <path refid="cactus.ant.classpath"/>
                 <pathelement path="${java.class.path}"/>
             </classpath>
         </taskdef>
@@ -208,12 +243,8 @@
         <!-- Copy needed libs in /lib -->
         <copy file="${build.home}/library/${app.name}.jar"
             todir="${out.test.dir}/lib"/>
-        <copy file="${aspectjrt.jar}" todir="${out.test.dir}/lib"/>
-        <copy file="${httpunit.jar}"  todir="${out.test.dir}/lib"/>
         <copy file="${junit.jar}"     todir="${out.test.dir}/lib"/>
         <copy file="${jakarta-oro.jar}"     todir="${out.test.dir}/lib"/>
-        <copy file="${log4j.jar}"     todir="${out.test.dir}/lib"/>
-        <copy file="${cactus.jar}"    todir="${out.test.dir}/lib"/>
         <copy file="${commons-beanutils.jar}"
                                       todir="${out.test.dir}/lib"/>
         <copy file="${commons-digester.jar}"
@@ -222,11 +253,23 @@
                                       todir="${out.test.dir}/lib"/>
         <copy file="${commons-validator.jar}"
                                       todir="${out.test.dir}/lib"/>
+
+        <!-- copy cactus jars -->
+        <copy todir="${out.test.dir}/lib">
+            <fileset dir="${cactus.lib}">
+                <include name="cactus*.jar"/>
+                <exclude name="cactus-ant*.jar"/>
+                <include name="aspectjrt*.jar"/>
+                <include name="httpunit*.jar"/>
+                <include name="log4j*.jar"/>
+            </fileset>
+        </copy>
+
         <war warfile="${out.test.dir}/test.war"
              webxml="${conf.test.dir}/web.xml">
 
-            <!-- copy JspRedirector.jsp from cactus home -->
-            <fileset file="${cactus.home}/web/jspRedirector.jsp"/>
+            <!-- copy JspRedirector.jsp  -->
+            <fileset file="${cactus.jspRedirector}"/>
 
             <!-- copy jsps (except JspRedirector.jsp) -->
             <fileset dir="${web.dir}/test" >