Index: integration/ant/build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/ant/build.xml,v
retrieving revision 1.61
diff -u -r1.61 build.xml
--- integration/ant/build.xml	26 Apr 2005 09:57:59 -0000	1.61
+++ integration/ant/build.xml	21 Jul 2005 10:55:11 -0000
@@ -170,6 +170,8 @@
         comment="Cactus Tasks for Ant">
       <entry key="cactifywar"
           value="org.apache.cactus.integration.ant.CactifyWarTask"/>
+      <entry key="cactustests"
+          value="org.apache.cactus.integration.ant.CactusTestTask"/>
       <entry key="cactifyear"
       	  value="org.apache.cactus.integration.ant.CactifyEarTask"/>
       <entry key="cactus"
@@ -239,6 +241,8 @@
         comment="Cactus Tasks for Ant">
       <entry key="cactifywar"
           value="org.apache.cactus.integration.ant.CactifyWarTask"/>
+      <entry key="cactustests"
+          value="org.apache.cactus.integration.ant.CactusTestTask"/>
       <entry key="cactus"
           value="org.apache.cactus.integration.ant.CactusTask"/>
       <entry key="runservertests"
Index: integration/ant/src/java/org/apache/cactus/integration/ant/CactusTestTask.java
===================================================================
RCS file: integration/ant/src/java/org/apache/cactus/integration/ant/CactusTestTask.java
diff -N integration/ant/src/java/org/apache/cactus/integration/ant/CactusTestTask.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ integration/ant/src/java/org/apache/cactus/integration/ant/CactusTestTask.java	21 Jul 2005 10:55:15 -0000
@@ -0,0 +1,517 @@
+/* 
+ * ========================================================================
+ * 
+ * Copyright 2003-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ * ========================================================================
+ */
+package org.apache.cactus.integration.ant;
+
+import java.util.Enumeration;
+import java.util.PropertyResourceBundle;
+import java.util.ResourceBundle;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.MalformedURLException;
+
+import org.apache.cactus.integration.ant.deployment.DeployableFile;
+import org.apache.cactus.integration.ant.deployment.EarParser;
+import org.apache.cactus.integration.ant.deployment.WarParser;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.taskdefs.optional.junit.JUnitTask;
+import org.apache.tools.ant.taskdefs.optional.junit.JUnitTest;
+import org.apache.tools.ant.types.Path;
+import org.apache.tools.ant.types.Environment.Variable;
+
+/**
+ * An Ant task that extends the optional JUnit task to provide support for
+ * in-container testing. 
+ * This class is a refactor of CactusTask v.133 and
+ * RunContainerTask v.133 to use cargo
+ * 
+ * @version $Id: PerformTestsTask.java,v 1.0 2005/07/14 07:03:49 xnguyen Exp $
+ */
+public class CactusTestTask extends JUnitTask
+{
+    /**
+     * The context.url element.
+     */
+    private String contextURL;
+
+    /**
+     * The testreportDir element.
+     */
+    private File toDir;
+
+    /**
+     * The log element.
+     */
+    private File logs;
+
+    /**
+     * The archive that contains the enterprise application that should be
+     * tested.
+     */
+    private File earFile;
+
+    /**
+     * The archive that contains the web-app that is ready to be tested.
+     */
+    private File warFile;
+
+    /**
+     * Additional classpath entries for the classpath that will be used to start
+     * the containers.
+     */
+    private Path additionalClasspath;
+    
+    /**
+     * Timeout after trying to connect(in ms).
+     */
+    private long timeout = 180000;
+    
+    /**
+     * The time interval in milliseconds to sleep between polling the container.
+     */
+    private long checkInterval = 500;
+
+
+    // Constructors -----------------------------------------------------------
+
+    /**
+     * Constructor.
+     * 
+     * @throws Exception
+     *             If the constructor of JUnitTask throws an exception
+     */
+    public CactusTestTask() throws Exception
+    {
+        super();
+    }
+
+    // Public Methods -------------------------------------------------------
+
+    /**
+     * @see org.apache.tools.ant.Task#init()
+     */
+    public void init()
+    {
+        super.init();
+
+        addClasspathEntry("/org/apache/cactus/ServletTestCase.class");
+        addClasspathEntry("/org/apache/commons/logging/Log.class");
+        addClasspathEntry("/org/apache/commons/httpclient/HttpClient.class");
+    }
+
+    /**
+     * @see org.apache.tools.ant.Task#execute()
+     */
+    public void execute() throws BuildException
+    {
+        if (this.contextURL == null)
+        {
+            throw new BuildException(
+                    "You must specify the context url for the module to test");
+        }
+        if (this.toDir == null)
+        {
+            throw new BuildException(
+                    "You must specify the test report directory");
+
+        }
+        if ((this.warFile != null) && (this.earFile != null))
+        {
+            throw new BuildException(
+                    "You must specify either the [warfile] or "
+                            + "the [earfile] attribute but not both");
+        }
+
+        // Parse deployment descriptors for WAR or EAR files
+        DeployableFile deployableFile;
+        if (this.warFile != null)
+        {
+            deployableFile = WarParser.parse(this.warFile);
+        }
+        else
+        {
+            deployableFile = EarParser.parse(this.earFile);
+        }
+
+        addRedirectorNameProperties(deployableFile);
+
+        Variable contextUrlVar = new Variable();
+        contextUrlVar.setKey("cactus.contextURL");
+        contextUrlVar.setValue(contextURL);
+        addSysproperty(contextUrlVar);
+
+        //Setup logs
+        setupLogs();
+        //Run the test cases
+        testInContainer();
+    }
+
+    /**
+     * Extracts the redirector mappings from the deployment descriptor and sets
+     * the corresponding system properties.
+     * 
+     * @param theFile
+     *            The file to deploy in the container
+     */
+    private void addRedirectorNameProperties(DeployableFile theFile)
+    {
+        String filterRedirectorMapping = theFile
+                .getFilterRedirectorMapping();
+        if (filterRedirectorMapping != null)
+        {
+            Variable filterRedirectorVar = new Variable();
+            filterRedirectorVar.setKey("cactus.filterRedirectorName");
+            filterRedirectorVar.setValue(filterRedirectorMapping
+                    .substring(1));
+            addSysproperty(filterRedirectorVar);
+        }
+        else
+        {
+            log("No mapping of the filter redirector found",
+                    Project.MSG_VERBOSE);
+        }
+
+        String jspRedirectorMapping = theFile.getJspRedirectorMapping();
+        if (jspRedirectorMapping != null)
+        {
+            Variable jspRedirectorVar = new Variable();
+            jspRedirectorVar.setKey("cactus.jspRedirectorName");
+            jspRedirectorVar.setValue(jspRedirectorMapping.substring(1));
+            addSysproperty(jspRedirectorVar);
+        }
+        else
+        {
+            log("No mapping of the JSP redirector found",
+                    Project.MSG_VERBOSE);
+        }
+
+        String servletRedirectorMapping = theFile
+                .getServletRedirectorMapping();
+        if (servletRedirectorMapping != null)
+        {
+            Variable servletRedirectorVar = new Variable();
+            servletRedirectorVar.setKey("cactus.servletRedirectorName");
+            servletRedirectorVar.setValue(servletRedirectorMapping
+                    .substring(1));
+            addSysproperty(servletRedirectorVar);
+        }
+        else
+        {
+            throw new BuildException("The WAR has not been cactified");
+        }
+
+    }
+    
+
+    /**
+     * Executes the unit tests in the given container.
+     *  
+     */
+    private void testInContainer()
+    {
+        URL testURL = null;
+        try
+        {
+            testURL = new URL(this.contextURL);
+            
+        }
+        catch (MalformedURLException e)
+        {
+            throw new BuildException("Invalid URL format: " + contextURL);
+        }
+        //Ping the container
+        //Continuously try calling the test URL until it succeeds or
+        // until a timeout is reached (we then throw a build exception).
+        long startTime = System.currentTimeMillis();
+        int responseCode = -1;
+        do
+        {
+            if ((System.currentTimeMillis() - startTime) > this.timeout)
+            {
+                throw new BuildException("Failed to start the container after "
+                    + "more than [" + this.timeout + "] ms. Trying to connect "
+                    + "to the [" + this.contextURL + "] test URL yielded a ["
+                    + responseCode + "] error code. Please run in debug mode "
+                    + "for more details about the error.");
+            }
+            sleep(this.checkInterval);
+            
+            responseCode = testConnectivity(testURL);
+        } while (!isAvailable(responseCode));
+
+        
+        log("Starting up tests", Project.MSG_VERBOSE);
+        try
+        {
+
+            Enumeration tests = getIndividualTests();
+            while (tests.hasMoreElements())
+            {
+                JUnitTest test = (JUnitTest) tests.nextElement();
+                if (test.shouldRun(getProject()))
+                {
+                    test.setTodir(toDir);
+                    execute(test);
+                }
+            }
+        }
+        finally
+        {
+            log("Finishing tests", Project.MSG_VERBOSE);
+
+        }
+    }
+
+    /**
+     * Sets the enterprise application archive that will be tested. It must
+     * already contain the test-cases and the required libraries as a web
+     * module.
+     * 
+     * @param theEarFile
+     *            The EAR file to set
+     */
+    public final void setEarFile(File theEarFile)
+    {
+        if (this.warFile != null)
+        {
+            throw new BuildException(
+                    "You may only specify one of [earfile] and [warfile]");
+        }
+        this.earFile = theEarFile;
+    }
+
+    /**
+     * Sets the web application archive that will be tested. It must already
+     * contain the test-cases and the required libraries.
+     * 
+     * @param theWarFile
+     *            The WAR file to set
+     */
+    public final void setWarFile(File theWarFile)
+    {
+        if (this.earFile != null)
+        {
+            throw new BuildException(
+                    "You may only specify one of [earfile] and [warfile]");
+        }
+        this.warFile = theWarFile;
+    }
+
+    /**
+     * Sets the context url that will be tested.
+     * 
+     * @param theContextURL
+     *            The context
+     */
+    public final void setContextURL(String theContextURL)
+    {
+        this.contextURL = theContextURL;
+    }
+
+    /**
+     * Sets the web application archive that should be cactified.
+     * 
+     * @param theToDir
+     *            The test report to set
+     */
+    public final void setToDir(File theToDir)
+    {
+        this.toDir = theToDir;
+    }
+    /**
+     * Sets the web application archive that should be cactified.
+     * 
+     * @param theLogs
+     *            Different logs define
+     */
+    public final void setLogs(File theLogs)
+    {
+        this.logs = theLogs;
+    }
+    // Private Methods ---------------------------------------------------------
+
+    /**
+     * Tests whether we are able to connect to the HTTP server identified by the
+     * specified URL.
+     * 
+     * @param theUrl The URL to check
+     * @return the HTTP response code or -1 if no connection could be 
+     *         established
+     */
+    private int testConnectivity(URL theUrl)
+    {
+        int code;
+        try
+        {
+            HttpURLConnection connection = 
+                (HttpURLConnection) theUrl.openConnection();
+            connection.setRequestProperty("Connection", "close");
+            connection.connect();
+            readFully(connection);
+            connection.disconnect();
+            code = connection.getResponseCode();
+        }
+        catch (IOException e)
+        {
+            log("Failed to connect to [" + theUrl + "]", Project.MSG_DEBUG);
+            code = -1;
+        }
+        return code;
+    }
+
+
+    /**
+     * Tests whether an HTTP return code corresponds to a valid connection
+     * to the test URL or not. Success is 200 up to but excluding 300.
+     * 
+     * @param theCode the HTTP response code to verify
+     * @return <code>true</code> if the test URL could be called without error,
+     *         <code>false</code> otherwise
+     */
+    private boolean isAvailable(int theCode)
+    {
+        boolean result;
+        if ((theCode != -1) && (theCode < 300)) 
+        {
+            result = true;            
+        }
+        else
+        {
+            result = false;
+        }
+        return result;
+    }
+
+    /**
+     * Retrieves the server name of the container.
+     * 
+     * @param theUrl The URL to retrieve
+     * @return The server name, or <code>null</code> if the server name could 
+     *         not be retrieved
+     */
+    private String retrieveServerName(URL theUrl)
+    {
+        String retVal = null;
+        try
+        {
+            HttpURLConnection connection = 
+                (HttpURLConnection) theUrl.openConnection();
+            connection.connect();
+            retVal = connection.getHeaderField("Server");
+            connection.disconnect();
+        }
+        catch (IOException e)
+        {
+            log("Could not get server name from [" 
+                + theUrl + "]", Project.MSG_DEBUG);
+        }
+        return retVal;
+    }
+
+    /**
+     * Fully reads the input stream from the passed HTTP URL connection to
+     * prevent (harmless) server-side exception.
+     *
+     * @param theConnection the HTTP URL connection to read from
+     * @exception IOException if an error happens during the read
+     */
+    static void readFully(HttpURLConnection theConnection)
+                   throws IOException
+    {
+        // Only read if there is data to read ... The problem is that not
+        // all servers return a content-length header. If there is no header
+        // getContentLength() returns -1. It seems to work and it seems
+        // that all servers that return no content-length header also do
+        // not block on read() operations!
+        if (theConnection.getContentLength() != 0)
+        {
+            byte[] buf = new byte[256];
+            InputStream in = theConnection.getInputStream();
+            while (in.read(buf) != -1)
+            {
+                // Make sure we read all the data in the stream
+            }
+        }
+    }
+
+    /**
+     * Pauses the current thread for the specified amount.
+     *
+     * @param theMs The time to sleep in milliseconds
+     * @throws BuildException If the sleeping thread is interrupted
+     */
+    private void sleep(long theMs) throws BuildException
+    {
+        try
+        {
+            Thread.sleep(theMs);
+        }
+        catch (InterruptedException e)
+        {
+            throw new BuildException("Interruption during sleep", e);
+        }
+    }
+    /**
+     * @param theTimeout the timeout after which we stop trying to call the test
+     *        URL.
+     */
+    public void setTimeout(long theTimeout)
+    {
+        this.timeout = theTimeout;
+    }
+    /**
+     * Set up the logs
+     */
+    public void setupLogs()
+    {
+       
+        if (this.logs == null)
+        {
+            throw new BuildException("Missing 'logs' attribute");
+        }
+        
+        ResourceBundle bundle = null;
+        try
+        {
+            bundle = new PropertyResourceBundle(
+                new FileInputStream(this.logs));
+        } 
+        catch (IOException e)
+        {
+            throw new BuildException("Failed to load properties "
+                + "file [" + this.logs + "]");
+        }
+        Enumeration keys = bundle.getKeys();
+        while (keys.hasMoreElements())
+        {
+            String key = (String) keys.nextElement();
+            Variable var = new Variable();
+            var.setKey(key);
+            var.setValue(bundle.getString(key));        
+            super.addSysproperty(var);
+            
+        }
+       
+    }
+}
Index: samples/servlet/src/scripts/share/build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/samples/servlet/src/scripts/share/build.xml,v
retrieving revision 1.32
diff -u -r1.32 build.xml
--- samples/servlet/src/scripts/share/build.xml	21 Jul 2005 03:40:00 -0000	1.32
+++ samples/servlet/src/scripts/share/build.xml	21 Jul 2005 10:55:19 -0000
@@ -116,6 +116,8 @@
       location="../../lib/@junit.jar.name@"/>
   <property name="nekohtml.jar"
       location="../../lib/@nekohtml.jar.name@"/>
