diff --git a/cactus/src/plugin-resources/conf/cactus.properties b/cactus/src/plugin-resources/conf/cactus.properties
deleted file mode 100644
index b69e2da3..00000000
--- a/cactus/src/plugin-resources/conf/cactus.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-# Configuration file for Cactus.
-
-# Each project using Cactus need to have such a file put in the client side
-# CLASSPATH (Meaning the directory containgin this file should be in the client
-# side CLASSPATH, not the file itself of course ... :) )
-
-# Defines the URLs that will be used by Cactus to call it's redirectors.
-# You need to specify in these URLs the webapp context that you use for your
-# application. In the example below, the context is "test".
-
-# Web app Context under which our application to test runs
-cactus.contextURL = http://localhost:@maven.cactus.port@/test
-
-# Default Servlet Redirector Name. Used by ServletTestCase test cases.
-cactus.servletRedirectorName = ServletRedirector
-
-# Default JSP Redirector Name. Used by JspTestCase test cases.
-cactus.jspRedirectorName = JspRedirector
-
-# Default Filter Redirector Name. Used by FilterTestCase test cases.
-cactus.filterRedirectorName = FilterRedirector
diff --git a/cactus/src/plugin-resources/conf/containers/resin2x/resin.conf b/cactus/src/plugin-resources/conf/containers/resin2x/resin.conf
deleted file mode 100644
index dd9a9ceb..00000000
--- a/cactus/src/plugin-resources/conf/containers/resin2x/resin.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-<caucho.com>
-
-  <http-server>
-
-    <app-dir>.</app-dir>
-
-    <http port='@maven.cactus.port@'/>
-
-    <host id=''>
-
-      <authenticator class-name='com.caucho.http.security.XmlAuthenticator'>
-        <init-param user='testuser:testpassword:test'/>
-      </authenticator>
-
-      <war-dir id='.'/>
-
-    </host>
-    
-  </http-server>
-
-</caucho.com>
\ No newline at end of file
diff --git a/cactus/src/plugin-resources/conf/containers/tomcat4x/server.xml b/cactus/src/plugin-resources/conf/containers/tomcat4x/server.xml
deleted file mode 100644
index ab77ff97..00000000
--- a/cactus/src/plugin-resources/conf/containers/tomcat4x/server.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<Server port="8005" shutdown="SHUTDOWN" debug="0">
-
-  <Service name="Tomcat-Standalone">
-
-    <Connector className="org.apache.catalina.connector.http.HttpConnector"
-               port="@maven.cactus.port@" minProcessors="5" maxProcessors="75"
-               acceptCount="10" debug="0"/>
-
-    <Engine name="Standalone" defaultHost="localhost" debug="0">
-
-      <Realm className="org.apache.catalina.realm.MemoryRealm" />
-
-      <Host name="localhost" debug="0" appBase="webapps" unpackWARs="true"
-        autoDeploy="true">
-
-        <Context path="/test" docBase="test" debug="0" reloadable="true" 
-          crossContext="true">
-          
-          <Loader checkInterval="1"/>
-          
-        </Context>
-
-      </Host>
-
-    </Engine>
-
-  </Service>
-
-</Server>
diff --git a/cactus/src/plugin-resources/conf/containers/tomcat4x/tomcat-users.xml b/cactus/src/plugin-resources/conf/containers/tomcat4x/tomcat-users.xml
deleted file mode 100644
index ff0637a2..00000000
--- a/cactus/src/plugin-resources/conf/containers/tomcat4x/tomcat-users.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<tomcat-users>
-  <user name="testuser" password="testpassword" roles="test"/>
-</tomcat-users>
diff --git a/cactus/src/plugin-resources/conf/containers/weblogic7x/DefaultAuthenticatorInit.ldift b/cactus/src/plugin-resources/conf/containers/weblogic7x/DefaultAuthenticatorInit.ldift
deleted file mode 100644
index 114a4c8d..00000000
--- a/cactus/src/plugin-resources/conf/containers/weblogic7x/DefaultAuthenticatorInit.ldift
+++ /dev/null
@@ -1,65 +0,0 @@
-dn: dc=@domain@
-dc: @domain@
-objectclass: top
-objectclass: domain
-
-dn: ou=@realm@, dc=@domain@
-ou: @realm@
-objectclass: top
-objectclass: organizationalUnit
-
-dn: ou=groups,ou=@realm@, dc=@domain@
-ou: groups
-objectclass: organizationalUnit
-objectclass: top
-
-dn: cn=Administrators,ou=groups,ou=@realm@, dc=@domain@
-memberURL: ldap:///ou=groups,ou=@realm@,dc=@domain@??sub?(&(objectclass=person)(wlsMemberOf=cn=Administrators,ou=groups,ou=@realm@,dc=@domain@))
-description: Administrators group
-objectclass: top
-objectclass: groupOfUniqueNames
-objectclass: groupOfURLs
-cn: Administrators
-
-dn: cn=Deployers,ou=groups,ou=@realm@, dc=@domain@
-memberURL: ldap:///ou=groups,ou=@realm@,dc=@domain@??sub?(&(objectclass=person)(wlsMemberOf=cn=Deployers,ou=groups,ou=@realm@,dc=@domain@))
-description: Deployers group
-objectclass: top
-objectclass: groupOfUniqueNames
-objectclass: groupOfURLs
-cn: Deployers
-
-dn: cn=Operators,ou=groups,ou=@realm@, dc=@domain@
-memberURL: ldap:///ou=groups,ou=@realm@,dc=@domain@??sub?(&(objectclass=person)(wlsMemberOf=cn=Operators,ou=groups,ou=@realm@,dc=@domain@))
-description: Operators group
-objectclass: top
-objectclass: groupOfUniqueNames
-objectclass: groupOfURLs
-cn: Operators
-
-dn: cn=Monitors,ou=groups,ou=@realm@, dc=@domain@
-memberURL: ldap:///ou=groups,ou=@realm@,dc=@domain@??sub?(&(objectclass=person)(wlsMemberOf=cn=Monitors,ou=groups,ou=@realm@,dc=@domain@))
-description: Monitors group
-objectclass: top
-objectclass: groupOfUniqueNames
-objectclass: groupOfURLs
-cn: Monitors
-
-dn: ou=people,ou=@realm@, dc=@domain@
-ou: people
-objectclass: organizationalUnit
-objectclass: top
-
-dn: uid=system,ou=people,ou=@realm@, dc=@domain@
-description: system
-objectclass: inetOrgPerson
-objectclass: organizationalPerson
-objectclass: person
-objectclass: top
-cn: system
-sn: system
-userpassword: {ssha}XYqqB9c/6OXoNVCOil7ZRdbb/GSIXVcE
-uid: system
-objectclass: wlsUser
-wlsMemberOf: cn=Administrators,ou=groups,ou=@realm@,dc=@domain@
-
diff --git a/cactus/src/plugin-resources/conf/containers/weblogic7x/SerializedSystemIni.dat b/cactus/src/plugin-resources/conf/containers/weblogic7x/SerializedSystemIni.dat
deleted file mode 100644
index 467266d3..00000000
--- a/cactus/src/plugin-resources/conf/containers/weblogic7x/SerializedSystemIni.dat
+++ /dev/null
@@ -1,2 +0,0 @@
-y�
-
 tf�2�s���"�4��-jj�{���D6b�(
