diff --git a/j2ee/src/plugin-resources/conf/build-enhydra-31.xml b/j2ee/src/plugin-resources/conf/build-enhydra-31.xml
deleted file mode 100644
index 646c2eb0..00000000
--- a/j2ee/src/plugin-resources/conf/build-enhydra-31.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-    <!--
-    ========================================================================
-        E N H Y D R A  3.1
-    ========================================================================
-    -->
-
-    <!--
-       ========================================================================
-         Install and configure Enhydra 3.1 instance
-       ========================================================================
-    -->
-    <target name="install-enhydra-31">
-
-      <!-- Create common directories and copy configuration files -->
-      <mkdir dir="${maven.appserver.dir}/conf"/>
-      <mkdir dir="${maven.appserver.dir}/work"/>
-      <mkdir dir="${maven.appserver.dir}/webapps"/>
-
-      <!-- copy any user configuration files w/ filtering by forcing copy -->
-      <!-- expecting at least multiserver.conf -->
-      <copy todir="${maven.appserver.dir}/conf" overwrite="true" >
-        <fileset dir="${maven.conf.dir}/enhydra31" excludes="**/web.xml"/>
-        <filterset refid="maven.appserver.filterset" />
-      </copy>
-
-      <!-- Note: Enhydra 3.1 does not support automatic war deployment  -->
-      <!-- so any war files will have to be unwared -->
-    </target>
-
-
-    <!--
-       ========================================================================
-         Start Enhydra 3.1
-       ========================================================================
-    -->
-    <target name="start-enhydra-31">
-
-        <java classname="org.apache.cactus.ant.EnhydraRun" fork="yes">
-            <arg value="-start"/>
-            <arg value="${maven.appserver.dir}/conf/multiserver.conf"/>
-            <classpath>
-                <fileset dir="${maven.appserver.home}/lib">
-                    <include name="enhydra.jar"/>
-                    <include name="admin.jar"/>
-                </fileset>
-                <pathelement location="${cactus.ant.jar}"/>
-                <pathelement location="${java.home}/../lib/tools.jar"/>
-            </classpath>
-        </java>
-
-    </target>
-
-    <!--
-       ========================================================================
-         Stop Enhydra 3.1
-       ========================================================================
-    -->
-    <target name="stop-enhydra-31">
-
-        <java classname="org.apache.cactus.ant.EnhydraRun" fork="yes">
-            <arg value="-stop"/>
-            <classpath>
-                <fileset dir="${maven.appserver.home}/lib">
-                    <include name="enhydra.jar"/>
-                    <include name="admin.jar"/>
-                </fileset>
-                <pathelement location="${cactus.ant.jar}"/>
-                <pathelement location="${java.home}/../lib/tools.jar"/>
-            </classpath>
-        </java>
-
-    </target>
-
-
-
diff --git a/j2ee/src/plugin-resources/conf/build-j2ee-12.xml b/j2ee/src/plugin-resources/conf/build-j2ee-12.xml
deleted file mode 100644
index 5d8cc6e9..00000000
--- a/j2ee/src/plugin-resources/conf/build-j2ee-12.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- files included here imply that the build files support j2ee12 -->
-<!-- <!DOCTYPE project [
-    <!ENTITY build-j2ee-share SYSTEM "file:./build-j2ee-share.xml">
-    <!ENTITY build-resin-20 SYSTEM "file:./build-resin-20.xml">
-    <!ENTITY build-resin-12 SYSTEM "file:./build-resin-12.xml">
-    <!ENTITY build-orion-14 SYSTEM "file:./build-orion-14.xml">
-    <!ENTITY build-orion-15 SYSTEM "file:./build-orion-15.xml">
-    <!ENTITY build-tomcat-32 SYSTEM "file:./build-tomcat-32.xml">
-    <!ENTITY build-tomcat-33 SYSTEM "file:./build-tomcat-33.xml">
-    <!ENTITY build-weblogic-51 SYSTEM "file:./build-weblogic-51.xml">
-    <!ENTITY build-enhydra-31 SYSTEM "file:./build-enhydra-31.xml">
-    <!ENTITY build-weblogic-61 SYSTEM "file:./build-weblogic-61.xml">
-]> -->
-
-<!--
-    &build-resin-20;
-    &build-resin-12;
-    &build-orion-14;
-    &build-orion-15;
-    &build-tomcat-32;
-    &build-tomcat-33;
-
-    &build-weblogic-51;
-    &build-enhydra-31;
-    &build-weblogic-61;
--->
-
-<!DOCTYPE project [
-    <!ENTITY build-j2ee-share SYSTEM "file:./build-j2ee-share.xml">
-    <!ENTITY build-tomcat-40 SYSTEM "file:./build-tomcat-40.xml">
-]>
-
-<project name="Application Server Control for Servlet API 2.2" default="init"
-    basedir=".">
-
-    &build-j2ee-share;
-
-    &build-tomcat-40;
-
-</project>
diff --git a/j2ee/src/plugin-resources/conf/build-j2ee-13.xml b/j2ee/src/plugin-resources/conf/build-j2ee-13.xml
deleted file mode 100644
index 977b3428..00000000
--- a/j2ee/src/plugin-resources/conf/build-j2ee-13.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- files included here imply that the build files support j2ee13 -->
-<!--<!ENTITY build-resin-20 SYSTEM "file:./build-resin-20.xml">
-    <!ENTITY build-resin-13 SYSTEM "file:./build-resin-13.xml">
-    <!ENTITY build-orion-14 SYSTEM "file:./build-orion-14.xml">
-    <!ENTITY build-orion-15 SYSTEM "file:./build-orion-15.xml">
-    <!ENTITY build-weblogic-61 SYSTEM "file:./build-weblogic-61.xml">
-    &build-resin-20;
-    &build-resin-13;
-    &build-orion-14;
-    &build-orion-15;
-    &build-weblogic-61;
--->
-
-<!DOCTYPE project [
-    <!ENTITY build-j2ee-share SYSTEM "file:./build-j2ee-share.xml">
-    <!ENTITY build-tomcat-40 SYSTEM "file:./build-tomcat-40.xml">
-
-]>
-
-<!--
-  =============================================================================
-    Build file for installing and controlling aplication server instances
-    using Servlet API 2.3 - J2EE13
--->
-<project name="Application Server Installs for Servlet API 2.3" default="init"
-    basedir=".">
-
-    &build-j2ee-share;
-
-    &build-tomcat-40;
-
-</project>
diff --git a/j2ee/src/plugin-resources/conf/build-j2ee-share.xml b/j2ee/src/plugin-resources/conf/build-j2ee-share.xml
deleted file mode 100644
index 7df724a8..00000000
--- a/j2ee/src/plugin-resources/conf/build-j2ee-share.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-    <!--
-       ========================================================================
-         The filterset used when configuring files for the appserver
-       ========================================================================
-    -->
-    <filterset id="maven.appserver.filterset">
-      <!-- filters must be explicitly listed from properties instead of file  -->
-      <!-- this is due to the user may have overridden these properties and   -->
-      <!-- the fact that properties can't be expanded from a filtersfile      -->
-      <!-- for the user to add more filter tokens, they should use a callback -->
-      <filter token="maven.appserver.name" value="${maven.appserver.name}" />
-      <filter token="maven.appserver.version" value="${maven.appserver.name}" />
-      <filter token="maven.appserver.home" value="${maven.appserver.home}" />
-      <filter token="maven.appserver.dir" value="${maven.appserver.dir}" />
-      <filter token="maven.appserver.host" value="${maven.appserver.host}" />
-      <filter token="maven.appserver.url" value="${maven.appserver.url}" />
-      <filter token="maven.appserver.port.http" value="${maven.appserver.port.http}" />
-      <filter token="maven.appserver.port.https" value="${maven.appserver.port.https}" />
-      <filter token="maven.appserver.port.one" value="${maven.appserver.port.one}" />
-      <filter token="maven.appserver.port.two" value="${maven.appserver.port.two}" />
-      <filter token="maven.appserver.port.three" value="${maven.appserver.port.three}" />
-      <filter token="maven.appserver.classpath" value="${maven.appserver.classpath}" />
-    </filterset>
-
-    <!--
-       ========================================================================
-         Initialize the build. Must be called by all targets
-       ========================================================================
-    -->
-    <target name="init">
-        <tstamp/>
-    </target>
-
-
-
diff --git a/j2ee/src/plugin-resources/conf/build-orion-14.xml b/j2ee/src/plugin-resources/conf/build-orion-14.xml
deleted file mode 100644
index 7c3901e3..00000000
--- a/j2ee/src/plugin-resources/conf/build-orion-14.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-    <!--
-       ========================================================================
-         Run Orion 1.4 tests
-       ========================================================================
-    -->
-    <target name="test.orion.14" depends="prepare.test.orion.14"
-        if="maven.appserver.home" description="Run tests on Orion 1.4">
-
-        <!-- 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 -->
-
-        <runservertests testURL="http://localhost:${test.port}/test"
-            startTarget="start.orion.14"
-            stopTarget="stop.orion.14"
-            testTarget="test"/>
-
-    </target>
-
-    <!--
-       ========================================================================
-         Start Orion 1.4
-       ========================================================================
-    -->
-    <target name="start.orion.14">
-
-        <java classname="com.evermind.server.ApplicationServer" fork="yes">
-            <arg value="-config"/>
-            <arg value="${maven.appserver.dir}/conf/server.xml"/>
-            <classpath>
-              <fileset dir="${maven.appserver.home}">
-                  <include name="*.jar"/>
-              </fileset>
-            </classpath>
-        </java>
-
-    </target>
-
-    <!--
-       ========================================================================
-         Stop Orion 1.4
-       ========================================================================
-    -->
-    <target name="stop.orion.14">
-
-        <java classname="com.evermind.client.orion.OrionConsoleAdmin" fork="yes">
-            <arg value="ormi://localhost:23791/"/>
-            <arg value="admin"/>
-            <arg value="password"/>
-            <arg value="-shutdown"/>
-            <classpath>
-              <fileset dir="${maven.appserver.home}">
-                  <include name="*.jar"/>
-              </fileset>
-            </classpath>
-        </java>
-
-    </target>
-
-    <!--
-       ========================================================================
-         Display a warning message if the needed servlet engine home property
-         is not set
-       ========================================================================
-    -->
-    <target name="check.test.orion.14" unless="maven.appserver.home">
-
-        <echo message=""/>
-        <echo message="******************************************************"/>
-        <echo message="WARNING : The 'maven.appserver.home' property has not been"/>
-        <echo message="set. No test will be run on that servlet engine."/>
-        <echo message="******************************************************"/>
-        <echo message=""/>
-
-    </target>
-
-    <!--
-       ========================================================================
-         Prepare directories and variables for running the tests
-       ========================================================================
-    -->
-    <target name="prepare.test.orion.14"
-        depends="check.test.orion.14,testwar" if="maven.appserver.home">
-
-        <echo message="maven.appserver.home = ${maven.appserver.home}"/>
-
-        <property name="maven.appserver.dir" value="${target.test.dir}/orion14"/>
-        <property name="conf.orion14.dir" value="${conf.test.dir}/orion14"/>
-
-        <!-- Create work and conf directories and copy configuration files -->
-        <mkdir dir="${maven.appserver.dir}"/>
-        <mkdir dir="${maven.appserver.dir}/conf"/>
-
-        <!-- Orion need to have a /persistence directory created, otherwise
-             it throws an error -->
-        <mkdir dir="${maven.appserver.dir}/persistence"/>
-
-        <copy todir="${maven.appserver.dir}/conf" filtering="on">
-            <fileset dir="${conf.orion14.dir}"/>
-        </copy>
-
-        <!-- Copy the war file -->
-        <copy file="${target.test.dir}/test.war"
-            tofile="${maven.appserver.dir}/test.war"/>
-
-    </target>
diff --git a/j2ee/src/plugin-resources/conf/build-orion-15.xml b/j2ee/src/plugin-resources/conf/build-orion-15.xml
deleted file mode 100644
index d77cfb15..00000000
--- a/j2ee/src/plugin-resources/conf/build-orion-15.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-    <!--
-       ========================================================================
-         Run Orion 1.5 tests
-       ========================================================================
-    -->
-    <target name="test.orion.15" depends="prepare.test.orion.15"
-        if="maven.appserver.home" description="Run tests on Orion 1.5">
-
-        <!-- 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 -->
-
-        <runservertests testURL="http://localhost:${test.port}/test"
-            startTarget="start.orion.15"
-            stopTarget="stop.orion.15"
-            testTarget="test"/>
-
-    </target>
-
-    <!--
-       ========================================================================
-         Start Orion 1.5
-       ========================================================================
-    -->
-    <target name="start.orion.15">
-
-        <java classname="com.evermind.server.ApplicationServer" fork="yes">
-            <arg value="-config"/>
-            <arg value="${maven.appserver.dir}/conf/server.xml"/>
-            <classpath>
-              <fileset dir="${maven.appserver.home}">
-                  <include name="*.jar"/>
-              </fileset>
-            </classpath>
-        </java>
-
-    </target>
-
-    <!--
-       ========================================================================
-         Stop Orion 1.5
-       ========================================================================
-    -->
-    <target name="stop.orion.15">
-
-        <java classname="com.evermind.client.orion.OrionConsoleAdmin"
-            fork="yes">
-            <arg value="ormi://localhost:23791/"/>
-            <arg value="admin"/>
-            <arg value="password"/>
-            <arg value="-shutdown"/>
-            <classpath>
-              <fileset dir="${maven.appserver.home}">
-                  <include name="*.jar"/>
-              </fileset>
-            </classpath>
-        </java>
-
-    </target>
-
-    <!--
-       ========================================================================
-         Display a warning message if the needed servlet engine home property
-         is not set
-       ========================================================================
-    -->
-    <target name="check.test.orion.15" unless="maven.appserver.home">
-
-        <echo message=""/>
-        <echo message="******************************************************"/>
-        <echo message="WARNING : The 'maven.appserver.home' property has not been"/>
-        <echo message="set. No test will be run on that servlet engine."/>
-        <echo message="******************************************************"/>
-        <echo message=""/>
-
-    </target>
-
-    <!--
-       ========================================================================
-         Prepare directories and variables for running the tests
-       ========================================================================
-    -->
-    <target name="prepare.test.orion.15"
-        depends="check.test.orion.15,testwar" if="maven.appserver.home">
-
-        <echo message="maven.appserver.home = ${maven.appserver.home}"/>
-
-        <property name="maven.appserver.dir" value="${target.test.dir}/orion15"/>
-        <property name="conf.orion15.dir" value="${conf.test.dir}/orion15"/>
-
-        <!-- Create work and conf directories and copy configuration files -->
-        <mkdir dir="${maven.appserver.dir}"/>
-        <mkdir dir="${maven.appserver.dir}/conf"/>
-
-        <!-- Orion need to have a /persistence directory created, otherwise
-             it throws an error -->
-        <mkdir dir="${maven.appserver.dir}/persistence"/>
-
-        <copy todir="${maven.appserver.dir}/conf" filtering="on">
-            <fileset dir="${conf.orion15.dir}"/>
-        </copy>
-
-        <!-- Copy the war file -->
-        <copy file="${target.test.dir}/test.war"
-            tofile="${maven.appserver.dir}/test.war"/>
-
-    </target>
diff --git a/j2ee/src/plugin-resources/conf/build-resin-12.xml b/j2ee/src/plugin-resources/conf/build-resin-12.xml
deleted file mode 100644
index 1f14ebed..00000000
--- a/j2ee/src/plugin-resources/conf/build-resin-12.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-    <!--
-       ========================================================================
-         Run Resin 1.2 tests
-       ========================================================================
-    -->
-    <target name="test.resin.12" depends="prepare.test.resin.12"
-        if="maven.appserver.home" description="Run tests on Resin 1.2">
-
-        <!-- 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 -->
-
-        <runservertests testURL="http://localhost:${test.port}/test"
-            startTarget="start.resin.12"
-            stopTarget="stop.resin.12"
-            testTarget="test"/>
-
-    </target>
-
-    <!--
-       ========================================================================
-         Start Resin 1.2
-       ========================================================================
-    -->
-    <target name="start.resin.12">
-
-        <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 maven.appserver.home variable as it's
-                 root directory for resolving file paths -->
-            <jvmarg value="-Dresin.home=${maven.appserver.dir}"/>
-
-            <classpath>
-                <pathelement location="${cactus.ant.jar}"/>
-                <fileset dir="${maven.appserver.home}/lib">
-                    <include name="*.jar"/>
-                </fileset>
-            </classpath>
-
-        </java>
-
-    </target>
-
-    <!--
-       ========================================================================
-         Stop Resin 1.2
-       ========================================================================
-    -->
-    <target name="stop.resin.12">
-
-        <java classname="org.apache.cactus.ant.ResinRun" fork="yes">
-
-            <arg value="-stop"/>
-
-            <classpath>
-                <pathelement location="${cactus.ant.jar}"/>
-                <fileset dir="${maven.appserver.home}/lib">
-                    <include name="*.jar"/>
-                </fileset>
-            </classpath>
-
-        </java>
-
-    </target>
-
-    <!--
-       ========================================================================
-         Display a warning message if the needed servlet engine home property
-         is not set
-       ========================================================================
-    -->
-    <target name="check.test.resin.12" unless="maven.appserver.home">
-
-        <echo message=""/>
-        <echo message="******************************************************"/>
-        <echo message="WARNING : The 'maven.appserver.home' property has not been "/>
-        <echo message="set. No test will be run on that servlet engine."/>
-        <echo message="******************************************************"/>
-        <echo message=""/>
-
-    </target>
-
-    <!--
-       ========================================================================
-         Prepare directories and variables for running the tests
-       ========================================================================
-    -->
-    <target name="prepare.test.resin.12"
-        depends="check.test.resin.12,testwar" if="maven.appserver.home">
-
-        <echo message="maven.appserver.home = ${maven.appserver.home}"/>
-
-        <property name="maven.appserver.dir" value="${target.test.dir}/resin12"/>
-        <property name="conf.resin12.dir" value="${conf.test.dir}/resin12"/>
-
-        <mkdir dir="${maven.appserver.dir}"/>
-
-        <!-- Copy resin configuration files -->
-        <copy file="${conf.resin12.dir}/resin.conf"
-            tofile="${maven.appserver.dir}/resin.conf" filtering="on"/>
-
-        <!-- Create the war file -->
-        <copy file="${target.test.dir}/test.war"
-            tofile="${maven.appserver.dir}/test.war"/>
-
-    </target>
diff --git a/j2ee/src/plugin-resources/conf/build-resin-13.xml b/j2ee/src/plugin-resources/conf/build-resin-13.xml
deleted file mode 100644
index 9ec91d4a..00000000
--- a/j2ee/src/plugin-resources/conf/build-resin-13.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-    <!--
-       ========================================================================
-         Run Resin 1.3 tests
-       ========================================================================
-    -->
-    <target name="test.resin.13" depends="prepare.test.resin.13"
-        if="maven.appserver.home" description="Run tests on Resin 1.3">
-
-        <!-- 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 -->
-
-        <runservertests testURL="http://localhost:${test.port}/test"
-            startTarget="start.resin.13"
-            stopTarget="stop.resin.13"
-            testTarget="test"/>
-
-    </target>
-
-    <!--
-       ========================================================================
-         Start Resin 1.3
-       ========================================================================
-    -->
-    <target name="start.resin.13">
-
-        <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 maven.appserver.home variable as it's
-                 root directory for resolving file paths -->
-            <jvmarg value="-Dresin.home=${maven.appserver.dir}"/>
-
-            <classpath>
-                <pathelement location="${cactus.ant.jar}"/>
-                <fileset dir="${maven.appserver.home}/lib">
-                    <include name="*.jar"/>
-                </fileset>
-            </classpath>
-
-        </java>
-
-    </target>
-
-    <!--
-       ========================================================================
-         Stop Resin 1.3
-       ========================================================================
-    -->
-    <target name="stop.resin.13">
-
-        <java classname="org.apache.cactus.ant.ResinRun" fork="yes">
-
-            <arg value="-stop"/>
-
-            <classpath>
-                <pathelement location="${cactus.ant.jar}"/>
-                <fileset dir="${maven.appserver.home}/lib">
-                    <include name="*.jar"/>
-                </fileset>
-            </classpath>
-
-        </java>
-
-    </target>
-
-    <!--
-       ========================================================================
-         Display a warning message if the needed servlet engine home property
-         is not set
-       ========================================================================
-    -->
-    <target name="check.test.resin.13" unless="maven.appserver.home">
-
-        <echo message=""/>
-        <echo message="******************************************************"/>
-        <echo message="WARNING : The 'maven.appserver.home' property has not been "/>
-        <echo message="set. No test will be run on that servlet engine."/>
-        <echo message="******************************************************"/>
-        <echo message=""/>
-
-    </target>
-
-    <!--
-       ========================================================================
-         Prepare directories and variables for running the tests
-       ========================================================================
-    -->
-    <target name="prepare.test.resin.13"
-        depends="check.test.resin.13,testwar" if="maven.appserver.home">
-
-        <echo message="maven.appserver.home = ${maven.appserver.home}"/>
-
-        <property name="maven.appserver.dir" value="${target.test.dir}/resin13"/>
-        <property name="conf.resin13.dir" value="${conf.test.dir}/resin13"/>
-
-        <mkdir dir="${maven.appserver.dir}"/>
-
-        <!-- Copy resin configuration files -->
-        <copy file="${conf.resin13.dir}/resin.conf"
-            tofile="${maven.appserver.dir}/resin.conf" filtering="on"/>
-
-        <!-- Create the war file -->
-        <copy file="${target.test.dir}/test.war"
-            tofile="${maven.appserver.dir}/test.war"/>
-
-    </target>
diff --git a/j2ee/src/plugin-resources/conf/build-resin-20.xml b/j2ee/src/plugin-resources/conf/build-resin-20.xml
deleted file mode 100644
index 842f9563..00000000
--- a/j2ee/src/plugin-resources/conf/build-resin-20.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-    <!--
-       ========================================================================
-         Run Resin 2.0 tests
-       ========================================================================
-    -->
-    <target name="test.resin.20" depends="prepare.test.resin.20"
-        if="maven.appserver.home" description="Run tests on Resin 2.0">
-
-        <!-- 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 -->
-
-        <runservertests testURL="http://localhost:${test.port}/test"
-            startTarget="start.resin.20"
-            stopTarget="stop.resin.20"
-            testTarget="test"/>
-
-    </target>
-
-    <!--
-       ========================================================================
-         Start Resin 2.0
-       ========================================================================
-    -->
-    <target name="start.resin.20">
-
-        <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 maven.appserver.home variable as it's
-                 root directory for resolving file paths -->
-            <jvmarg value="-Dresin.home=${maven.appserver.dir}"/>
-
-            <classpath>
-                <pathelement location="${cactus.ant.jar}"/>
-                <fileset dir="${maven.appserver.home}/lib">
-                    <include name="*.jar"/>
-                </fileset>
-            </classpath>
-
-        </java>
-
-    </target>
-
-    <!--
-       ========================================================================
-         Stop Resin 2.0
-       ========================================================================
-    -->
-    <target name="stop.resin.20">
-
-        <java classname="org.apache.cactus.ant.ResinRun" fork="yes">
-
-            <arg value="-stop"/>
-
-            <classpath>
-                <pathelement location="${cactus.ant.jar}"/>
-                <fileset dir="${maven.appserver.home}/lib">
-                    <include name="*.jar"/>
-                </fileset>
-            </classpath>
-
-        </java>
-
-    </target>
-
-    <!--
-       ========================================================================
-         Display a warning message if the needed servlet engine home property
-         is not set
-       ========================================================================
-    -->
-    <target name="check.test.resin.20" unless="maven.appserver.home">
-
-        <echo message=""/>
-        <echo message="******************************************************"/>
-        <echo message="WARNING : The 'maven.appserver.home' property has not been"/>
-        <echo message="set. No test will be run on that servlet engine."/>
-        <echo message="******************************************************"/>
-        <echo message=""/>
-
-    </target>
-
-    <!--
-       ========================================================================
-         Prepare directories and variables for running the tests
-       ========================================================================
-    -->
-    <target name="prepare.test.resin.20"
-        depends="check.test.resin.20,testwar" if="maven.appserver.home">
-
-        <echo message="maven.appserver.home = ${maven.appserver.home}"/>
-
-        <property name="maven.appserver.dir" value="${target.test.dir}/resin20"/>
-        <property name="conf.resin20.dir" value="${conf.test.dir}/resin20"/>
-
-        <mkdir dir="${maven.appserver.dir}"/>
-
-        <!-- Copy resin configuration files -->
-        <copy file="${conf.resin20.dir}/resin.conf"
-            tofile="${maven.appserver.dir}/resin.conf" filtering="on"/>
-
-        <!-- Create the war file -->
-        <copy file="${target.test.dir}/test.war"
-            tofile="${maven.appserver.dir}/test.war"/>
-
-    </target>
-
diff --git a/j2ee/src/plugin-resources/conf/build-tomcat-32.xml b/j2ee/src/plugin-resources/conf/build-tomcat-32.xml
deleted file mode 100644
index a52bfb36..00000000
--- a/j2ee/src/plugin-resources/conf/build-tomcat-32.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-    <!--
-       ========================================================================
-         Run Tomcat 3.2 tests
-       ========================================================================
-    -->
-    <target name="test.tomcat.32" depends="prepare.test.tomcat.32"
-        if="maven.appserver.home" description="Run tests on Tomcat 3.2">
-
-        <!-- 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 -->
-
-        <runservertests testURL="http://localhost:${test.port}/test"
-            startTarget="start.tomcat.32"
-            stopTarget="stop.tomcat.32"
-            testTarget="test"/>
-
-    </target>
-
-    <!--
-       ========================================================================
-         Start Tomcat 3.2
-       ========================================================================
-    -->
-    <target name="start.tomcat.32">
-
-        <java classname="org.apache.tomcat.startup.Tomcat" fork="yes">
-            <arg value="-config"/>
-            <arg value="${maven.appserver.dir}/conf/server.xml"/>
-            <classpath>
-                <pathelement location="${java.home}/../lib/tools.jar"/>
-                <fileset dir="${maven.appserver.home}/lib">
-                    <include name="*.jar"/>
-                </fileset>
-            </classpath>
-        </java>
-
-    </target>
-
-    <!--
-       ========================================================================
-         Stop Tomcat 3.2
-       ========================================================================
-    -->
-    <target name="stop.tomcat.32">
-
-        <java classname="org.apache.tomcat.startup.Tomcat" fork="yes">
-            <jvmarg value="-Dtomcat.home=${maven.appserver.home}"/>
-            <arg value="-stop"/>
-            <arg value="-config"/>
-            <arg value="${maven.appserver.dir}/conf/server.xml"/>
-            <classpath>
-                <pathelement location="${java.home}/../lib/tools.jar"/>
-                <fileset dir="${maven.appserver.home}/lib">
-                    <include name="*.jar"/>
-                </fileset>
-            </classpath>
-        </java>
-
-    </target>
-
-    <!--
-       ========================================================================
-         Display a warning message if the needed servlet engine home property
-         is not set
-       ========================================================================
-    -->
-    <target name="check.test.tomcat.32" unless="maven.appserver.home">
-
-        <echo message=""/>
-        <echo message="******************************************************"/>
-        <echo message="WARNING : The 'maven.appserver.home' property has not been "/>
-        <echo message="set. No test will be run on that servlet engine."/>
-        <echo message="******************************************************"/>
-        <echo message=""/>
-
-    </target>
-
-    <!--
-       ========================================================================
-         Prepare directories and variables for running the tests
-       ========================================================================
-    -->
-    <target name="prepare.test.tomcat.32"
-        depends="check.test.tomcat.32,testwar" if="maven.appserver.home">
-
-        <echo message="maven.appserver.home = ${maven.appserver.home}"/>
-
-        <property name="maven.appserver.dir"
-            value="${target.test.dir}/tomcat32"/>
-        <property name="conf.tomcat32.dir" value="${conf.test.dir}/tomcat32"/>
-        <filter token="maven.appserver.dir" value="${maven.appserver.dir}"/>
-
-        <!-- Create work and conf directories and copy configuration files -->
-        <mkdir dir="${maven.appserver.dir}/conf"/>
-        <mkdir dir="${maven.appserver.dir}/work"/>
-        <mkdir dir="${maven.appserver.dir}/webapps"/>
-
-        <!-- Delete some config file so that they will be copied every time -->
-        <delete file="${maven.appserver.dir}/conf/testserver.xml"/>
-
-        <!-- Delete the expanded war so that the new one is picked up -->
-        <delete dir="${maven.appserver.dir}/webapps"/>
-
-        <!-- Copy the default tomcat web.xml to our test conf/ directory.
-             This is needed otherwise tomcat does not start -->
-        <copy file="${maven.appserver.home}/conf/web.xml"
-            tofile="${maven.appserver.dir}/conf/web.xml"/>
-
-        <copy file="${conf.tomcat32.dir}/server.xml"
-            tofile="${maven.appserver.dir}/conf/server.xml" filtering="on"/>
-
-        <!-- Copy the war file -->
-        <copy file="${target.test.dir}/test.war"
-            tofile="${maven.appserver.dir}/webapps/test.war"/>
-
-    </target>
diff --git a/j2ee/src/plugin-resources/conf/build-tomcat-33.xml b/j2ee/src/plugin-resources/conf/build-tomcat-33.xml
deleted file mode 100644
index a0623641..00000000
--- a/j2ee/src/plugin-resources/conf/build-tomcat-33.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-    <!--
-       ========================================================================
-         Run Tomcat 3.3 tests
-       ========================================================================
-    -->
-    <target name="test.tomcat.33" depends="prepare.test.tomcat.33"
-        if="maven.appserver.home" description="Run tests on Tomcat 3.3">
-
-        <!-- 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 -->
-
-        <runservertests testURL="http://localhost:${test.port}/test"
-            startTarget="start.tomcat.33"
-            stopTarget="stop.tomcat.33"
-            testTarget="test"/>
-
-    </target>
-
-    <!--
-       ========================================================================
-         Start Tomcat 3.3
-       ========================================================================
-    -->
-    <target name="start.tomcat.33">
-
-        <java classname="org.apache.tomcat.startup.Main" fork="yes">
-            <jvmarg value="-Dtomcat.home=${target.tomcat33.full.dir}"/>
-            <jvmarg value="-Dtomcat.install=${maven.appserver.home}"/>
-            <arg value="start"/>
-            <classpath>
-                <fileset dir="${maven.appserver.home}/lib">
-                    <include name="tomcat.jar"/>
-                </fileset>
-            </classpath>
-        </java>
-
-    </target>
-
-    <!--
-       ========================================================================
-         Stop Tomcat 3.3
-       ========================================================================
-    -->
-    <target name="stop.tomcat.33">
-
-        <java classname="org.apache.tomcat.startup.Main" fork="yes">
-            <jvmarg value="-Dtomcat.home=${target.tomcat33.full.dir}"/>
-            <jvmarg value="-Dtomcat.install=${maven.appserver.home}"/>
-            <arg value="stop"/>
-            <classpath>
-                <fileset dir="${maven.appserver.home}/lib">
-                    <include name="tomcat.jar"/>
-                </fileset>
-            </classpath>
-        </java>
-
-    </target>
-
-    <!--
-       ========================================================================
-         Display a warning message if the needed servlet engine home property
-         is not set
-       ========================================================================
-    -->
-    <target name="check.test.tomcat.33" unless="maven.appserver.home">
-
-        <echo message=""/>
-        <echo message="******************************************************"/>
-        <echo message="WARNING : The 'maven.appserver.home' property has not been "/>
-        <echo message="set. No test will be run on that servlet engine."/>
-        <echo message="******************************************************"/>
-        <echo message=""/>
-
-    </target>
-
-    <!--
-       ========================================================================
-         Prepare directories and variables for running the tests
-       ========================================================================
-    -->
-    <target name="prepare.test.tomcat.33"
-        depends="check.test.tomcat.33,testwar" if="maven.appserver.home">
-
-        <echo message="maven.appserver.home = ${maven.appserver.home}"/>
-
-        <property name="maven.appserver.dir"
-            value="${target.test.dir}/tomcat33"/>
-        <property name="conf.tomcat33.dir" value="${conf.test.dir}/tomcat33"/>
-        <property name="target.tomcat33.full.dir"
-            value="${basedir}/${maven.appserver.dir}"/>
-        <filter token="maven.appserver.dir" value="${maven.appserver.dir}"/>
-
-        <!-- Delete everything -->
-        <delete dir="${maven.appserver.dir}/webapps"/>
-
-        <!-- Create work and conf directories and copy configuration files -->
-        <mkdir dir="${maven.appserver.dir}/conf"/>
-        <mkdir dir="${maven.appserver.dir}/work"/>
-        <mkdir dir="${maven.appserver.dir}/webapps"/>
-
-        <copy todir="${maven.appserver.dir}/conf" filtering="on">
-            <fileset dir="${conf.tomcat33.dir}"/>
-        </copy>
-
-        <!-- Copy the war file -->
-        <copy file="${target.test.dir}/test.war"
-            tofile="${maven.appserver.dir}/webapps/test.war"/>
-
-    </target>
diff --git a/j2ee/src/plugin-resources/conf/build-weblogic-51.xml b/j2ee/src/plugin-resources/conf/build-weblogic-51.xml
deleted file mode 100644
index 1fb40134..00000000
--- a/j2ee/src/plugin-resources/conf/build-weblogic-51.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-    <!--
-       ========================================================================
-         Run WebLogic 5.1 tests
-       ========================================================================
-    -->
-    <target name="test.weblogic.51" depends="prepare.test.weblogic.51"
-        if="maven.appserver.home" description="Run tests on WebLogic 5.1">
-
-        <!-- 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 -->
-
-        <runservertests testURL="http://localhost:${test.port}/test"
-            startTarget="start.weblogic.51"
-            stopTarget="stop.weblogic.51"
-            testTarget="test"/>
-
-    </target>
-
-    <!--
-       ========================================================================
-         Start WebLogic 5.1
-       ========================================================================
-    -->
-    <target name="start.weblogic.51">
-
-        <java classname="weblogic.Server" fork="yes">
-
-            <classpath>
-              <pathelement location="${maven.appserver.home}/lib/weblogic510sp8boot.jar"/>
-              <pathelement location="${maven.appserver.home}/classes/boot"/>
-            </classpath>
-
-            <jvmarg value="-ms64m"/>
-            <jvmarg value="-mx64m"/>
-            <jvmarg value="-Dweblogic.class.path=${maven.appserver.home}/lib/weblogic510sp8.jar;${maven.appserver.home}/license;${maven.appserver.home}/classes;${maven.appserver.home}/lib/weblogicaux.jar"/>
-            <jvmarg value="-Dweblogic.home=${maven.appserver.dir}"/>
-            <jvmarg value="-Dweblogic.system.home=${maven.appserver.dir}"/>
-            <jvmarg value="-Dweblogic.system.name=testinstance"/>
-            <jvmarg value="-Djava.security.manager"/>
-            <jvmarg value="-Djava.security.policy==${conf.weblogic51.dir}/weblogic.policy"/>
-
-        </java>
-
-    </target>
-
-    <!--
-       ========================================================================
-         Stop WebLogic 5.1
-       ========================================================================
-    -->
-    <target name="stop.weblogic.51">
-
-        <java classname="weblogic.Admin" fork="yes">
-
-            <classpath>
-                <pathelement location="${maven.appserver.home}/lib/weblogic510sp8.jar"/>
-                <pathelement location="${maven.appserver.home}/license"/>
-                <pathelement location="${maven.appserver.home}/classes"/>
-                <pathelement location="${maven.appserver.home}/lib/weblogicaux.jar"/>
-            </classpath>
-
-            <arg value="t3://localhost:${test.port}/test"/>
-            <arg value="SHUTDOWN"/>
-            <arg value="system"/>
-            <arg value="password"/>
-
-        </java>
-
-    </target>
-
-    <!--
-       ========================================================================
-         Display a warning message if the needed servlet engine home property
-         is not set
-       ========================================================================
-    -->
-    <target name="check.test.weblogic.51" unless="maven.appserver.home">
-
-        <echo message=""/>
-        <echo message="******************************************************"/>
-        <echo message="WARNING : The 'maven.appserver.home' property has not been"/>
-        <echo message="set. No test will be run on that servlet engine."/>
-        <echo message="******************************************************"/>
-        <echo message=""/>
-
-    </target>
-
-    <!--
-       ========================================================================
-         Prepare directories and variables for running the tests
-       ========================================================================
-    -->
-    <target name="prepare.test.weblogic.51"
-        depends="check.test.weblogic.51,testwar" if="maven.appserver.home">
-
-        <echo message="maven.appserver.home = ${maven.appserver.home}"/>
-
-        <property name="maven.appserver.dir"
-            value="${target.test.dir}/weblogic51"/>
-        <property name="conf.weblogic51.dir"
-            value="${conf.test.dir}/weblogic51"/>
-        <filter token="target.wlinstance.dir"
-            value="${maven.appserver.dir}/testinstance"/>
-
-        <mkdir dir="${maven.appserver.dir}/testinstance"/>
-
-        <!-- Delete some config file so that they will be copied every time -->
-        <delete file="${maven.appserver.dir}/weblogic.properties"/>
-
-        <copy file="${conf.weblogic51.dir}/weblogic.properties"
-            tofile="${maven.appserver.dir}/weblogic.properties"
-            filtering="on"/>
-
-        <!-- Copy the war file -->
-        <copy file="${target.test.dir}/test.war"
-            tofile="${maven.appserver.dir}/testinstance/test.war"/>
-
-        <!-- This is needed here because WebLogic 5.1 does not support
-             automatic war deployment (except with latest Service Packs and
-             even when it does there are issues with support files -->
-        <unwar src="${maven.appserver.dir}/testinstance/test.war"
-            dest="${maven.appserver.dir}/testinstance/test"/>
-
-    </target>
diff --git a/j2ee/src/plugin-resources/conf/build-weblogic-61.xml b/j2ee/src/plugin-resources/conf/build-weblogic-61.xml
deleted file mode 100644
index 6dd9feee..00000000
--- a/j2ee/src/plugin-resources/conf/build-weblogic-61.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-    <!--
-       ========================================================================
-         Run WebLogic 6.1 tests
-       ========================================================================
-    -->
-    <target name="test.weblogic.61" depends="prepare.test.weblogic.61"
-        if="maven.appserver.home" description="Run tests on WebLogic 6.1">
-
-        <!-- 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 -->
-
-        <runservertests
-            testURL="http://localhost:${test.port}/test/ServletRedirector?Cactus_Service=RUN_TEST"
-            startTarget="start.weblogic.61"
-            stopTarget="stop.weblogic.61"
-            testTarget="test"/>
-
-    </target>
-
-    <!--
-       ========================================================================
-         Start WebLogic 6.1
-       ========================================================================
-    -->
-    <target name="start.weblogic.61">
-
-        <java classname="weblogic.Server" fork="yes"
-            dir="${maven.appserver.dir}">
-
-            <classpath>
-                <pathelement location="${maven.appserver.home}/wlserver6.1/lib/weblogic.sp.jar"/>
-                <pathelement location="${maven.appserver.home}/wlserver6.1/lib/weblogic.jar"/>
-            </classpath>
-
-            <jvmarg value="-hotspot"/>
-            <jvmarg value="-ms64m"/>
-            <jvmarg value="-mx64m"/>
-            <jvmarg value="-Djava.library.path=${java.library.path};${maven.appserver.home}/wlserver6.1/bin"/>
-            <jvmarg value="-Dweblogic.RootDirectory=."/>
-            <jvmarg value="-Dweblogic.Domain=testdomain"/>
-            <jvmarg value="-Dweblogic.Name=testserver"/>
-            <jvmarg value="-Dbea.home=${maven.appserver.home}"/>
-            <jvmarg value="-Dweblogic.management.password=password"/>
-            <jvmarg value="-Djava.security.policy==./lib/weblogic.policy"/>
-
-        </java>
-
-    </target>
-
-    <!--
-       ========================================================================
-         Stop WebLogic 6.1
-       ========================================================================
-    -->
-    <target name="stop.weblogic.61">
-
-        <java classname="weblogic.Admin" fork="yes">
-
-            <classpath>
-                <pathelement location="${maven.appserver.home}/wlserver6.1/lib/weblogic.sp.jar"/>
-                <pathelement location="${maven.appserver.home}/wlserver6.1/lib/weblogic.jar"/>
-            </classpath>
-
-            <arg line="-url t3://localhost:${test.port}"/>
-            <arg line="-username system"/>
-            <arg line="-password password"/>
-            <arg value="SHUTDOWN"/>
-
-        </java>
-
-    </target>
-
-    <!--
-       ========================================================================
-         Display a warning message if the needed servlet engine home property
-         is not set
-       ========================================================================
-    -->
-    <target name="check.test.weblogic.61" unless="maven.appserver.home">
-
-        <echo message=""/>
-        <echo message="******************************************************"/>
-        <echo message="WARNING : The 'maven.appserver.home' property has not been"/>
-        <echo message="set. No test will be run on that servlet engine."/>
-        <echo message="******************************************************"/>
-        <echo message=""/>
-
-    </target>
-
-    <!--
-       ========================================================================
-         Prepare directories and variables for running the tests
-       ========================================================================
-    -->
-    <target name="prepare.test.weblogic.61"
-        depends="check.test.weblogic.61,testwar" if="maven.appserver.home">
-
-        <echo message="maven.appserver.home = ${maven.appserver.home}"/>
-
-        <property name="maven.appserver.dir"
-            value="${target.test.dir}/weblogic61"/>
-        <property name="conf.weblogic61.dir"
-            value="${conf.test.dir}/weblogic61"/>
-
-        <mkdir dir="${maven.appserver.dir}/config/testdomain/applications"/>
-
-        <!-- Copy WL 6.1 configuration files -->
-        <copy file="${conf.weblogic61.dir}/config.xml"
-            todir="${maven.appserver.dir}/config/testdomain" filtering="on"/>
-        <copy file="${conf.weblogic61.dir}/fileRealm.properties"
-            todir="${maven.appserver.dir}/config/testdomain"/>
-        <copy file="${conf.weblogic61.dir}/SerializedSystemIni.dat"
-            todir="${maven.appserver.dir}/config/testdomain"/>
-
-        <!-- Copy the war file -->
-        <copy file="${target.test.dir}/test.war"
-            todir="${maven.appserver.dir}/config/testdomain/applications"/>
-
-    </target>