+ <property name="cargo.jar"
+      location="../../lib/@cargo.jar.name@"/>
 
   <!-- This is optional and only needed if you wish to debug and use 
        Log4J for logging -->
@@ -151,7 +153,7 @@
 (check your build.properties file)</fail>
 
     <taskdef resource="cactus.tasks" classpathref="cactus.classpath"/>
-
+    <taskdef resource="cargo.tasks" classpathref="cactus.classpath"/>
     <tstamp/>
 
   </target>
@@ -315,144 +317,150 @@
 
   </target>
 
-  <target name="test" depends="test.prepare"
+
+<!-- Start a container  -->
+  <macrodef name="start-container">
+    <attribute name="containerKey"/>
+    <sequential>
+      <mkdir dir="${target.dir}/@{containerKey}"/>
+      <cargo id="@{containerKey}" containerKey="@{containerKey}" action="start"
+          homeDir="${cactus.home.@{containerKey}}"
+          log="${target.dir}/@{containerKey}/cargo_start.log"
+          output="${target.dir}/@{containerKey}/container_start.log">
+  	<configuration>
+        <property name="cargo.servlet.port" value="${cactus.port}"/>
+        <property name="cargo.logging" value="high"/>
+
+        <war warfile="${target.dir}/${project.name.file}-cactified.war"/>
+	</configuration>
+        <!-- Configure Cactus for logging -->
+        <syspropertyset file="${target.dir.normalized}/logging_server.properties"/>
+
+        <!-- Additional jars that will be added to the classpath used to start 
+             the container -->
+        <extraclasspath>
+          <!-- pathelement location="${clover.jar}"/ -->
+        </extraclasspath>
+      </cargo>
+    </sequential>
+  </macrodef>
+<!-- Run JUnit Cactus tests on a running container  -->
+  <macrodef name="run-testcases">
+    <attribute name="containerKey"/>
+    <sequential>
+      <mkdir dir="${target.testreports.dir}"/>
+      <mkdir dir="${target.testreports.dir}/@{containerKey}"/>
+      <cactustests fork="yes" failureproperty="tests.failed" haltonerror="true" contexturl="http://localhost:${cactus.port}/${project.name.file}-cactified" warfile="${target.dir}/${project.name.file}-cactified.war" todir="${target.testreports.dir}/@{containerKey}" logs="${target.dir.normalized}/logging_client.properties">
+
+        <classpath>
+          <path refid="project.classpath"/>
+          <path refid="cactus.classpath"/>
+          <@clover.begin@pathelement location="${clover.jar}"/@clover.end@>
+          <pathelement location="${httpunit.jar}"/>
+          <pathelement location="${nekohtml.jar}"/>
+          <pathelement location="${target.classes.java.dir}"/>
+          <pathelement location="${target.classes.cactus.dir}"/>
+          <pathelement location="${log4j.jar}"/>
+        </classpath>
+        <formatter type="brief" usefile="false"/>
+        <formatter type="xml"/>
+        <batchtest>
+          <fileset dir="${src.cactus.dir}">
+            <!-- Due to some Cactus synchronization bug, the 'unit' tests need
+                 to run before the 'sample' tests -->
+            <include name="**/servlet/unit/Test*.java"/>
+            <exclude name="**/servlet/unit/Test*All.java"/>
+            <!-- Cargo0.5 release has not supported cargo.servlet.security -->
+            <exclude name="**/servlet/unit/TestBasicAuthentication.java"/>
+          </fileset>
+        </batchtest>
+        <batchtest>
+          <fileset dir="${src.cactus.dir}">
+            <include name="**/servlet/Test*.java"/>
+            <exclude name="**/servlet/Test*All.java"/>
+          </fileset>
+        </batchtest>
+      </cactustests>
+    </sequential>
+  </macrodef>
+
+<!-- Stop a container  -->
+  <macrodef name="stop-container">
+    <attribute name="containerKey"/>
+    <sequential>
+      <cargo refid="@{containerKey}" action="stop"
+          log="${target.dir}/@{containerKey}/cargo_stop.log"
+          output="${target.dir}/@{containerKey}/container_stop.log"/>
+    </sequential>
+  </macrodef>
+
+  <!-- Generate JUnit test reports for a container -->
+  <macrodef name="report-container">
+    <attribute name="containerKey"/>
+    <sequential>
+      <junitreport todir="${target.testreports.dir}/@{containerKey}">
+        <fileset dir="${target.testreports.dir}/@{containerKey}"
+            includes="TEST-*.xml"/>
+        <report todir="${target.testreports.dir}/@{containerKey}"
+            format="frames"/>
+      </junitreport>
+    </sequential>
+  </macrodef>
+<!-- Execute tests on a single container -->
+  <macrodef name="test-container-internal-check">
+    <attribute name="containerKey"/>
+    <sequential>
+      <condition property="container.shouldRun">
+        <isset property="cactus.home.@{containerKey}"/>
+      </condition>
+    </sequential>
+  </macrodef>
+
+  <target name="test-container-internal-check">
+    <test-container-internal-check containerKey="${containerKey}"/>
+  </target>
+
+  <target name="test-container-internal-ok" if="container.shouldRun">
+    <echo>Running tests on ${containerKey} container...</echo>
+    <start-container containerKey="${containerKey}"/>
+    <!-- <input>Press Return key to do test ...</input> -->
+    <run-testcases containerKey="${containerKey}"/> 
+    <stop-container containerKey="${containerKey}"/> 
+    <report-container containerKey="${containerKey}"/> 
+
+  </target>
+<target name="test-container-internal-nok" unless="container.shouldRun">
+    <echo>Not running tests on ${containerKey} container as [cactus.home.${containerKey}] property not defined</echo>
+  </target>
+
+  <target name="test-container-internal" 
+      depends="test-container-internal-check,test-container-internal-ok,test-container-internal-nok"/>
+
+  <macrodef name="test-container">
+    <attribute name="containerKey"/>
+    <sequential>
+      <antcall inheritAll="true" inheritRefs="true" target="test-container-internal">
+        <param name="containerKey" value="@{containerKey}"/>
+      </antcall>
+    </sequential>
+  </macrodef>
+
+<target name="test" depends="test.prepare"
       description="Run the tests on the defined containers">
 