\ No newline at end of file
diff --git a/cactus/src/plugin-resources/conf/containers/weblogic7x/config.xml b/cactus/src/plugin-resources/conf/containers/weblogic7x/config.xml
deleted file mode 100644
index ee9ae2a5..00000000
--- a/cactus/src/plugin-resources/conf/containers/weblogic7x/config.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<Domain Name="testdomain">
-    <Server Name="testserver" NativeIOEnabled="true" ListenPort="@maven.cactus.port@"/>
-</Domain>
diff --git a/cactus/src/plugin-resources/conf/containers/weblogic7x/fileRealm.properties b/cactus/src/plugin-resources/conf/containers/weblogic7x/fileRealm.properties
deleted file mode 100644
index 64b2afa3..00000000
--- a/cactus/src/plugin-resources/conf/containers/weblogic7x/fileRealm.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-#Wed Jun 19 22:19:44 BST 2002
-acl.modify.weblogic.admin.acl=Administrators
-acl.unlockServer.weblogic.admin=Administrators
-user.system=0xa7dc9690ce40f88dac3bdd23cb32588ff5546bb6
-acl.lockServer.weblogic.admin=Administrators
-acl.unlockuser.weblogic.passwordpolicy=Administrators
-acl.shutdown.weblogic.admin=Administrators
-acl.boot.weblogic.server=Administrators,everyone
-group.Administrators=system
diff --git a/cactus/src/plugin-resources/conf/containers/weblogic7x/weblogic.xml b/cactus/src/plugin-resources/conf/containers/weblogic7x/weblogic.xml
deleted file mode 100644
index 0eaaf4ec..00000000
--- a/cactus/src/plugin-resources/conf/containers/weblogic7x/weblogic.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE weblogic-web-app PUBLIC "-//BEA Systems, Inc.//DTD Web Application 6.0//EN" "http://www.bea.com/servers/wls610/dtd/ weblogic-web-jar.dtd">
-
-<weblogic-web-app>
-
-    <security-role-assignment>
-         <role-name>test</role-name>
-         <principal-name>testuser</principal-name>
-    </security-role-assignment>
-
-</weblogic-web-app>
\ No newline at end of file
diff --git a/cactus/src/plugin-resources/conf/excluded.properties b/cactus/src/plugin-resources/conf/excluded.properties
deleted file mode 100644
index 8f5e3915..00000000
--- a/cactus/src/plugin-resources/conf/excluded.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# The list of excluded package paths for the TestCaseClassLoader
-#
-excluded.0=sun.*
-excluded.1=com.sun.*
-excluded.2=org.omg.*
-excluded.3=javax.*
-excluded.4=sunw.*
-excluded.5=java.*
-excluded.6=org.w3c.dom.*
-excluded.7=org.xml.sax.*
-excluded.8=net.jini.*
-excluded.9=org.apache.common.logging.*
-excluded.10=org.apache.cactus.*
-excluded.11=com.meterware.httpunit.*
-
diff --git a/cactus/src/plugin-resources/conf/web.xml b/cactus/src/plugin-resources/conf/web.xml
deleted file mode 100644
index d58e9e84..00000000
--- a/cactus/src/plugin-resources/conf/web.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<web-app>
-
-  <!-- Empty web.xml to use when the user project does not provide a web.xml.
-       We need a web.xml in order to perform the merge with our web.xml
-       DVSL template. See plugin.jelly. -->
-  <!-- Note: This web.xml is currently populated with a sample set of settings
-       until we get the merging of a web.xml and the standards values working. -->
-    
-    <filter>
-        <filter-name>FilterRedirector</filter-name>
-        <filter-class>org.apache.cactus.server.FilterTestRedirector</filter-class>
-    </filter>
-
-    <filter-mapping>
-        <filter-name>FilterRedirector</filter-name>
-        <url-pattern>/FilterRedirector</url-pattern>
-    </filter-mapping>
-
-
-    <servlet>
-        <servlet-name>ServletRedirector</servlet-name>
-        <servlet-class>org.apache.cactus.server.ServletTestRedirector</servlet-class>
-    </servlet>
-
-    <servlet>
-        <servlet-name>ServletRedirectorSecure</servlet-name>
-        <servlet-class>org.apache.cactus.server.ServletTestRedirector</servlet-class>
-    </servlet>
-
-    <servlet>
-        <servlet-name>JspRedirector</servlet-name>
-        <jsp-file>/jspRedirector.jsp</jsp-file>
-    </servlet>
-    
-    <servlet-mapping>
-        <servlet-name>ServletRedirector</servlet-name>
-        <url-pattern>/ServletRedirector</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>ServletRedirectorSecure</servlet-name>
-        <url-pattern>/ServletRedirectorSecure</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>JspRedirector</servlet-name>
-        <url-pattern>/JspRedirector</url-pattern>
-    </servlet-mapping>
-
-    <security-constraint>
-       <web-resource-collection>
-          <web-resource-name>SecurityRestriction</web-resource-name>
-           <description>Protect the Cactus redirector servlet.</description>
-           <url-pattern>/ServletRedirectorSecure</url-pattern>
-           <http-method>GET</http-method>
-           <http-method>POST</http-method>
-       </web-resource-collection>
-       <auth-constraint>
-           <description>Authorized Users Group</description>
-           <role-name>test</role-name>
-       </auth-constraint>
-       <user-data-constraint>
-          <transport-guarantee>NONE</transport-guarantee>
-      </user-data-constraint>
-     </security-constraint>
-
-    <login-config>
-      <auth-method>BASIC</auth-method>
-    </login-config>
-
-  <security-role>
-    <description>Test role</description>
-    <role-name>test</role-name>
-  </security-role>       
-</web-app>
diff --git a/cactus/src/plugin-resources/conf/web.xml.dvsl b/cactus/src/plugin-resources/conf/web.xml.dvsl
deleted file mode 100644
index e864e273..00000000
--- a/cactus/src/plugin-resources/conf/web.xml.dvsl
+++ /dev/null
@@ -1,118 +0,0 @@
-## -----------------------------------------------------
-## X M L  R O O T
-## -----------------------------------------------------
-#match ("web-app")
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-    "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app>
-    $context.applyTemplates("icon")
-    $context.applyTemplates("display-name")
-    $context.applyTemplates("description")
-    $context.applyTemplates("distributable")
-    $context.applyTemplates("context-param")
-
-    <filter>
-        <filter-name>FilterRedirector</filter-name>
-        <filter-class>org.apache.cactus.server.FilterTestRedirector</filter-class>
-    </filter>
-
-    $context.applyTemplates("filter")
-
-    <filter-mapping>
-        <filter-name>FilterRedirector</filter-name>
-        <url-pattern>/FilterRedirector</url-pattern>
-    </filter-mapping>
-
-    $context.applyTemplates("filter-mapping")
-    $context.applyTemplates("listener")
-
-    <servlet>
-        <servlet-name>ServletRedirector</servlet-name>
-        <servlet-class>org.apache.cactus.server.ServletTestRedirector</servlet-class>
-    </servlet>
-
-    <servlet>
-        <servlet-name>ServletRedirectorSecure</servlet-name>
-        <servlet-class>org.apache.cactus.server.ServletTestRedirector</servlet-class>
-    </servlet>
-
-    <servlet>
-        <servlet-name>JspRedirector</servlet-name>
-        <jsp-file>/jspRedirector.jsp</jsp-file>
-    </servlet>
-
-    $context.applyTemplates("servlet")
-
-    <servlet-mapping>
-        <servlet-name>ServletRedirector</servlet-name>
-        <url-pattern>/ServletRedirector</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>ServletRedirectorSecure</servlet-name>
-        <url-pattern>/ServletRedirectorSecure</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>JspRedirector</servlet-name>
-        <url-pattern>/JspRedirector</url-pattern>
-    </servlet-mapping>
-
-    $context.applyTemplates("servlet-mapping")
-    $context.applyTemplates("session-config")
-    $context.applyTemplates("mime-mapping")
-    $context.applyTemplates("welcome-file-list")
-    $context.applyTemplates("error-page")
-    $context.applyTemplates("taglib")
-    $context.applyTemplates("resource-env-ref")
-    $context.applyTemplates("resource-ref")
-
-    <security-constraint>
-       <web-resource-collection>
-          <web-resource-name>SecurityRestriction</web-resource-name>
-           <description>Protect the Cactus redirector servlet.</description>
-           <url-pattern>/ServletRedirectorSecure</url-pattern>
-           <http-method>GET</http-method>
-           <http-method>POST</http-method>
-       </web-resource-collection>
-       <auth-constraint>
-           <description>Authorized Users Group</description>
-           <role-name>test</role-name>
-       </auth-constraint>
-       <user-data-constraint>
-          <transport-guarantee>NONE</transport-guarantee>
-      </user-data-constraint>
-     </security-constraint>
-
-    <login-config>
-    	<auth-method>BASIC</auth-method>
-   	</login-config>
-
-	<security-role>
-		<description>Test role</description>
-		<role-name>test</role-name>
-	</security-role>
-
-    $context.applyTemplates("env-entry")
-    $context.applyTemplates("ejb-ref")
-    $context.applyTemplates("ejb-local-ref")
-
-</web-app>
-#end
-
-## -----------------------------------------------------
-## D E F A U L T  C O P Y
-## -----------------------------------------------------
-
-#match( "text()" )$node.value()#end
-#match( "@*" ) $node.name()="$node.value()"#end
-#match("*")
-#if ($node.name() == "source")
-$context.applyTemplates("source");
-#else<$node.name()$context.applyTemplates("@*")>#foreach($n in $node.children())$context.applyTemplates($n)#end</$node.name()>
-#end
-#end
diff --git a/cactus/src/plugin-resources/conf/web/jspRedirector.jsp b/cactus/src/plugin-resources/conf/web/jspRedirector.jsp
deleted file mode 100644
index 923a103e..00000000
--- a/cactus/src/plugin-resources/conf/web/jspRedirector.jsp
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@page import="org.apache.cactus.server.*" session="true" %><%
-
-    /**                                                
-     * Note:
-     * It is very important not to put any character between the end
-     * of the page tag and the beginning of the java code expression, otherwise,
-     * the generated servlet containss a 'out.println("\r\n");' and this breaks
-     * our mechanism !
-     */
-
-    /**
-     * This JSP is used as a proxy to call your server-side unit tests. We use
-     * a JSP rather than a servlet because for testing custom JSP tags for
-     * example we need access to JSP implicit objects (PageContext and
-     * JspWriter).
-     */
-
-    JspImplicitObjects objects = new JspImplicitObjects();
-    objects.setHttpServletRequest(request);
-    objects.setHttpServletResponse(response);
-    objects.setServletConfig(config);
-    objects.setServletContext(application);
-    objects.setJspWriter(out);
-    objects.setPageContext(pageContext);
-
-    JspTestRedirector redirector = new JspTestRedirector();
-    redirector.doGet(objects);
-%>
\ No newline at end of file
diff --git a/cactus/src/plugin-resources/scripts/resin.2x.jelly b/cactus/src/plugin-resources/scripts/resin.2x.jelly
deleted file mode 100644
index 14cffadd..00000000
--- a/cactus/src/plugin-resources/scripts/resin.2x.jelly
+++ /dev/null
@@ -1,185 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-  =============================================================================
-    Script for running Cactus tests in Resin 2.x
-  =============================================================================
--->
-<project xmlns:j="jelly:core">
-
-  <!--
-     ========================================================================
-       Run the Cactus tests in Resin 2.x
-     ========================================================================
-  -->
-  <goal name="cactus:test-resin-2x"
-    description="Run the Cactus tests in Resin 2.x">
-
-    <j:set var="home" value="${maven.cactus.resin2x.home}X"/>
-
-    <!-- Verify Resin home is defined -->
-    <j:choose>
-      <j:when test="${home != 'X'}">
-
-        <echo message="maven.cactus.resin2x.home = ${maven.cactus.resin2x.home}"/>
-      
-        <attainGoal name="cactus:resin-2x-run"/>     	
-
-      </j:when>
-      <j:otherwise>
-      	<echo>Property maven.cactus.resin2x.home is not defined</echo>
-      </j:otherwise>
-    </j:choose>
-
-  </goal>
-
-  <!--
-     ========================================================================
-       Run Resin
-     ========================================================================
-  -->
-  <goal name="cactus:resin-2x-run" prereqs="cactus:setup-resin-2x"
-    description="Start Resin, run the tests, stop Resin">
-
-    <!-- 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 stopped if the tests fail for any reason -->
-
-    <!-- Is Resin 2.x already started? -->
-    <condition property="resin2xstarted">
-      <socket server="localhost" port="${maven.cactus.port}"/>
-    </condition>
-
-    <j:choose>
-      <j:when test="${resin2xstarted == null}">
-        <j:thread>
-          <attainGoal name="cactus:start-resin-2x"/>
-        </j:thread>
-      </j:when>
-      <j:otherwise>
-        <attainGoal name="cactus:redeploy-resin-2x"/>
-      </j:otherwise>
-    </j:choose>
-
-    <waitfor checkevery="500">
-      <http url="http://localhost:${maven.cactus.port}/test/ServletRedirector?Cactus_Service=RUN_TEST"/>
-    </waitfor>
-
-    <attainGoal name="cactus:test-${maven.cactus.testrunner}"/>
-
-    <!-- Only stop if the container was not already started -->
-    <j:if test="${resin2xstarted == null}">
-      <attainGoal name="cactus:stop-resin-2x"/>
-      <waitfor checkevery="500">
-        <not>
-          <http url="http://localhost:${maven.cactus.port}/test/ServletRedirector?Cactus_Service=RUN_TEST"/>
-        </not>
-      </waitfor>
-    </j:if>
-
-  </goal>
-
-  <!--
-     ========================================================================
-       Deploy the test webapp in Resin
-     ========================================================================
-  -->
-  <goal name="cactus:deploy-resin-2x" prereqs="cactus:webapp"
-    description="Deploy the test webapp in Resin">
-
-    <copy todir="${maven.cactus.build.dir}/resin2x/test">
-      <fileset dir="${maven.cactus.build.dir}/${pom.artifactId}"/>
-    </copy>
-
-  </goal>
-
-  <!--
-     ========================================================================
-       Redeploy the test webapp in Resin by only deploying the files in
-       WEB-INF/classes (it is faster)
-     ========================================================================
-  -->
-  <goal name="cactus:redeploy-resin-2x" prereqs="cactus:webapp"
-    description="Redeploy the test webapp in Resin">
-
-    <copy todir="${maven.cactus.build.dir}/resin2x/test">
-      <fileset dir="${maven.cactus.build.dir}/${pom.artifactId}">
-        <include name="WEB-INF/classes/**"/>
-      </fileset>
-    </copy>
-
-  </goal>
-
-  <!--
-     ========================================================================
-       Prepare directories and variables for running the tests
-     ========================================================================
-  -->
-  <goal name="cactus:setup-resin-2x"
-    description="Prepare directories and variables for running the tests">
-
-    <mkdir dir="${maven.cactus.build.dir}/resin2x"/>
-
-    <copy todir="${maven.cactus.build.dir}/resin2x" filtering="on">
-      <fileset dir="${maven.cactus.conf.containers.dir}/resin2x"/>
-      <filterset>
-        <filter token="maven.cactus.port" value="${maven.cactus.port}"/>
-      </filterset>
-    </copy>
-
-  </goal>
-     
-  <!--
-     ========================================================================
-       Start Resin 2.x
-     ========================================================================
-  -->
-  <goal name="cactus:start-resin-2x"
-    prereqs="cactus:setup-resin-2x,cactus:deploy-resin-2x"
-    description="Starts Resin 2.x">
-
-    <java classname="org.apache.cactus.ant.ResinRun" fork="yes">
-
-      <arg value="-start"/>
-      <arg value="-conf"/>
-      <arg value="resin.conf"/>
-
-      <!-- Needed so that Resin use the resin home variable as it's
-           root directory for resolving file paths -->
-      <jvmarg value="-Dresin.home=${maven.cactus.build.dir}/resin2x"/>
-
-      <classpath>
-        <pathelement location="${plugin.getDependencyPath('cactus:cactus-ant')}"/>
-        <fileset dir="${maven.cactus.resin2x.home}/lib">
-          <include name="*.jar"/>
-        </fileset>
-      </classpath>
-
-    </java>
-
-  </goal>
-
-  <!--
-     ========================================================================
-       Stop Resin 2.x
-     ========================================================================
-  -->
-  <goal name="cactus:stop-resin-2x"
-    description="Stops a running Resin 2.x">
-
-    <java classname="org.apache.cactus.ant.ResinRun" fork="yes">
-
-      <arg value="-stop"/>
-
-      <classpath>
-        <pathelement location="${plugin.getDependencyPath('cactus:cactus-ant')}"/>
-        <fileset dir="${maven.cactus.resin2x.home}/lib">
-          <include name="*.jar"/>
-        </fileset>
-      </classpath>
-
-    </java>
-
-  </goal>
-
-</project>
\ No newline at end of file
diff --git a/cactus/src/plugin-resources/scripts/tomcat.4x.jelly b/cactus/src/plugin-resources/scripts/tomcat.4x.jelly
deleted file mode 100644
index 73567f78..00000000
--- a/cactus/src/plugin-resources/scripts/tomcat.4x.jelly
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-  =============================================================================
-    Script for running Cactus tests in Tomcat 4.x
-  =============================================================================
--->
-<project xmlns:j="jelly:core">
-
-  <!--
-     ========================================================================
-       Run the Cactus tests in Tomcat 4.x
-     ========================================================================
-  -->
-  <goal name="cactus:test-tomcat-4x"
-    description="Run the Cactus tests in Tomcat 4.x">
-
-    <j:set var="home" value="${maven.cactus.tomcat4x.home}X"/>
-
-    <!-- Verify Tomcat home is defined -->
-    <j:choose>
-      <j:when test="${home != 'X'}">
-
-        <echo message="maven.cactus.tomcat4x.home = ${maven.cactus.tomcat4x.home}"/>
-        
-        <attainGoal name="cactus:tomcat-4x-run"/>     	
-
-      </j:when>
-      <j:otherwise>
-      	<echo>Property maven.cactus.tomcat4x.home is not defined</echo>
-      </j:otherwise>
-    </j:choose>
-
-  </goal>
-
-  <!--
-     ========================================================================
-       Run the tests
-     ========================================================================
-  -->
-  <goal name="cactus:tomcat-4x-run"
-    description="Start Tomcat, run the tests, stop Tomcat">
-
-    <!-- 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 stopped if the tests fail for any reason -->
-
-    <!-- Is Tomcat 4.x already started? -->
-    <condition property="tomcat4xstarted">
-      <socket server="localhost" port="${maven.cactus.port}"/>
-    </condition>
-    
-    <j:choose>
-      <j:when test="${tomcat4xstarted == null}">
-        <j:thread>
-          <attainGoal name="cactus:start-tomcat-4x"/>
-        </j:thread>
-      </j:when>
-      <j:otherwise>
-        <attainGoal name="cactus:redeploy-tomcat-4x"/>
-      </j:otherwise>
-    </j:choose>
-
-    <waitfor checkevery="500">
-      <http url="http://localhost:${maven.cactus.port}/test/ServletRedirector?Cactus_Service=RUN_TEST"/>
-    </waitfor>
-
-    <attainGoal name="cactus:test-${maven.cactus.testrunner}"/>
-
-    <!-- Only stop if the container was not already started -->
-    <j:if test="${tomcat4xstarted == null}">
-      <attainGoal name="cactus:stop-tomcat-4x"/>
-      <waitfor checkevery="500">
-        <not>
-          <http url="http://localhost:${maven.cactus.port}/test/ServletRedirector?Cactus_Service=RUN_TEST"/>
-        </not>
-      </waitfor>
-    </j:if>
-
-  </goal>
-
-  <!--
-     ========================================================================
-       Deploy the test webapp in Tomcat
-     ========================================================================
-  -->
-  <goal name="cactus:deploy-tomcat-4x" prereqs="cactus:webapp"
-    description="Deploy the test webapp in Tomcat">
-
-    <copy todir="${maven.cactus.build.dir}/tomcat4x/webapps/test">
-      <fileset dir="${maven.cactus.build.dir}/${pom.artifactId}"/>
-    </copy>
-
-  </goal>
-
-  <!--
-     ========================================================================
-       Redeploy the test webapp in Tomcat by only deploying the files in
-       WEB-INF/classes (it is faster)
-     ========================================================================
-  -->
-  <goal name="cactus:redeploy-tomcat-4x" prereqs="cactus:webapp"
-    description="Redeploy the test webapp in Tomcat">
-
-    <copy todir="${maven.cactus.build.dir}/tomcat4x/webapps/test">
-      <fileset dir="${maven.cactus.build.dir}/${pom.artifactId}">
-        <include name="WEB-INF/classes/**"/>
-      </fileset>
-    </copy>
-
-    <!-- Ideally we would need to wait until Tomcat has finished reloading
-         the changes. But apart from using the new Manager in Tomcat 4.1.x
-         I don't know how to do that ... Thus ATM there is a risk that
-         Tomcat will not have picked up the changes when the tests 
-         run... -->
-         
-  </goal>
-     
-  <!--
-     ========================================================================
-       Set up a Tomcat directory structure
-     ========================================================================
-  -->
-  <goal name="cactus:setup-tomcat-4x" 
-    description="Set up a Tomcat directory structure">
-
-    <!-- Create work and conf directories and copy configuration files -->
-    <mkdir dir="${maven.cactus.build.dir}/tomcat4x/conf"/>
-    <mkdir dir="${maven.cactus.build.dir}/tomcat4x/webapps"/>
-
-    <!-- Copy Tomcat configuration files, replacing filter tokens -->
-    <copy todir="${maven.cactus.build.dir}/tomcat4x/conf" filtering="on">
-      <fileset dir="${maven.cactus.conf.containers.dir}/tomcat4x"/>
-      <filterset>
-        <filter token="maven.cactus.port" value="${maven.cactus.port}"/>
-        <filter token="maven.cactus.tomcat4x.home" 
-          value="${maven.cactus.tomcat4x.home}"/>
-      </filterset>
-    </copy>
-
-    <!-- Copy the Tomcat web.xml - We need to copy this file as it has
-         changed between Tomcat 4.x versions and one version of it doesn't
-         work with another version of Tomcat 4 -->
-    <!-- Currently commented out because user's provide their own web.xml 
-    until the merging stuff is working again!
-    <copy file="${maven.cactus.tomcat4x.home}/conf/web.xml"
-      todir="${maven.cactus.build.dir}/tomcat4x/conf"/>
-    -->  
-
-  </goal>
-
-  <!--
-     ========================================================================
-       Start Tomcat 4.x
-     ========================================================================
-  -->
-  <goal name="cactus:start-tomcat-4x" 
-    prereqs="cactus:setup-tomcat-4x,cactus:deploy-tomcat-4x"
-    description="Starts Tomcat 4.x">
-
-    <java classname="org.apache.catalina.startup.Bootstrap" fork="yes">
-
-      <jvmarg value="-Dcatalina.home=${maven.cactus.tomcat4x.home}"/>
-      <jvmarg value="-Dcatalina.base=${maven.cactus.build.dir}/tomcat4x"/>
-
-      <arg value="start"/>
-      <classpath>
-        <pathelement path="${java.home}/../lib/tools.jar"/>
-        <fileset dir="${maven.cactus.tomcat4x.home}">
-          <include name="bin/bootstrap.jar"/>
-        </fileset>
-      </classpath>
-    </java>
-
-  </goal>
-
-  <!--
-     ========================================================================
-       Stop Tomcat 4.x
-     ========================================================================
-  -->
-  <goal name="cactus:stop-tomcat-4x"
-    description="Stops a running Tomcat 4.x">
-
-    <java classname="org.apache.catalina.startup.Bootstrap" fork="yes">
-
-      <jvmarg value="-Dcatalina.home=${maven.cactus.tomcat4x.home}"/>
-      <jvmarg value="-Dcatalina.base=${maven.cactus.build.dir}/tomcat4x"/>
-
-      <arg value="stop"/>
-
-      <classpath>
-        <fileset dir="${maven.cactus.tomcat4x.home}">
-          <include name="bin/bootstrap.jar"/>
-        </fileset>
-      </classpath>
-    </java>
-
-  </goal>
-
-</project>
\ No newline at end of file
diff --git a/cactus/src/plugin-resources/scripts/weblogic.7x.jelly b/cactus/src/plugin-resources/scripts/weblogic.7x.jelly
deleted file mode 100644
index 3a33e5e6..00000000
--- a/cactus/src/plugin-resources/scripts/weblogic.7x.jelly
+++ /dev/null
@@ -1,207 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-  =============================================================================
-    Script for running Cactus tests in WebLogic 7.x
-  =============================================================================
--->
-<project xmlns:j="jelly:core">
-
-  <!--
-     ========================================================================
-       Run the Cactus tests in WebLogic 7.x
-     ========================================================================
-  -->
-  <goal name="cactus:test-weblogic-7x"
-    description="Run the Cactus tests in WebLogic 7.x">
-
-    <j:set var="home" value="${maven.cactus.weblogic7x.home}X"/>
-
-    <!-- Verify Tomcat home is defined -->
-    <j:choose>
-      <j:when test="${home != 'X'}">
-
-        <echo message="maven.cactus.weblogic7x.home = ${maven.cactus.weblogic7x.home}"/>
-        
-        <attainGoal name="cactus:weblogic-7x-run"/>     	
-
-      </j:when>
-      <j:otherwise>
-      	<echo>Property maven.cactus.weblogic7x.home is not defined</echo>
-      </j:otherwise>
-    </j:choose>
-
-  </goal>
-
-  <!--
-     ========================================================================
-       Run the tests
-     ========================================================================
-  -->
-  <goal name="cactus:weblogic-7x-run"
-    description="Start WebLogic, run the tests, stop WebLogic">
-
-    <!-- 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 stopped if the tests fail for any reason -->
-
-    <!-- Is WebLogic 7.x already started? -->
-    <condition property="weblogic7xstarted">
-      <socket server="localhost" port="${maven.cactus.port}"/>
-    </condition>
-    
-    <j:choose>
-      <j:when test="${weblogic7xstarted == null}">
-        <j:thread>
-          <attainGoal name="cactus:start-weblogic-7x"/>
-        </j:thread>
-      </j:when>
-      <j:otherwise>
-        <attainGoal name="cactus:redeploy-weblogic-7x"/>
-      </j:otherwise>
-    </j:choose>
-
-    <waitfor checkevery="500">
-      <http url="http://localhost:${maven.cactus.port}/test/ServletRedirector?Cactus_Service=RUN_TEST"/>
-    </waitfor>
-
-    <attainGoal name="cactus:test-${maven.cactus.testrunner}"/>
-
-    <!-- Only stop if the container was not already started -->
-    <j:if test="${weblogic7xstarted == null}">
-      <attainGoal name="cactus:stop-weblogic-7x"/>
-      <waitfor checkevery="500">
-        <not>
-          <http url="http://localhost:${maven.cactus.port}/test/ServletRedirector?Cactus_Service=RUN_TEST"/>
-        </not>
-      </waitfor>
-    </j:if>
-
-  </goal>
-
-  <!--
-     ========================================================================
-       Deploy the test webapp in WebLogic
-     ========================================================================
-  -->
-  <goal name="cactus:deploy-weblogic-7x" prereqs="cactus:webapp"
-    description="Deploy the test webapp in WebLogic">
-
-    <copy todir="${maven.cactus.build.dir}/weblogic7x/testdomain/applications/test">
-      <fileset dir="${maven.cactus.build.dir}/${pom.artifactId}"/>
-      <!-- Update the war to include the proprietary weblogic.xml config
-           file. -->
-      <fileset dir="${maven.cactus.conf.containers.dir}/weblogic7x">
-        <include name="weblogic.xml"/>
-      </fileset>
-    </copy>
-
-  </goal>
-
-  <!--
-     ========================================================================
-       Redeploy the test webapp in WebLogic
-     ========================================================================
-  -->
-  <goal name="cactus:redeploy-weblogic-7x" prereqs="cactus:webapp"
-    description="Redeploy the test webapp in WebLogic">
-
-    <copy todir="${maven.cactus.build.dir}/tomcat4x/webapps/test">
-      <fileset dir="${maven.cactus.build.dir}/${pom.artifactId}">
-        <include name="WEB-INF/classes/**"/>
-      </fileset>
-    </copy>
-
-  </goal>
-     
-  <!--
-     ========================================================================
-       Set up a WebLogic directory structure
-     ========================================================================
-  -->
-  <goal name="cactus:setup-weblogic-7x" 
-    description="Set up a WebLogic directory structure">
-
-    <mkdir dir="${maven.cactus.build.dir}/weblogic7x/testdomain/applications"/>
-    <mkdir dir="${maven.cactus.build.dir}/weblogic7x/testdomain/testserver"/>
-
-    <!-- Copy WL configuration files -->
-    <copy todir="${maven.cactus.build.dir}/weblogic7x/testdomain" 
-      filtering="on">
-      <fileset dir="${maven.cactus.conf.containers.dir}/weblogic7x">
-        <exclude name="SerializedSystemIni.dat"/>
-        <exclude name="DefaultAuthenticatorInit.ldift"/>
-        <exclude name="weblogic.xml"/>
-      </fileset>
-      <filterset>
-        <filter token="maven.cactus.port" value="${maven.cactus.port}"/>
-        <filter token="maven.cactus.weblogic7x.home" 
-          value="${maven.cactus.weblogic7x.home}"/>
-      </filterset>
-    </copy>
-    <copy todir="${maven.cactus.build.dir}/weblogic7x/testdomain" 
-      filtering="off">
-      <fileset dir="${maven.cactus.conf.containers.dir}/weblogic7x">
-        <include name="SerializedSystemIni.dat"/>
-        <include name="DefaultAuthenticatorInit.ldift"/>
-        <exclude name="weblogic.xml"/>
-      </fileset>
-    </copy>
-
-  </goal>
-
-  <!--
-     ========================================================================
-       Start WebLogic 7.x
-     ========================================================================
-  -->
-  <goal name="cactus:start-weblogic-7x" 
-    prereqs="cactus:setup-weblogic-7x,cactus:deploy-weblogic-7x"
-    description="Starts WebLogic 7.x">
-
-    <java classname="weblogic.Server" fork="yes"
-      dir="${maven.cactus.build.dir}/weblogic7x/testdomain">
-
-      <classpath>
-        <pathelement location="${maven.cactus.weblogic7x.home}/weblogic700/server/lib/weblogic_sp.jar"/>
-        <pathelement location="${maven.cactus.weblogic7x.home}/weblogic700/server/lib/weblogic.jar"/>
-      </classpath>
-
-      <jvmarg value="-hotspot"/>
-      <jvmarg value="-ms64m"/>
-      <jvmarg value="-mx64m"/>
-      <jvmarg value="-Djava.library.path=${java.library.path};${maven.cactus.weblogic7x.home}/weblogic700/server/bin"/>
-      <jvmarg value="-Dweblogic.Name=testserver"/>
-      <jvmarg value="-Dbea.home=${maven.cactus.weblogic7x.home}"/>
-      <jvmarg value="-Dweblogic.management.username=system"/>
-      <jvmarg value="-Dweblogic.management.password=password"/>
-      <jvmarg value="-Djava.security.policy==./server/lib/weblogic.policy"/>
-    </java>
-
-  </goal>
-
-  <!--
-     ========================================================================
-       Stop WebLogic 7.x
-     ========================================================================
-  -->
-  <goal name="cactus:stop-weblogic-7x"
-    description="Stops a running WebLogic 7.x">
-
-    <java classname="weblogic.Admin" fork="yes">
-
-      <classpath>
-        <pathelement location="${maven.cactus.weblogic7x.home}/weblogic700/server/lib/weblogic_sp.jar"/>
-        <pathelement location="${maven.cactus.weblogic7x.home}/weblogic700/server/lib/weblogic.jar"/>
-      </classpath>
-
-      <arg line="-url t3://localhost:${maven.cactus.port}"/>
-      <arg line="-username system"/>
-      <arg line="-password password"/>
-      <arg value="SHUTDOWN"/>
-
-    </java>
-
-  </goal>
-
-</project>
\ No newline at end of file