-    <!-- Run the tests -->
-    <cactus warfile="${target.dir}/${project.name.file}-cactified.war" 
-        fork="yes" failureproperty="tests.failed" haltonerror="true">
-
-      <!-- Configure the cactus task for logging -->
-      <cactusproperty server="false"
-          propertiesFile="${target.dir.normalized}/logging_client.properties"/>
-      <cactusproperty server="true"
-          propertiesFile="${target.dir.normalized}/logging_server.properties"/>
-
-      <!-- Additional jars that will be added to the classpath used to start the
-           container (in addition to the container jars themseleves which are
-           automatically added by the <cactus> task -->
-      <containerclasspath>
-        <@clover.begin@pathelement location="${clover.jar}"/@clover.end@>
-      </containerclasspath>
+    <!-- Need to add jboss 3.x once it is supported by Cargo:
+    <test-container containerKey="jboss3x"/>-->
 
-      <classpath>
-        <path refid="project.classpath"/>
-        <@clover.begin@pathelement location="${clover.jar}"/@clover.end@>
-        <pathelement location="${httpunit.jar}"/>
-        <pathelement location="${nekohtml.jar}"/>
-        <pathelement location="${target.classes.java.dir}"/>
-        <pathelement location="${target.classes.cactus.dir}"/>
-        <pathelement location="${log4j.jar}"/>
-      </classpath>
+    <test-container containerKey="oc4j9x"/>
+    <test-container containerKey="orion1x"/>
+    <test-container containerKey="orion2x"/>
+    <test-container containerKey="resin2x"/>
+    <test-container containerKey="resin3x"/>
+    <!-- test-container containerKey="tomcat3x"/ -->
+    <test-container containerKey="tomcat4x"/>
+    <test-container containerKey="tomcat5x"/>
+    <test-container containerKey="weblogic8x"/>
 
-      <containerset>
-        <@j2ee13.begin@jboss3x if="cactus.home.jboss3x"
-            dir="${cactus.home.jboss3x}"
-            output="${target.testreports.dir}/jboss3x.out"
-            todir="${target.testreports.dir}/jboss3x"/@j2ee13.end@>
-        <orion1x if="cactus.home.orion1x"
-            dir="${cactus.home.orion1x}" port="${cactus.port}"
-            output="${target.testreports.dir}/orion1x.out"
-            todir="${target.testreports.dir}/orion1x"/>
-        <orion2x if="cactus.home.orion2x"
-            dir="${cactus.home.orion2x}" port="${cactus.port}"
-            output="${target.testreports.dir}/orion2x.out"
-            todir="${target.testreports.dir}/orion2x"/>
-        <resin2x if="cactus.home.resin2x"
-            dir="${cactus.home.resin2x}" port="${cactus.port}"
-            output="${target.testreports.dir}/resin2x.out"
-            todir="${target.testreports.dir}/resin2x"/>
-        <resin3x if="cactus.home.resin3x"
-            dir="${cactus.home.resin3x}" port="${cactus.port}"
-            output="${target.testreports.dir}/resin3x.out"
-            todir="${target.testreports.dir}/resin3x"/>
-        <@j2ee12.begin@tomcat3x if="cactus.home.tomcat3x"
-            dir="${cactus.home.tomcat3x}" port="${cactus.port}"
-            output="${target.testreports.dir}/tomcat3x.out"
-            todir="${target.testreports.dir}/tomcat3x"/@j2ee12.end@>
-        <tomcat4x if="cactus.home.tomcat4x"
-            dir="${cactus.home.tomcat4x}" port="${cactus.port}"
-            output="${target.testreports.dir}/tomcat4x.out"
-            todir="${target.testreports.dir}/tomcat4x"/>
-        <tomcat5x if="cactus.home.tomcat5x"
-            dir="${cactus.home.tomcat5x}" port="${cactus.port}"
-            output="${target.testreports.dir}/tomcat5x.out"
-            todir="${target.testreports.dir}/tomcat5x"/>
-        <weblogic7x if="cactus.home.weblogic7x"
-            dir="${cactus.home.weblogic7x}" port="${cactus.port}"
-            output="${target.testreports.dir}/weblogic7x.out"
-            todir="${target.testreports.dir}/weblogic7x"/>
-      </containerset>
-
-      <formatter type="brief" usefile="false"/>
-      <formatter type="xml"/>
-
-      <batchtest>
-        <fileset dir="${src.cactus.dir}">
-          <!-- Due to some Cactus synchronization bug, the 'unit' tests need
-               to run before the 'sample' tests -->
-          <include name="**/servlet/unit/Test*.java"/>
-          <exclude name="**/servlet/unit/Test*All.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest>
-        <fileset dir="${src.cactus.dir}">
-          <include name="**/servlet/Test*.java"/>
-          <exclude name="**/servlet/Test*All.java"/>
-        </fileset>
-      </batchtest>
-
-    </cactus>
-
-    <!-- Generate the JUnit reports -->
-    <@j2ee13.begin@junitreport todir="${target.testreports.dir}/jboss3x">
-      <fileset dir="${target.testreports.dir}/jboss3x"
-          includes="TEST-*.xml"/>
-      <report todir="${target.testreports.dir}/jboss3x"
-          format="frames"/>
-    </junitreport@j2ee13.end@>
-    <junitreport todir="${target.testreports.dir}/orion1x">
-      <fileset dir="${target.testreports.dir}/orion1x"
-          includes="TEST-*.xml"/>
-      <report todir="${target.testreports.dir}/orion1x"
-          format="frames"/>
-    </junitreport>
-    <junitreport todir="${target.testreports.dir}/orion2x">
-      <fileset dir="${target.testreports.dir}/orion2x"
-          includes="TEST-*.xml"/>
-      <report todir="${target.testreports.dir}/orion2x"
-          format="frames"/>
-    </junitreport>
-    <junitreport todir="${target.testreports.dir}/resin2x">
-      <fileset dir="${target.testreports.dir}/resin2x"
-          includes="TEST-*.xml"/>
-      <report todir="${target.testreports.dir}/resin2x"
-          format="frames"/>
-    </junitreport>
-    <@j2ee12.begin@junitreport todir="${target.testreports.dir}/tomcat3x">
-      <fileset dir="${target.testreports.dir}/tomcat3x"
-          includes="TEST-*.xml"/>
-      <report todir="${target.testreports.dir}/tomcat3x"
-          format="frames"/>
-    </junitreport@j2ee12.end@>
-    <junitreport todir="${target.testreports.dir}/tomcat4x">
-      <fileset dir="${target.testreports.dir}/tomcat4x"
-          includes="TEST-*.xml"/>
-      <report todir="${target.testreports.dir}/tomcat4x"
-          format="frames"/>
-    </junitreport>
-    <junitreport todir="${target.testreports.dir}/tomcat5x">
-      <fileset dir="${target.testreports.dir}/tomcat5x"
-          includes="TEST-*.xml"/>
-      <report todir="${target.testreports.dir}/tomcat5x"
-          format="frames"/>
-    </junitreport>
-    <junitreport todir="${target.testreports.dir}/weblogic7x">
-      <fileset dir="${target.testreports.dir}/weblogic7x"
-          includes="TEST-*.xml"/>
-      <report todir="${target.testreports.dir}/weblogic7x"
-          format="frames"/>
-    </junitreport>
 
     <fail if="tests.failed">At least one test failed!</fail>