295651 remove unused folders from releng.wtpbuilder
diff --git a/releng.wtpbuilder/distribution/wtp.adopters/build.xml b/releng.wtpbuilder/distribution/wtp.adopters/build.xml
deleted file mode 100644
index d633b9a..0000000
--- a/releng.wtpbuilder/distribution/wtp.adopters/build.xml
+++ /dev/null
@@ -1,312 +0,0 @@
-<project
-    default="main"
-    basedir=".">
-
-    <!--
-        Required inputs:
-        
-        build.home
-        buildType
-        buildId
-        timestamp
-        env.BASEOS
-        env.BASEWS
-        env.BASEARCH
-        build.stream [optional]
-        build.committers [optional]
-        wtp.dir [optional]
-    -->
-
-    <!-- Note to be cross-platform, "environment variables" are only appropriate for
-        some variables, e.g. ones we set, since properties are case sensitive, even if
-        the environment variables on your operating system are not, e.g. it will
-        be ${env.Path} not ${env.PATH} on Windows -->
-    <property environment="env" />
-
-    <target name="main">
-        <property
-            file="${build.home}/${env.RELENG_BUILDER}/build.properties" />
-        <property
-            name="apiRoot"
-            value="${build.home}/adopterScanRoot" />
-        <delete
-            dir="${apiRoot}"
-            failonerror="false" />
-        <mkdir dir="${apiRoot}" />
-        <antcall target="getReleng" />
-        <property
-            file="${apiRoot}/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties" />
-        <property
-            name="local.cache.dir"
-            value="${env.LOCAL_PREREQS_CACHE}" />
-        <property
-            name="wtp.dir"
-            value="${local.cache.dir}" />
-        <property
-            name="install.destination"
-            value="${apiRoot}" />
-        <antcall target="getDependencies" />
-        <condition
-            property="wtp-sdk"
-            value="wtp-sdk-${buildId}.zip"
-            else="wtp-sdk-${buildType}-${buildId}-${timestamp}.zip">
-            <available file="${wtp.dir}/wtp-sdk-${buildId}.zip" />
-        </condition>
-        <antcall target="run" />
-        <antcall target="upload" />
-        <antcall target="clean" />
-    </target>
-
-    <target name="getReleng">
-        <property
-            name="releng.tag"
-            value="v${buildType}${timestamp}" />
-        <cvs
-            cvsRoot=":pserver:anonymous@dev.eclipse.org:/cvsroot/webtools"
-            package="${env.RELENG}"
-            dest="${apiRoot}"
-            command="export"
-            tag="${releng.tag}"
-            quiet="${env.CVS_QUIET}"
-            reallyquiet="${env.CVS_REALLY_QUIET}" />
-    </target>
-
-    <target name="getDependencies">
-        <condition property="isLinux">
-            <equals
-                arg1="${baseos}"
-                arg2="linux" />
-        </condition>
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipse" />
-        </antcall>
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf" />
-        </antcall>
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="gef" />
-        </antcall>
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="dtp" />
-        </antcall>
-        <!-- this appears to be pretty explict hard coding for windows machines. 
-            I wonder why the usual "get dependencies" methods would not work?
-        -->
-        <antcall target="get">
-            <param
-                name="groupId"
-                value="eclipse" />
-            <param
-                name="baseos"
-                value="win32" />
-            <param
-                name="basews"
-                value="win32" />
-            <param
-                name="basearch"
-                value="x86" />
-        </antcall>
-        <antcall target="getAndInstallWTP">
-            <param
-                name="file"
-                value="wtp-sdk-${buildId}.zip" />
-        </antcall>
-        <antcall target="getAndInstallWTP">
-            <param
-                name="file"
-                value="wtp-sdk-${buildType}-${buildId}-${timestamp}.zip" />
-        </antcall>
-        <delete file="${local.cache.dir}/wtp-apiscanner.zip" />
-        <get
-            src="http://download.eclipse.org/webtools/downloads/wtp-apiscanner.zip"
-            dest="${local.cache.dir}/wtp-apiscanner.zip" />
-        <unzip
-            src="${local.cache.dir}/wtp-apiscanner.zip"
-            dest="${apiRoot}" />
-
-        <!--  get path to equinox jar inside ${eclipse.home} folder (copy/rename actual jar) -->
-        <copy
-            failonerror="false"
-            tofile="${apiRoot}/eclipse/startup.jar">
-            <fileset
-                dir="${apiRoot}/eclipse/plugins"
-                includes="**/org.eclipse.equinox.launcher_*.jar" />
-        </copy>
-    </target>
-
-    <target name="getAndInstall">
-        <property
-            name="dependencyTargets"
-            value="${build.home}/${env.RELENG_BUILDER}/scripts/dependency/build.xml" />
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}" />
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}" />
-        </ant>
-    </target>
-
-    <target name="get">
-        <property
-            name="dependencyTargets"
-            value="${build.home}/${env.RELENG_BUILDER}/scripts/dependency/build.xml" />
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}" />
-        </ant>
-    </target>
-
-    <target name="getAndInstallWTP">
-        <available
-            file="${wtp.dir}/${file}"
-            property="file.exists" />
-        <antcall target="getWTP" />
-        <available
-            file="${wtp.dir}/${file}"
-            property="file.exists" />
-        <antcall target="installWTP" />
-    </target>
-
-    <target name="getWTP">
-        <condition
-            property="file.url.1"
-            value="http://download.eclipse.org/webtools/committers"
-            else="http://download.eclipse.org/webtools/downloads">
-            <isset property="build.committers" />
-        </condition>
-        <condition
-            property="file.url"
-            value="${file.url.1}/drops/${build.stream}/${buildType}-${buildId}-${timestamp}"
-            else="${file.url.1}/drops/${buildType}-${buildId}-${timestamp}">
-            <isset property="build.stream" />
-        </condition>
-        <antcall target="getWTP2" />
-    </target>
-
-    <target
-        name="getWTP2"
-        unless="file.exists">
-        <property
-            name="file.url"
-            value="http://download.eclipse.org/webtools/downloads/drops/${build.stream}/${buildType}-${buildId}-${timestamp}" />
-        <mkdir dir="${wtp.dir}" />
-        <get
-            dest="${wtp.dir}/${file}"
-            src="${file.url}/${file}"
-            ignoreerrors="true" />
-    </target>
-
-    <target
-        name="installWTP"
-        if="file.exists">
-        <unzip
-            src="${wtp.dir}/${file}"
-            dest="${install.destination}"
-            overwrite="true" />
-    </target>
-
-    <target name="run">
-        <cvs
-            cvsRoot=":pserver:anonymous@dev.eclipse.org:/cvsroot/webtools"
-            package="releng.wtptools/api/adopter_usages"
-            dest="${apiRoot}"
-            command="export"
-            tag="HEAD"
-            quiet="${env.CVS_QUIET}"
-            reallyquiet="${env.CVS_REALLY_QUIET}" />
-        <mkdir dir="${apiRoot}/adopters" />
-        <antcall target="runEclipseApp">
-            <param
-                name="application"
-                value="org.eclipse.wtp.releng.tools.component.core.APIRefCompatibilityScanner" />
-            <param
-                name="vmargs"
-                value="-Dsrc=${local.cache.dir}/${wtp-sdk},${local.cache.dir}/${eclipse.file.win32-win32-x86},${local.cache.dir}/${emf.file},${local.cache.dir}/${gef.file},${local.cache.dir}/${dtp.file} -Duse=${apiRoot}/releng.wtptools/api/adopter_usages -DoutputDir=${apiRoot}/adopters -Xmx512M" />
-        </antcall>
-        <copy
-            tofile="${apiRoot}/apiresults/api-ref-compatibility.html"
-            file="${apiRoot}/adopters/api-ref-compatibility.html" />
-        <copy
-            tofile="${apiRoot}/apiresults/api-ref-compatibility.xml"
-            file="${apiRoot}/adopters/api-ref-compatibility.xml" />
-    </target>
-
-    <target name="runEclipseApp">
-        <property
-            name="vmargs"
-            value="" />
-        <java
-            jar="${apiRoot}/eclipse/startup.jar"
-            fork="true"
-            failonerror="true"
-            timeout="3600000"
-            dir="${apiRoot}">
-            <jvmarg value="-Dosgi.ws=${env.BASEWS}" />
-            <jvmarg value="-Dosgi.os=${env.BASEOS}" />
-            <jvmarg value="-Dosgi.arch=${env.BASEARCH}" />
-            <jvmarg value="-Xmx512M" />
-            <jvmarg line="${vmargs}" />
-            <jvmarg value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}" />
-            <jvmarg
-                value="-Dprojectname=${projectname}" />
-            <arg value="-application" />
-            <arg value="${application}" />
-        </java>
-    </target>
-
-    <target
-        name="upload"
-        if="login">
-        <mkdir dir="${build.home}/archives" />
-        <zip
-            destfile="${build.home}/archives/${buildType}-${buildId}-${timestamp}.zip"
-            basedir="${apiRoot}/apiresults" />
-        <condition
-            property="upload.path.1"
-            else="${login}@build.eclipse.org:~/downloads/webtools/downloads"
-            value="${login}@build.eclipse.org:~/downloads/webtools/committers">
-            <isset property="build.committers" />
-        </condition>
-        <condition
-            property="upload.path"
-            else="${upload.path.1}/drops/${buildType}-${buildId}-${timestamp}"
-            value="${upload.path.1}/drops/${build.stream}/${buildType}-${buildId}-${timestamp}">
-            <isset property="build.stream" />
-        </condition>
-        <exec
-            executable="scp"
-            dir="${build.home}">
-            <arg line="-r ./adopterScanRoot/apiresults ${upload.path}" />
-        </exec>
-    </target>
-
-    <target
-        name="clean"
-        if="clean">
-        <delete failonerror="false">
-            <fileset
-                dir="${env.LOCAL_PREREQS_CACHE}"
-                includes="wtp-*" />
-        </delete>
-    </target>
-
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtp.api/api.properties b/releng.wtpbuilder/distribution/wtp.api/api.properties
deleted file mode 100644
index 249921e..0000000
--- a/releng.wtpbuilder/distribution/wtp.api/api.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-#######################################################################################
-# TPTP
-# Eclipse TPTP Dependency
-# TPTP will be used for API scanning
-# groupID : tptp
-tptp.url  = http://archive.eclipse.org/tptp/4.0.0/TPTP-4.0.0-200507181519
-tptp.releng.url  = http://download.eclipse.org/webtools/downloads/drivers
-tptp.file.linux-gtk-x86= tptpdc.linux_ia32-TPTP-4.0.0-200507181519.zip
-tptp.file.linux-gtk-ppc= tptpdc.linux_ppc64-TPTP-4.0.0-200507181519.zip
-tptp.file.win32-win32-x86 = tptpdc.win_ia32-TPTP-4.0.0-200507181519.zip
-tptp.name = TPTP DC v4.0
-tptp.description = TPTP DC v4.0
-
-piagent.url  = http://archive.eclipse.org/tptp/4.0.0/TPTP-4.0.0-200507181519
-piagent.releng.url  = http://download.eclipse.org/webtools/downloads/drivers
-piagent.file.linux-gtk-x86= tptpdc.linux_ia32-TPTP-4.0.0-200507181519.zip
-piagent.file.linux-gtk-ppc= tptpdc.linux_ppc64-TPTP-4.0.0-200507181519.zip
-piagent.file.win32-win32-x86 = tptpdc.win_ia32-TPTP-4.0.0-200507181519.zip
-piagent.name = TPTP DC v4.0
-piagent.description = TPTP DC v4.0
-#######################################################################################
diff --git a/releng.wtpbuilder/distribution/wtp.api/build.xml b/releng.wtpbuilder/distribution/wtp.api/build.xml
deleted file mode 100644
index a3a56a6..0000000
--- a/releng.wtpbuilder/distribution/wtp.api/build.xml
+++ /dev/null
@@ -1,576 +0,0 @@
-<project
-    default="main"
-    basedir=".">
-
-    <!--
-        Required inputs:
-        
-        build.home
-        buildType
-        buildId
-        timestamp
-        env.BASEOS
-        env.BASEWS
-        env.BASEARCH
-        build.stream [optional]
-        build.committers [optional]
-        releng.tag [optional]
-        wtp.dir [optional]
-        clean [optional]
-    -->
-
-    <!-- Note to be cross-platform, "environment variables" are only appropriate for
-        some variables, e.g. ones we set, since properties are case sensitive, even if
-        the environment variables on your operating system are not, e.g. it will
-        be ${env.Path} not ${env.PATH} on Windows -->
-    <property environment="env" />
-
-
-    <target name="main">
-        <property
-            file="${build.home}/${env.RELENG_BUILDER}/build.properties" />
-        <property
-            file="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.api/api.properties" />
-        <property
-            name="wtp.api"
-            value="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.api" />
-        <property
-            name="apiRoot"
-            value="${build.home}/apiRoot" />
-        <property
-            name="buildLabel"
-            value="${buildId}" />
-        <delete
-            dir="${apiRoot}"
-            failonerror="false" />
-        <mkdir dir="${apiRoot}" />
-        <antcall target="getReleng" />
-        <property
-            file="${apiRoot}/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties" />
-        <property
-            name="local.cache.dir"
-            value="${env.LOCAL_PREREQS_CACHE}" />
-        <property
-            name="wtp.dir"
-            value="${local.cache.dir}" />
-        <property
-            name="install.destination"
-            value="${apiRoot}" />
-        <antcall target="getDependencies" />
-        <condition
-            property="wtp-sdk"
-            value="wtp-sdk-${buildId}.zip"
-            else="wtp-sdk-${buildType}-${buildId}-${timestamp}.zip">
-            <available file="${wtp.dir}/wtp-sdk-${buildId}.zip" />
-        </condition>
-        <condition
-            property="wtp-tests"
-            value="wtp-tests-${buildId}.zip"
-            else="wtp-tests-${buildType}-${buildId}-${timestamp}.zip">
-            <available
-                file="${wtp.dir}/wtp-tests-${buildId}.zip" />
-        </condition>
-        <antcall target="run" />
-        <antcall target="upload" />
-    </target>
-
-    <target name="getReleng">
-        <property
-            name="releng.tag"
-            value="v${buildType}${timestamp}" />
-        <cvs
-            cvsRoot=":pserver:anonymous@dev.eclipse.org:/cvsroot/webtools"
-            package="${env.RELENG}"
-            dest="${apiRoot}"
-            command="export"
-            tag="${releng.tag}"
-            quiet="${env.CVS_QUIET}"
-            reallyquiet="${env.CVS_REALLY_QUIET}" />
-    </target>
-
-    <target name="getDependencies">
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipse" />
-        </antcall>
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipseTestFramework" />
-            <param
-                name="clean"
-                value="true" />
-        </antcall>
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf" />
-        </antcall>
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="gef" />
-        </antcall>
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="dtp" />
-        </antcall>
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="tomcat.5" />
-        </antcall>
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="jonas.4" />
-        </antcall>
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="oagis.release" />
-        </antcall>
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="oagis.wsdl" />
-        </antcall>
-
-        <!-- this appears to be pretty explict hard coding for windows machines. 
-            I wonder why the usual "get dependencies" methods would not work?
-        -->
-        <antcall target="get">
-            <param
-                name="groupId"
-                value="eclipse" />
-            <param
-                name="baseos"
-                value="win32" />
-            <param
-                name="basews"
-                value="win32" />
-            <param
-                name="basearch"
-                value="x86" />
-        </antcall>
-
-
-        <antcall target="get">
-            <param
-                name="groupId"
-                value="tptp" />
-        </antcall>
-        <mkdir dir="${apiRoot}/piagent" />
-        <condition property="isLinux">
-            <equals
-                arg1="${baseos}"
-                arg2="linux" />
-        </condition>
-        <antcall target="setupPIAgent.linux" />
-        <antcall target="setupPIAgent.win32" />
-        <antcall target="getAndInstallWTP">
-            <param
-                name="file"
-                value="wtp-sdk-${buildId}.zip" />
-        </antcall>
-        <antcall target="getAndInstallWTP">
-            <param
-                name="file"
-                value="wtp-sdk-${buildType}-${buildId}-${timestamp}.zip" />
-        </antcall>
-        <antcall target="getAndInstallWTP">
-            <param
-                name="file"
-                value="wtp-tests-${buildId}.zip" />
-        </antcall>
-        <antcall target="getAndInstallWTP">
-            <param
-                name="file"
-                value="wtp-tests-${buildType}-${buildId}-${timestamp}.zip" />
-        </antcall>
-        <delete file="${local.cache.dir}/wtp-apiscanner.zip" />
-        <get
-            src="http://download.eclipse.org/webtools/downloads/wtp-apiscanner.zip"
-            dest="${local.cache.dir}/wtp-apiscanner.zip" />
-        <unzip
-            src="${local.cache.dir}/wtp-apiscanner.zip"
-            dest="${apiRoot}" />
-    </target>
-
-    <target name="get">
-        <property
-            name="dependencyTargets"
-            value="${build.home}/${env.RELENG_BUILDER}/scripts/dependency/build.xml" />
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}" />
-        </ant>
-    </target>
-
-    <target name="getAndInstall">
-        <property
-            name="dependencyTargets"
-            value="${build.home}/${env.RELENG_BUILDER}/scripts/dependency/build.xml" />
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}" />
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}" />
-        </ant>
-    </target>
-
-    <target name="getAndInstallWTP">
-        <available
-            file="${wtp.dir}/${file}"
-            property="file.exists" />
-        <antcall target="getWTP" />
-        <available
-            file="${wtp.dir}/${file}"
-            property="file.exists" />
-        <antcall target="installWTP" />
-    </target>
-
-    <target name="getWTP">
-        <condition
-            property="file.url.1"
-            value="http://download.eclipse.org/webtools/committers"
-            else="http://download.eclipse.org/webtools/downloads">
-            <isset property="build.committers" />
-        </condition>
-        <condition
-            property="file.url"
-            value="${file.url.1}/drops/${build.stream}/${buildType}-${buildId}-${timestamp}"
-            else="${file.url.1}/drops/${buildType}-${buildId}-${timestamp}">
-            <isset property="build.stream" />
-        </condition>
-        <antcall target="getWTP2" />
-    </target>
-
-    <target
-        name="getWTP2"
-        unless="file.exists">
-        <property
-            name="file.url"
-            value="http://download.eclipse.org/webtools/downloads/drops/${build.stream}/${buildType}-${buildId}-${timestamp}" />
-        <mkdir dir="${wtp.dir}" />
-        <get
-            dest="${wtp.dir}/${file}"
-            src="${file.url}/${file}"
-            ignoreerrors="true" />
-    </target>
-
-    <target
-        name="installWTP"
-        if="file.exists">
-        <unzip
-            src="${wtp.dir}/${file}"
-            dest="${install.destination}"
-            overwrite="true" />
-    </target>
-
-    <target
-        name="setupPIAgent.linux"
-        if="isLinux">
-        <unzip
-            src="${local.cache.dir}/${tptp.file.linux-gtk-x86}"
-            dest="${apiRoot}/piagent">
-            <patternset>
-                <include name="lib/*" />
-            </patternset>
-        </unzip>
-        <move
-            todir="${apiRoot}/piagent"
-            flatten="true">
-            <fileset dir="${apiRoot}/piagent/lib" />
-        </move>
-    </target>
-
-    <target
-        name="setupPIAgent.win32"
-        unless="isLinux">
-        <unzip
-            src="${local.cache.dir}/${tptp.file.win32-win32-x86}"
-            dest="${apiRoot}/piagent">
-            <patternset>
-                <include name="bin/*" />
-            </patternset>
-        </unzip>
-        <move
-            todir="${apiRoot}/piagent"
-            flatten="true">
-            <fileset dir="${apiRoot}/piagent/bin" />
-        </move>
-    </target>
-
-    <target name="run">
-        <cvs
-            cvsRoot=":pserver:anonymous@dev.eclipse.org:/cvsroot/webtools"
-            package="releng.wtptools/api/adopter_usages"
-            dest="${apiRoot}"
-            command="export"
-            tag="HEAD" />
-        <mkdir dir="${apiRoot}/adopters" />
-        <antcall target="runEclipseApp">
-            <param
-                name="application"
-                value="org.eclipse.wtp.releng.tools.component.core.APIRefCompatibilityScanner" />
-            <param
-                name="vmargs"
-                value="-Dsrc=${local.cache.dir}/${wtp-sdk},${local.cache.dir}/${eclipse.file.win32-win32-x86},${local.cache.dir}/${emf.file},${local.cache.dir}/${gef.file},${local.cache.dir}/${dtp.file} -Duse=${apiRoot}/releng.wtptools/api/adopter_usages -DoutputDir=${apiRoot}/adopters -Xmx512M" />
-        </antcall>
-        <copy
-            tofile="${apiRoot}/apiresults/api-ref-compatibility.html"
-            file="${apiRoot}/adopters/api-ref-compatibility.html" />
-        <copy
-            tofile="${apiRoot}/apiresults/api-ref-compatibility.xml"
-            file="${apiRoot}/adopters/api-ref-compatibility.xml" />
-
-        <antcall target="runEclipseApp">
-            <param
-                name="application"
-                value="org.eclipse.wtp.releng.tools.component.core.Java2API" />
-            <param
-                name="vmargs"
-                value="-Dsrc=${local.cache.dir}/${eclipse.file.win32-win32-x86} -DoutputDir=${apiRoot}/api-eclipse -Dexcludes=.*internal.*" />
-        </antcall>
-        <antcall target="runEclipseApp">
-            <param
-                name="application"
-                value="org.eclipse.wtp.releng.tools.component.core.Java2API" />
-            <param
-                name="vmargs"
-                value="-Dsrc=${local.cache.dir}/${emf.file} -DoutputDir=${apiRoot}/api-emf -Dexcludes=.*internal.*" />
-        </antcall>
-        <antcall target="runEclipseApp">
-            <param
-                name="application"
-                value="org.eclipse.wtp.releng.tools.component.core.Java2API" />
-            <param
-                name="vmargs"
-                value="-Dsrc=${local.cache.dir}/${gef.file} -DoutputDir=${apiRoot}/api-gef -Dexcludes=.*internal.*" />
-        </antcall>
-        <antcall target="runEclipseApp">
-            <param
-                name="application"
-                value="org.eclipse.wtp.releng.tools.component.core.Java2API" />
-            <param
-                name="vmargs"
-                value="-Dsrc=${local.cache.dir}/${dtp.file} -DoutputDir=${apiRoot}/api-dtp -Dexcludes=.*internal.*" />
-        </antcall>
-        <antcall target="runEclipseApp">
-            <param
-                name="application"
-                value="org.eclipse.wtp.releng.tools.component.core.Java2API" />
-            <param
-                name="vmargs"
-                value="-Dsrc=${local.cache.dir}/${wtp-sdk} -DoutputDir=${apiRoot}/api-wtp" />
-        </antcall>
-
-        <antcall target="runJavaMain">
-            <param
-                name="classname"
-                value="org.eclipse.wtp.releng.tools.component.api.violation.APIViolationScanner" />
-            <param
-                name="args"
-                value="-src ${local.cache.dir}/${wtp-sdk} -api ${apiRoot}/api-eclipse ${apiRoot}/api-emf ${apiRoot}/api-gef ${apiRoot}/api-dtp -outputDir ${apiRoot}/apiresults -html -includes org.eclipse.* -excludes org.eclipse.wst.* org.eclipse.jst.* org.eclipse.jem.* org.eclipse.jpt.* -debug" />
-        </antcall>
-
-        <antcall target="runJavaMain">
-            <param
-                name="classname"
-                value="org.eclipse.wtp.releng.tools.component.api.API2ComponentAPI" />
-            <param
-                name="args"
-                value="-src ${local.cache.dir}/${wtp-sdk} -api ${local.cache.dir}/${wtp-sdk} -outputDir ${apiRoot}/apiresults -html" />
-        </antcall>
-
-        <antcall target="runEclipseApp">
-            <param
-                name="application"
-                value="org.eclipse.wtp.releng.tools.component.core.JavadocScanner" />
-            <param
-                name="vmargs"
-                value="-Dsrc=${local.cache.dir}/${wtp-sdk} -DoutputDir=${apiRoot}/apiresults -Dapi=${local.cache.dir}/${wtp-sdk} -Dexcludes=.*internal.* -DskipAPIGen=true -Dhtml=true" />
-        </antcall>
-
-        <antcall target="runJavaMain">
-            <param
-                name="classname"
-                value="org.eclipse.wtp.releng.tools.component.api.violation.NonAPIDependencyScanner" />
-            <param
-                name="args"
-                value="-src ${local.cache.dir}/${wtp-sdk} -api ${local.cache.dir}/${wtp-sdk} -outputDir ${apiRoot}/apiresults -refapi ${apiRoot}/api-eclipse ${apiRoot}/api-emf ${apiRoot}/api-gef ${apiRoot}/api-dtp -includes org.eclipse.* -skipAPIGen" />
-        </antcall>
-
-        <mkdir dir="${apiRoot}/results/consolelogs" />
-        <copy
-            todir="${apiRoot}"
-            overwrite="true">
-            <fileset
-                dir="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.tests/testScripts" />
-        </copy>
-        <copy
-            file="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.api/testScripts/test.xml"
-            tofile="${apiRoot}/test.xml"
-            overwrite="true" />
-        <ant
-            antfile="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.tests/build.xml"
-            target="runTestEclipse">
-            <property
-                name="testRoot"
-                value="${apiRoot}" />
-            <property
-                name="testTarget"
-                value="all" />
-        </ant>
-        <antcall target="runJavaMain">
-            <param
-                name="classname"
-                value="org.eclipse.wtp.releng.tools.component.CodeCoverageScanner" />
-            <param
-                name="args"
-                value="-api ${local.cache.dir}/${wtp-sdk} -src ${local.cache.dir}/${wtp-sdk} ${local.cache.dir}/${wtp-tests} ${local.cache.dir}/${wtp-wst-tests} ${local.cache.dir}/${wtp-jst-tests} -trcxml ${apiRoot}/apiresults/trcxml -outputDir ${apiRoot}/apiresults -skipAPIGen -html" />
-        </antcall>
-
-        <cvs
-            cvsRoot=":pserver:anonymous@dev.eclipse.org:/cvsroot/webtools"
-            package="releng.wtptools/api/api_progress"
-            dest="${apiRoot}"
-            command="export"
-            tag="HEAD" />
-        <antcall target="runJavaMain">
-            <param
-                name="classname"
-                value="org.eclipse.wtp.releng.tools.component.api.progress.APIProgressScanner" />
-            <param
-                name="args"
-                value="-api ${local.cache.dir}/${wtp-sdk} -src ${local.cache.dir}/${wtp-sdk} -outputDir ${apiRoot}/apiresults -progressDir ${apiRoot}/releng.wtptools/api/api_progress/2.0 -timestamp ${timestamp} -excludes .*infopop .*doc.isv .*doc.user .*source org.eclipse.wst org.eclipse.jst org.eclipse.jem org.eclipse.jpt" />
-        </antcall>
-
-        <antcall target="runJavaMain">
-            <param
-                name="classname"
-                value="org.eclipse.wtp.releng.tools.component.CodeCoverageScanner" />
-            <param
-                name="args"
-                value="-api ${apiRoot}/api-wtp -src ${local.cache.dir}/${wtp-sdk} ${local.cache.dir}/${wtp-tests} ${local.cache.dir}/${wtp-wst-tests} ${local.cache.dir}/${wtp-jst-tests} -trcxml ${apiRoot}/apiresults/trcxml -outputDir ${apiRoot}/apiresults/full_test_coverage -html -includeAllTC -title Test_Coverage_Report" />
-        </antcall>
-    </target>
-
-    <target name="runEclipseApp">
-        <property
-            name="vmargs"
-            value="" />
-        <java
-            jar="${apiRoot}/eclipse/plugins/org.eclipse.equinox.launcher_*.jar"
-            fork="true"
-            failonerror="true"
-            timeout="3600000"
-            dir="${apiRoot}">
-            <jvmarg value="-Dosgi.ws=${env.BASEWS}" />
-            <jvmarg value="-Dosgi.os=${env.BASEOS}" />
-            <jvmarg value="-Dosgi.arch=${env.BASEARCH}" />
-            <jvmarg value="-Xmx512M" />
-            <jvmarg line="${vmargs}" />
-            <arg value="-application" />
-            <arg value="${application}" />
-        </java>
-    </target>
-
-    <target name="runJavaMain">
-        <java
-            fork="true"
-            classname="${classname}"
-            failonerror="false"
-            timeout="3600000"
-            dir="${apiRoot}">
-            <classpath>
-                <fileset dir="${apiRoot}/eclipse/plugins">
-                    <include
-                        name="**/org.eclipse.wtp.releng.tools.component.core*.jar" />
-                </fileset>
-                <fileset dir="${apiRoot}/lib">
-                    <include
-                        name="**/org.eclipse.core.contenttype*.jar" />
-                    <include name="**/org.eclipse.core.jobs*.jar" />
-                    <include name="**/org.eclipse.core.resources*.jar" />
-                    <include name="**/org.eclipse.core.runtime*.jar" />
-                    <include name="**/org.eclipse.equinox*.jar" />
-                    <include name="**/org.eclipse.jdt.core*.jar" />
-                    <include name="**/org.eclipse.jface.text*.jar" />
-                    <include name="**/org.eclipse.osgi*.jar" />
-                    <include name="**/org.eclipse.text*.jar" />
-                    <include
-                        name="**/org.eclipse.equinox.launcher_*.jar" />
-                </fileset>
-            </classpath>
-            <jvmarg value="-Xmx512M" />
-            <jvmarg value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}" />
-            <arg line="${args}" />
-        </java>
-    </target>
-
-    <target
-        name="upload"
-        if="login">
-        <mkdir dir="${build.home}/archives" />
-        <zip
-            destfile="${build.home}/archives/${buildType}-${buildId}-${timestamp}.zip"
-            basedir="${build.home}/apiRoot/apiresults" />
-        <condition
-            property="upload.path.1"
-            else="${login}@build.eclipse.org:~/downloads/webtools/downloads"
-            value="${login}@build.eclipse.org:~/downloads/webtools/committers">
-            <isset property="build.committers" />
-        </condition>
-        <condition
-            property="upload.path"
-            else="${upload.path.1}/drops/${buildType}-${buildId}-${timestamp}"
-            value="${upload.path.1}/drops/${build.stream}/${buildType}-${buildId}-${timestamp}">
-            <isset property="build.stream" />
-        </condition>
-        <exec
-            executable="scp"
-            dir="${build.home}">
-            <arg line="-r ./apiRoot/apiresults ${upload.path}" />
-        </exec>
-    </target>
-
-    <target
-        name="clean"
-        if="clean">
-        <property
-            file="${build.home}/${env.RELENG_BUILDER}/build.properties" />
-        <property
-            name="local.cache.dir"
-            value="${env.LOCAL_PREREQS_CACHE}" />
-        <property
-            name="apiRoot"
-            value="${build.home}/apiRoot" />
-        <property
-            name="wtp.dir"
-            value="${local.cache.dir}" />
-        <delete
-            dir="${apiRoot}"
-            failonerror="false" />
-        <delete failonerror="false">
-            <fileset
-                dir="${wtp.dir}"
-                includes="wtp-*" />
-        </delete>
-    </target>
-
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtp.api/testScripts/api-tests.xml b/releng.wtpbuilder/distribution/wtp.api/testScripts/api-tests.xml
deleted file mode 100644
index c062c58..0000000
--- a/releng.wtpbuilder/distribution/wtp.api/testScripts/api-tests.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0"?>
-<project
-    name="API tests"
-    basedir=".">
-
-    <import
-        file="${basedir}/plugins/org.eclipse.test_3.2.0/library.xml" />
-
-    <target name="ui-test">
-        <property
-            name="extraVMargs"
-            value="" />
-        <antcall target="runPIAgent">
-            <param
-                name="application"
-                value="org.eclipse.test.uitestapplication" />
-            <param
-                name="extraVMargs"
-                value="${extraVMargs} -Dwtp.autotest.noninteractive=true" />
-        </antcall>
-    </target>
-
-    <target name="core-test">
-        <property
-            name="extraVMargs"
-            value="" />
-        <antcall target="runPIAgent">
-            <param
-                name="application"
-                value="org.eclipse.test.coretestapplication" />
-            <param
-                name="extraVMargs"
-                value="${extraVMargs} -Dwtp.autotest.noninteractive=true" />
-        </antcall>
-    </target>
-
-    <target name="runPIAgent">
-        <property
-            name="wtp.api"
-            value="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.api" />
-        <property
-            name="piagentDir"
-            value="${testDir}/piagent" />
-        <tstamp>
-            <format
-                property="TIMENOW"
-                pattern="HHmmssSSSS" />
-        </tstamp>
-        <property
-            name="vmargs"
-            value="" />
-        <property
-            name="launcher"
-            value="org.eclipse.core.launcher.Main" />
-        <property
-            name="formatter"
-            value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter" />
-        <property
-            name="extraVMargs"
-            value="" />
-        <property
-            name="plugin-path"
-            value="" />
-        <property
-            name="timeout"
-            value="7200000" />
-        <property file="${testDir}/eclipse/configuration/config.ini" />
-        <echo message="Running ${classname}" />
-        <mkdir dir="${testDir}/apiresults/trcxml" />
-        <delete
-            file="${testDir}/apiresults/trcxml/${plugin-name}-${classname}.trcxml"
-            failonerror="false" />
-        <exec
-            dir="${piagentDir}"
-            executable="java"
-            timeout="${timeout}">
-            <env
-                key="LD_LIBRARY_PATH"
-                value="${piagentDir}" />
-            <env
-                key="java.library.path"
-                value="${piagentDir}" />
-            <env
-                key="PLUGIN_PATH"
-                value="${plugin-path}" />
-            <arg
-                line="-cp ${testDir}/eclipse/plugins/org.eclipse.equinox.launcher_*.jar -XrunpiAgent:server=standalone,profile=${wtp.api}/testScripts/piagent_options.txt,filters=${wtp.api}/testScripts/piagent_filters.txt,file=${testDir}/apiresults/trcxml/${plugin-name}-${classname}.trcxml -Xmx512M ${vmargs} ${extraVMargs} ${launcher} -application ${application} -dev bin -data ${data-dir} formatter=${formatter},${testDir}/eclipse/${classname}.xml -testPluginName ${plugin-name} -className ${classname} -os ${os} -ws ${ws} -arch ${arch} -consolelog" />
-        </exec>
-    </target>
-
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtp.api/testScripts/piagent_filters.txt b/releng.wtpbuilder/distribution/wtp.api/testScripts/piagent_filters.txt
deleted file mode 100644
index f35f637..0000000
--- a/releng.wtpbuilder/distribution/wtp.api/testScripts/piagent_filters.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-org.eclipse.wst.* * INCLUDE
-org.eclipse.jst.* * INCLUDE
-org.eclipse.jem.* * INCLUDE
-org.eclipse.jpt.* * INCLUDE
-* * EXCLUDE
diff --git a/releng.wtpbuilder/distribution/wtp.api/testScripts/piagent_options.txt b/releng.wtpbuilder/distribution/wtp.api/testScripts/piagent_options.txt
deleted file mode 100644
index 6db935d..0000000
--- a/releng.wtpbuilder/distribution/wtp.api/testScripts/piagent_options.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-MONITOR_MODE=none
-FILTERS=false
-TRACK_GC_EVENT_TYPES=none
-* ID_STYLE=static
-OPTIONS=false
-TIMESTAMPS=false
-OBJ_ALLOC_IS_ARRAY=false
-STACK_INFORMATION=normal
-* BOUNDARY_DEPTH=0
-TICKET=false
-TRACE_MODE=noObjectCorrelation
-TRACE_ID_REFS=true
-METHOD_COUNTS=true
-METHOD_COUNTS_ONLY=true
diff --git a/releng.wtpbuilder/distribution/wtp.api/testScripts/test.xml b/releng.wtpbuilder/distribution/wtp.api/testScripts/test.xml
deleted file mode 100644
index 526c998..0000000
--- a/releng.wtpbuilder/distribution/wtp.api/testScripts/test.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<project
-    default="default"
-    basedir=".">
-
-    <import
-        file="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.tests/testScripts/test.xml" />
-
-    <target name="runtests-normal">
-        <ant
-            antfile="${eclipse-home}/plugins/${testPlugin}/test.xml"
-            dir="${eclipse-home}">
-            <property
-                name="library-file"
-                value="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.api/testScripts/api-tests.xml" />
-        </ant>
-        <copy
-            file="${eclipse-home}/${report}.xml"
-            tofile="${results}/xml/${report}_${platform}.xml"
-            failonerror="false" />
-        <antcall target="genHtml" />
-    </target>
-
-    <target name="default">
-        <antcall target="all" />
-    </target>
-
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtp.perf/build.xml b/releng.wtpbuilder/distribution/wtp.perf/build.xml
deleted file mode 100644
index 4abf6ef..0000000
--- a/releng.wtpbuilder/distribution/wtp.perf/build.xml
+++ /dev/null
@@ -1,643 +0,0 @@
-<project
-    default="main"
-    basedir=".">
-
-    <!--
-        Required inputs:
-        
-        build.home
-        buildType
-        buildId
-        date
-        time
-        env.BASEOS
-        env.BASEWS
-        env.BASEARCH
-        buildType.tests [optional]
-        buildId.tests [optional]
-        date.tests [optional]
-        time.tests [optional]
-        build.stream [optional]
-        build.committers [optional]
-        releng.tag [optional]
-        perf.target [optional]
-    -->
-    <!-- Note to be cross-platform, "environment variables" are only appropriate for
-        some variables, e.g. ones we set, since properties are case sensitive, even if
-        the environment variables on your operating system are not, e.g. it will
-        be ${env.Path} not ${env.PATH} on Windows -->
-    <property environment="env" />
-
-
-
-    <target name="main">
-        <property
-            name="perf.buildId"
-            value="${buildType}${date}-${time}" />
-        <property
-            name="timestamp"
-            value="${date}${time}" />
-        <property
-            name="buildType.tests"
-            value="${buildType}" />
-        <property
-            name="buildId.tests"
-            value="${buildId}" />
-        <property
-            name="date.tests"
-            value="${date}" />
-        <property
-            name="time.tests"
-            value="${time}" />
-        <property
-            name="timestamp.tests"
-            value="${date.tests}${time.tests}" />
-        <property
-            file="${build.home}/${env.RELENG_BUILDER}/build.properties" />
-        <property
-            name="local.cache.dir"
-            value="${env.LOCAL_PREREQS_CACHE}" />
-        <property
-            name="workDir"
-            value="${build.home}/workDir" />
-        <property
-            name="perfRoot"
-            value="${build.home}/perfRoot" />
-        <delete
-            dir="${workDir}"
-            failonerror="false" />
-        <delete
-            dir="${perfRoot}"
-            failonerror="false" />
-        <mkdir dir="${local.cache.dir}" />
-        <mkdir dir="${workDir}" />
-        <mkdir dir="${perfRoot}" />
-        <antcall target="getReleng" />
-        <property
-            file="${perfRoot}/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties" />
-        <antcall target="getDependencies" />
-        <condition
-            property="wtp-sdk"
-            value="wtp-sdk-${buildId}.zip"
-            else="wtp-sdk-${buildType}-${buildId}-${timestamp}.zip">
-            <available file="${local.cache.dir}/wtp-sdk-${buildId}.zip" />
-        </condition>
-        <condition
-            property="wtp-wst-tests"
-            value="wtp-wst-Automated-Tests-${buildId}.zip"
-            else="wtp-wst-Automated-Tests-${buildType}-${buildId}-${timestamp}.zip">
-            <available
-                file="${local.cache.dir}/wtp-wst-Automated-Tests-${buildId}.zip" />
-        </condition>
-        <condition
-            property="wtp-jst-tests"
-            value="wtp-jst-Automated-Tests-${buildId}.zip"
-            else="wtp-jst-Automated-Tests-${buildType}-${buildId}-${timestamp}.zip">
-            <available
-                file="${local.cache.dir}/wtp-jst-Automated-Tests-${buildId}.zip" />
-        </condition>
-        <antcall target="setup" />
-        <condition property="15x">
-            <equals
-                arg1="R1.5"
-                arg2="${build.stream}" />
-        </condition>
-        <antcall target="run_deprecated" />
-        <antcall target="run" />
-    </target>
-
-    <target name="getReleng">
-        <property
-            name="releng.tag"
-            value="v${buildType}${timestamp}" />
-        <cvs
-            cvsRoot=":pserver:anonymous@dev.eclipse.org:/cvsroot/webtools"
-            package="${env.RELENG}"
-            dest="${perfRoot}"
-            command="export"
-            tag="${releng.tag}"
-            quiet="${env.CVS_QUIET}"
-            reallyquiet="${env.CVS_REALLY_QUIET}" />
-    </target>
-
-    <target name="getDependencies">
-        <property
-            name="install.destination"
-            value="${workDir}/" />
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipse" />
-            <param
-                name="clean"
-                value="true" />
-        </antcall>
-    </target>
-
-    <target name="setup">
-        <property
-            file="${build.home}/${env.RELENG_BUILDER}/build.properties" />
-        <property
-            file="${perfRoot}/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties" />
-        <property
-            name="install.destination"
-            value="${perfRoot}" />
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipse" />
-            <param
-                name="clean"
-                value="true" />
-        </antcall>
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipseTestFramework" />
-            <param
-                name="clean"
-                value="true" />
-        </antcall>
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf" />
-            <param
-                name="clean"
-                value="true" />
-        </antcall>
-    	
-      <antcall target="getAndInstall">
-          <param
-              name="groupId"
-              value="emfxsd" />
-          <param
-              name="clean"
-              value="true" />
-      </antcall>
-    	
-    	
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="gef" />
-            <param
-                name="clean"
-                value="true" />
-        </antcall>
-        <condition property="15x">
-            <equals
-                arg1="R1.5"
-                arg2="${build.stream}" />
-        </condition>
-        <antcall target="getAndInstallDtp" />
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="tomcat.5" />
-        </antcall>
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="tomcat.4" />
-        </antcall>
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="jonas.4" />
-        </antcall>
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="oagis.release" />
-        </antcall>
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="oagis.wsdl" />
-        </antcall>
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="derby" />
-        </antcall>
-        <antcall target="getAndInstallWTP">
-            <param
-                name="file"
-                value="wtp-sdk-${buildId}.zip" />
-        </antcall>
-        <antcall target="getAndInstallWTP">
-            <param
-                name="file"
-                value="wtp-sdk-${buildType}-${buildId}-${timestamp}.zip" />
-        </antcall>
-        <antcall target="getAndInstallWTP">
-            <param
-                name="file"
-                value="wtp-wst-Automated-Tests-${buildId.tests}.zip" />
-        </antcall>
-        <antcall target="getAndInstallWTP">
-            <param
-                name="file"
-                value="wtp-wst-Automated-Tests-${buildType.tests}-${buildId.tests}-${timestamp.tests}.zip" />
-        </antcall>
-        <antcall target="getAndInstallWTP">
-            <param
-                name="file"
-                value="wtp-jst-Automated-Tests-${buildId.tests}.zip" />
-        </antcall>
-        <antcall target="getAndInstallWTP">
-            <param
-                name="file"
-                value="wtp-jst-Automated-Tests-${buildType.tests}-${buildId.tests}-${timestamp.tests}.zip" />
-        </antcall>
-        <antcall target="setup.derby" />
-        <copy
-            file="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.perf/performance-tests.xml"
-            tofile="${perfRoot}/performance-tests.xml">
-        </copy>
-
-        <!--  get path to equinox jar inside ${eclipse.home} folder (copy/rename actual jar) -->
-        <copy todir="${workDir}/eclipse">
-            <fileset dir="${workDir}/eclipse/plugins">
-                <include name="org.eclipse.equinox.launcher_*.jar" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target
-        name="getAndInstallDtp"
-        unless="15x">
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="dtp" />
-            <param
-                name="clean"
-                value="true" />
-        </antcall>
-    </target>
-
-    <target name="getAndInstall">
-        <property
-            name="dependencyTargets"
-            value="${build.home}/${env.RELENG_BUILDER}/scripts/dependency/build.xml" />
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}" />
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}" />
-        </ant>
-    </target>
-
-    <target name="getAndInstallWTP">
-        <available
-            file="${local.cache.dir}/${file}"
-            property="file.exists" />
-        <antcall target="getWTP" />
-        <available
-            file="${local.cache.dir}/${file}"
-            property="file.exists" />
-        <antcall target="installWTP" />
-    </target>
-
-    <target name="getWTP">
-        <condition
-            property="file.url.1"
-            value="http://download.eclipse.org/webtools/committers"
-            else="http://download.eclipse.org/webtools/downloads">
-            <isset property="build.committers" />
-        </condition>
-        <condition
-            property="file.url"
-            value="${file.url.1}/drops/${build.stream}/${buildType}-${buildId}-${timestamp}"
-            else="${file.url.1}/drops/${buildType}-${buildId}-${timestamp}">
-            <isset property="build.stream" />
-        </condition>
-        <antcall target="getWTP2" />
-    </target>
-
-    <target
-        name="getWTP2"
-        unless="file.exists">
-        <property
-            name="file.url"
-            value="http://download.eclipse.org/webtools/downloads/drops/${build.stream}/${buildType}-${buildId}-${timestamp}" />
-        <get
-            dest="${local.cache.dir}/${file}"
-            src="${file.url}/${file}"
-            ignoreerrors="true" />
-    </target>
-
-    <target
-        name="installWTP"
-        if="file.exists">
-        <unzip
-            src="${local.cache.dir}/${file}"
-            dest="${install.destination}"
-            overwrite="true" />
-    </target>
-
-    <target name="setup.derby">
-        <property
-            name="derby"
-            value="${install.destination}/eclipse/plugins/org.apache.derby" />
-        <mkdir dir="${derby}" />
-        <copy
-            todir="${derby}"
-            overwrite="true">
-            <fileset
-                dir="${perfRoot}/incubating-derby-10.0.2.1-bin/lib">
-                <include name="**/*.jar" />
-            </fileset>
-        </copy>
-        <copy
-            tofile="${derby}/plugin.xml"
-            file="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.perf/derby.plugin.xml.template"
-            overwrite="true" />
-        <replace
-            dir="${perfRoot}/eclipse/plugins"
-            value="&lt;import plugin=&quot;org.apache.derby&quot;/&gt;">
-            <include name="org.eclipse.test.performance_*/plugin.xml" />
-            <replacetoken>
-                <![CDATA[<import plugin="org.apache.derby" optional="true"/>]]></replacetoken>
-        </replace>
-    </target>
-
-    <target
-        name="run"
-        unless="15x">
-        <property
-            name="perf.target"
-            value="main" />
-        <mkdir dir="${perfRoot}/results/consolelogs" />
-        <java
-            fork="true"
-            failonerror="true"
-            timeout="230400000"
-            output="${perfRoot}/results/consolelogs/wtpperflog.txt"
-            dir="${workDir}"
-            classname="org.eclipse.equinox.launcher.Main">
-            <classpath>
-                <fileset dir="${workDir}/eclipse/plugins">
-                    <include name="org.eclipse.equinox.launcher_*.jar" />
-                </fileset>
-            </classpath>
-            <jvmarg value="-Dosgi.ws=${env.BASEWS}" />
-            <jvmarg value="-Dosgi.os=${env.BASEOS}" />
-            <jvmarg value="-Dosgi.arch=${env.BASEARCH}" />
-            <jvmarg value="-Dnoclean=true" />
-            <jvmarg value="-DbuildType=${buildType}" />
-            <jvmarg value="-DbuildId=${buildId}" />
-            <jvmarg value="-Dtimestamp=${timestamp}" />
-            <jvmarg value="-DbuildType.tests=${buildType.tests}" />
-            <jvmarg value="-DbuildId.tests=${buildId.tests}" />
-            <jvmarg value="-Dtimestamp.tests=${timestamp.tests}" />
-            <jvmarg value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}" />
-            <arg value="-propertyfile" />
-            <arg
-                value="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.perf/perf.properties" />
-            <arg value="-application" />
-            <arg value="org.eclipse.ant.core.antRunner" />
-            <arg value="-file" />
-            <arg
-                value="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.perf/perf.xml" />
-            <arg value="-logger" />
-            <arg value="org.apache.tools.ant.DefaultLogger" />
-            <arg value="${perf.target}" />
-            <sysproperty
-                key="eclipse-home"
-                value="${perfRoot}/eclipse" />
-            <sysproperty
-                key="perf.buildId"
-                value="${perf.buildId}" />
-            <sysproperty
-                key="build.home"
-                value="${build.home}" />
-            <sysproperty
-                key="local.cache.dir"
-                value="${local.cache.dir}" />
-            <sysproperty
-                key="perfRoot"
-                value="${perfRoot}" />
-            <sysproperty
-                key="testDir"
-                value="${perfRoot}" />
-        </java>
-    </target>
-
-    <target
-        name="run_deprecated"
-        if="15x">
-        <property
-            name="perf.target"
-            value="main" />
-        <mkdir dir="${perfRoot}/results/consolelogs" />
-        <java
-            fork="true"
-            failonerror="true"
-            timeout="230400000"
-            output="${perfRoot}/results/consolelogs/wtpperflog.txt"
-            dir="${workDir}"
-            classname="org.eclipse.core.launcher.Main">
-            <classpath>
-                <fileset dir="${workDir}/eclipse">
-                    <include name="startup.jar" />
-                </fileset>
-            </classpath>
-            <jvmarg value="-Dosgi.ws=${env.BASEWS}" />
-            <jvmarg value="-Dosgi.os=${env.BASEOS}" />
-            <jvmarg value="-Dosgi.arch=${env.BASEARCH}" />
-            <jvmarg value="-Dnoclean=true" />
-            <jvmarg value="-DbuildType=${buildType}" />
-            <jvmarg value="-DbuildId=${buildId}" />
-            <jvmarg value="-Dtimestamp=${timestamp}" />
-            <jvmarg value="-DbuildType.tests=${buildType.tests}" />
-            <jvmarg value="-DbuildId.tests=${buildId.tests}" />
-            <jvmarg value="-Dtimestamp.tests=${timestamp.tests}" />
-            <arg value="-propertyfile" />
-            <arg
-                value="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.perf/perf.properties" />
-            <arg value="-application" />
-            <arg value="org.eclipse.ant.core.antRunner" />
-            <arg value="-file" />
-            <arg
-                value="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.perf/perf.xml" />
-            <arg value="-logger" />
-            <arg value="org.apache.tools.ant.DefaultLogger" />
-            <arg value="${perf.target}" />
-            <sysproperty
-                key="eclipse-home"
-                value="${perfRoot}/eclipse" />
-            <sysproperty
-                key="perf.buildId"
-                value="${perf.buildId}" />
-            <sysproperty
-                key="build.home"
-                value="${build.home}" />
-            <sysproperty
-                key="local.cache.dir"
-                value="${local.cache.dir}" />
-            <sysproperty
-                key="perfRoot"
-                value="${perfRoot}" />
-            <sysproperty
-                key="testDir"
-                value="${perfRoot}" />
-        </java>
-    </target>
-
-    <target name="graph">
-        <property
-            name="perf.buildId"
-            value="${buildType}${date}-${time}" />
-        <property
-            name="perfRoot"
-            value="${build.home}/perfRoot" />
-        <cvs
-            cvsRoot=":pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse"
-            package="org.eclipse.releng.basebuilder"
-            dest="${perfRoot}"
-            command="export"
-            tag="RC4_33" />
-        <property
-            file="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.perf/perf.properties" />
-        <antcall target="setup.derby">
-            <param
-                name="derby"
-                value="${perfRoot}/org.eclipse.releng.basebuilder/plugins/org.apache.derby" />
-        </antcall>
-        <mkdir dir="${perfRoot}/results/graph" />
-        <java
-            fork="true"
-            failonerror="true"
-            timeout="28800000"
-            dir="${perfRoot}"
-            classname="org.eclipse.equinox.launcher.Main">
-            <classpath>
-                <fileset
-                    dir="${perfRoot}/org.eclipse.releng.basebuilder/plugins">
-                    <include name="org.eclipse.equinox.launcher*.jar" />
-                </fileset>
-            </classpath>
-            <jvmarg value="-Dosgi.ws=${env.BASEWS}" />
-            <jvmarg value="-Dosgi.os=${env.BASEOS}" />
-            <jvmarg value="-Dosgi.arch=${env.BASEARCH}" />
-            <jvmarg
-                value="-Declipse.perf.dbloc=${build.home}/${perf.dbloc}" />
-            <arg value="-application" />
-            <arg
-                value="org.eclipse.test.performance.ui.resultGenerator" />
-            <arg value="-baseline" />
-            <arg value="${perf.ref.buildId}" />
-            <arg value="-baseline.prefix" />
-            <arg value="${perf.ref.config}" />
-            <arg value="-current" />
-            <arg value="${perf.buildId}" />
-            <arg value="-current.prefix" />
-            <arg value="${perf.config}" />
-            <arg value="-jvm" />
-            <arg value="${perf.jvm}" />
-            <arg value="-config" />
-            <arg value="${perf.config}" />
-            <arg value="-output" />
-            <arg value="${perfRoot}/results/graph" />
-        </java>
-        <copy
-            file="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.perf/performance.php"
-            tofile="${perfRoot}/results/graph/performance.php" />
-    </target>
-
-    <target
-        name="upload"
-        if="login">
-        <mkdir dir="${build.home}/archives" />
-        <zip
-            destfile="${build.home}/archives/${buildType}-${buildId}-${date}${time}.zip"
-            basedir="${build.home}/perfRoot/results" />
-        <condition
-            property="upload.path.1"
-            else="~/downloads/webtools/downloads"
-            value="~/downloads/webtools/committers">
-            <isset property="build.committers" />
-        </condition>
-        <condition
-            property="upload.path"
-            else="${upload.path.1}/drops/${buildType}-${buildId}-${date}${time}/perfresults"
-            value="${upload.path.1}/drops/${build.stream}/${buildType}-${buildId}-${date}${time}/perfresults">
-            <isset property="build.stream" />
-        </condition>
-        <exec
-            executable="ssh"
-            dir="${build.home}">
-            <arg
-                line="${login}@download1.eclipse.org rm -rf ${upload.path}" />
-        </exec>
-        <exec
-            executable="ssh"
-            dir="${build.home}">
-            <arg
-                line="${login}@download1.eclipse.org mkdir ${upload.path}" />
-        </exec>
-        <exec
-            executable="scp"
-            dir="${build.home}">
-            <arg
-                line="-r ./perfRoot/results/consolelogs ${login}@download1.eclipse.org:${upload.path}" />
-        </exec>
-        <exec
-            executable="scp"
-            dir="${build.home}">
-            <arg
-                line="-r ./perfRoot/results/html ${login}@download1.eclipse.org:${upload.path}" />
-        </exec>
-        <exec
-            executable="scp"
-            dir="${build.home}">
-            <arg
-                line="-r ./perfRoot/results/xml ${login}@download1.eclipse.org:${upload.path}" />
-        </exec>
-        <exec
-            executable="scp"
-            dir="${build.home}">
-            <arg
-                line="-r ./perfRoot/results/graph ${login}@download1.eclipse.org:${upload.path}" />
-        </exec>
-    </target>
-
-    <target
-        name="clean"
-        if="clean">
-        <property
-            file="${build.home}/${env.RELENG_BUILDER}/build.properties" />
-        <property
-            name="local.cache.dir"
-            value="${env.LOCAL_PREREQS_CACHE}" />
-        <property
-            name="workDir"
-            value="${build.home}/workDir" />
-        <property
-            name="perfRoot"
-            value="${build.home}/perfRoot" />
-        <delete
-            dir="${workDir}"
-            failonerror="false" />
-        <delete
-            dir="${perfRoot}"
-            failonerror="false" />
-        <delete failonerror="false">
-            <fileset
-                dir="${local.cache.dir}"
-                includes="wtp-*" />
-        </delete>
-    </target>
-
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtp.perf/derby.plugin.xml.template b/releng.wtpbuilder/distribution/wtp.perf/derby.plugin.xml.template
deleted file mode 100644
index 215b957..0000000
--- a/releng.wtpbuilder/distribution/wtp.perf/derby.plugin.xml.template
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.apache.derby"
-   name="org.apache.derby"
-   version="1.0.0"
-   provider-name="">
-   <runtime>
-      <library name="derby.jar">
-         <export name="*"/>
-      </library>
-      <library name="derbynet.jar">
-         <export name="*"/>
-      </library>
-      <library name="derbytools.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-</plugin>
diff --git a/releng.wtpbuilder/distribution/wtp.perf/perf.properties b/releng.wtpbuilder/distribution/wtp.perf/perf.properties
deleted file mode 100644
index bb386b7..0000000
--- a/releng.wtpbuilder/distribution/wtp.perf/perf.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###########################################################
-#
-# Performance database properties
-#
-###########################################################
-
-perf.dbloc=wtp-perf-db
-perf.config=wtpbuild
-perf.jvm=ibm1.5.0
-perf.ref.config=wtpbuild
-perf.ref.buildId=R20070502-1353
-perf.ref.jvm=ibm1.5.0
-
-###########################################################
-#
-# SWT properties
-#
-###########################################################
-
-#swt.lib.path=org.eclipse.swt.motif_3.1.0/os/linux/x86
-#swt.lib.path=org.eclipse.swt.win32_3.1.0/os/win32/x86
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtp.perf/perf.xml b/releng.wtpbuilder/distribution/wtp.perf/perf.xml
deleted file mode 100644
index 5204d59..0000000
--- a/releng.wtpbuilder/distribution/wtp.perf/perf.xml
+++ /dev/null
@@ -1,259 +0,0 @@
-<project
-    name="WTP performance testing"
-    default="main">
-
-    <property environment="env" />
-    <!-- Platform property -->
-    <property
-        name="platform"
-        value="" />
-
-    <!-- XML and HTML results -->
-    <property
-        name="results"
-        value="${perfRoot}/results" />
-
-    <!-- Tomcat install directory -->
-    <property
-        name="tomcat50Dir"
-        value="jakarta-tomcat-5.0.28" />
-
-    <!-- jonas install directory -->
-    <property
-        name="jonas432Dir"
-        value="${perfRoot}/JONAS_4_3_2" />
-
-    <target name="init">
-        <antcall target="computePluginVersion" />
-    </target>
-
-    <target name="computePluginVersion">
-        <java
-            classname="org.eclipse.wtp.releng.test.ComputePluginVersion">
-            <classpath>
-                <pathelement
-                    location="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.tests/testScripts/ComputePluginVersion.jar" />
-            </classpath>
-            <arg value="${perfRoot}/eclipse/plugins" />
-            <arg value="${perfRoot}/perf2.properties" />
-            <jvmarg value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}" />    	
-        </java>
-    </target>
-
-    <target name="runperftests">
-        <available
-            file="${perfRoot}/eclipse/plugins/${testPlugin}/test.xml"
-            property="test.xml.exists" />
-        <antcall target="runtests" />
-    </target>
-
-    <target
-        name="runtests"
-        if="test.xml.exists">
-        <ant
-            antfile="${perfRoot}/eclipse/plugins/${testPlugin}/test.xml"
-            dir="${perfRoot}/eclipse">
-            <property
-                name="library-file"
-                value="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.perf/performance-tests.xml" />
-            <property
-                name="os"
-                value="${env.BASEOS}" />
-            <property
-                name="ws"
-                value="${env.BASEWS}" />
-            <property
-                name="arch"
-                value="${env.BASEARCH}" />
-        </ant>
-        <mkdir dir="${results}/xml" />
-        <copy
-            file="${perfRoot}/eclipse/${report}.xml"
-            tofile="${results}/xml/${report}_${platform}.xml"
-            failonerror="false" />
-        <antcall target="genHtml" />
-    </target>
-
-    <target name="genHtml">
-        <xslt
-            style="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.tests/testScripts/JUNIT.XSL"
-            basedir="${results}/xml"
-            destdir="${results}/html" />
-    </target>
-
-    <!-- wst.server performance tests -->
-    <target
-        name="wst-server-perfTests"
-        description="Runs the org.eclipse.wst.server.tests.performance test.xml">
-        <antcall target="runperftests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.server.tests.performance}" />
-            <param
-                name="report"
-                value="org.eclipse.wst.server.tests.performance" />
-        </antcall>
-    </target>
-
-    <!-- Tomcat performance tests -->
-    <target
-        name="jst-server-tomcat-perfTests"
-        description="Runs the org.eclipse.jst.server.tomcat.tests.performance test.xml">
-        <antcall target="runperftests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.server.tomcat.tests.performance}" />
-            <param
-                name="report"
-                value="org.eclipse.jst.server.tomcat.tests.performance" />
-        </antcall>
-    </target>
-
-    <!-- JSP performance tests -->
-    <target
-        name="jst-jsp-perfTests"
-        description="Runs test.xml for
-												org.eclipse.jst.jsp.ui.tests.performance">
-        <antcall target="runperftests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.jsp.ui.tests.performance}" />
-            <param
-                name="report"
-                value="org.eclipse.jst.jsp.ui.tests.performance" />
-        </antcall>
-    </target>
-
-    <!-- XML performance tests -->
-    <target
-        name="wst-xml-perfTests"
-        description="Runs test.xml for
-												org.eclipse.wst.xml.ui.tests.performance">
-        <antcall target="runperftests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.xml.ui.tests.performance}" />
-            <param
-                name="report"
-                value="org.eclipse.wst.xml.ui.tests.performance" />
-        </antcall>
-    </target>
-
-    <!-- HTML performance tests -->
-    <target
-        name="wst-html-perfTests"
-        description="Runs test.xml for
-												org.eclipse.wst.html.ui.tests.performance">
-        <antcall target="runperftests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.html.ui.tests.performance}" />
-            <param
-                name="report"
-                value="org.eclipse.wst.html.ui.tests.performance" />
-        </antcall>
-    </target>
-
-    <!-- CSS performance tests -->
-    <target
-        name="wst-css-perfTests"
-        description="Runs test.xml for
-												org.eclipse.wst.css.ui.tests.performance">
-        <antcall target="runperftests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.css.ui.tests.performance}" />
-            <param
-                name="report"
-                value="org.eclipse.wst.css.ui.tests.performance" />
-        </antcall>
-    </target>
-
-    <!-- wst.common performance tests -->
-    <target
-        name="wst-common-perfTests"
-        description="Runs test.xml for org.eclipse.wst.common.tests.performance">
-        <antcall target="runperftests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.common.tests.performance}" />
-            <param
-                name="report"
-                value="org.eclipse.wst.common.tests.performance" />
-        </antcall>
-    </target>
-
-    <!-- Web services performance tests -->
-    <target
-        name="jst-ws-perfTests"
-        description="Runs the org.eclipse.jst.ws.tests.performance test.xml">
-        <antcall target="runperftests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.ws.tests.performance}" />
-            <param
-                name="report"
-                value="org.eclipse.jst.ws.tests.performance" />
-        </antcall>
-    </target>
-
-    <!-- wsdl performance tests -->
-    <target name="wst-wsdl-perfTests">
-        <antcall target="runperftests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.wsdl.tests.performance}" />
-            <param
-                name="report"
-                value="org.eclipse.wst.wsdl.tests.performance" />
-        </antcall>
-    </target>
-
-    <!-- xsd performance tests -->
-    <target name="wst-xsd-perfTests">
-        <antcall target="runperftests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.xsd.tests.performance}" />
-            <param
-                name="report"
-                value="org.eclipse.wst.xsd.tests.performance" />
-        </antcall>
-    </target>
-
-
-    <!-- j2ee performance tests -->
-    <target name="jst-j2ee-perfTests">
-        <antcall target="runperftests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.j2ee.core.tests.performance}" />
-            <param
-                name="report"
-                value="org.eclipse.jst.j2ee.core.tests.performance" />
-        </antcall>
-    </target>
-
-    <target
-        name="main"
-        depends="init">
-        <property file="${perfRoot}/perf2.properties" />
-        <property
-            name="timeout"
-            value="28800000" />
-        <property
-            name="junit-report-output"
-            value="${results}" />
-        <antcall target="wst-xsd-perfTests" />
-        <antcall target="wst-common-perfTests" />
-        <antcall target="wst-wsdl-perfTests" />
-        <antcall target="wst-server-perfTests" />
-        <antcall target="jst-server-tomcat-perfTests" />
-        <antcall target="jst-jsp-perfTests" />
-        <antcall target="wst-xml-perfTests" />
-        <antcall target="wst-html-perfTests" />
-        <antcall target="wst-css-perfTests" />
-        <antcall target="jst-ws-perfTests" />
-        <antcall target="jst-j2ee-perfTests" />
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtp.perf/performance-tests.xml b/releng.wtpbuilder/distribution/wtp.perf/performance-tests.xml
deleted file mode 100644
index a025fa6..0000000
--- a/releng.wtpbuilder/distribution/wtp.perf/performance-tests.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0"?>
-<project
-    name="WTP Performance"
-    default="default">
-
-    <property
-        name="library-xml-file"
-        value="${perfRoot}/eclipse/plugins/org.eclipse.test_3.2.0/library.xml" />
-    <import file="${library-xml-file}" />
-
-    <target name="ui-test">
-        <antcall target="ui-test-normal" />
-        <antcall target="ui-test-perf" />
-    </target>
-
-    <target name="core-test">
-        <antcall target="core-test-normal" />
-        <antcall target="core-test-perf" />
-    </target>
-
-    <target
-        name="ui-test-normal"
-        unless="runAsPerfApp">
-        <antcall target="run">
-            <param
-                name="target"
-                value="ui-test" />
-        </antcall>
-    </target>
-
-    <target
-        name="core-test-normal"
-        unless="runAsPerfApp">
-        <antcall target="run">
-            <param
-                name="target"
-                value="core-test" />
-        </antcall>
-    </target>
-
-    <target
-        name="ui-test-perf"
-        if="runAsPerfApp">
-        <antcall target="run">
-            <param
-                name="target"
-                value="eclipse-test" />
-            <param
-                name="application"
-                value="org.eclipse.wst.common.tests.performance.uitestapplication" />
-            <param
-                name="timeout"
-                value="28800000" />
-        </antcall>
-    </target>
-
-    <target
-        name="core-test-perf"
-        if="runAsPerfApp">
-        <antcall target="run">
-            <param
-                name="target"
-                value="eclipse-test" />
-            <param
-                name="application"
-                value="org.eclipse.wst.common.tests.performance.coretestapplication" />
-            <param
-                name="timeout"
-                value="28800000" />
-        </antcall>
-    </target>
-
-    <target name="run">
-
-        <property
-            name="eclipse.perf.dbloc"
-            value="-Declipse.perf.dbloc=${build.home}/${perf.dbloc}" />
-        <property
-            name="eclipse.perf.config"
-            value="-Declipse.perf.config=config=${perf.config};build=${perf.buildId};jvm=${perf.jvm}" />
-        <property
-            name="eclipse.perf.assertAgainst"
-            value="-Declipse.perf.assertAgainst=config=${perf.ref.config};build=${perf.ref.buildId};jvm=${perf.ref.jvm}" />
-        <property
-            name="extraVMargs"
-            value="" />
-
-        <ant
-            target="${target}"
-            antfile="${library-xml-file}">
-            <property
-                name="application"
-                value="${application}" />
-            <property
-                name="data-dir"
-                value="${data-dir}" />
-            <property
-                name="plugin-name"
-                value="${plugin-name}" />
-            <property
-                name="classname"
-                value="${classname}" />
-            <property
-                name="extraVMargs"
-                value="${eclipse.perf.dbloc} ${eclipse.perf.config} ${eclipse.perf.assertAgainst} ${extraVMargs} -Dwtp.autotest.noninteractive=true" />
-        </ant>
-
-    </target>
-
-    <target name="default" />
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtp.perf/performance.php b/releng.wtpbuilder/distribution/wtp.perf/performance.php
deleted file mode 100644
index ce65d0d..0000000
--- a/releng.wtpbuilder/distribution/wtp.perf/performance.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body>
-
-<?php include("global.php"); ?>
-
-<table>
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-</table>
-
-<TABLE BORDER=0 CELLSPACING=5 CELLPADDING=2 WIDTH="100%"> 
-  <TR>
-    <TD ALIGN=LEFT VALIGN=TOP COLSPAN="3" BGCOLOR="#0080C0"><B><FONT COLOR="#FFFFFF" FACE="Arial,Helvetica">Detailed performance data for</FONT></B></TD>
-  </TR>
-</TABLE>
-
-<?php
-$aDir = dir(".");
-while ($anEntry = $aDir->read())
-{
-  $len = strlen("org.eclipse.php");
-  if (strlen($anEntry) > $len)
-  {
-    if (substr($anEntry, 0, 12) == "org.eclipse.")
-    {
-      echo "<a href=\"$anEntry\">$anEntry</a><br>";
-    }
-  }
-}
-?>
-
-<table>
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-</table>
-
-<TABLE BORDER=0 CELLSPACING=5 CELLPADDING=2 WIDTH="100%"> 
-  <TR>
-    <TD ALIGN=LEFT VALIGN=TOP COLSPAN="3" BGCOLOR="#0080C0"><B><FONT COLOR="#FFFFFF" FACE="Arial,Helvetica">Performance Unit Test Results for</FONT></B></TD>
-  </TR>
-</TABLE>
-
-<TABLE BORDER=1 CELLSPACING=5 CELLPADDING=2 WIDTH="100%">
-  <TH>Tests Performed</TH>
-  <TH>Testcases</TH>
-  <TH>Errors and Failures</TH>
-  <?php
-    $aDir = dir("../xml");
-    while ($anEntry = $aDir->read())
-    {
-      if ($anEntry != "." && $anEntry != "..")
-      {
-        echo "<tr>";
-        $html = substr($anEntry, 0, strlen($anEntry) - 3) . "html";
-        echo "<td><a href=\"../html/$html\">$html</a></td>";
-        $file = "../xml/" . $anEntry;
-        $filehandle = fopen($file, "r");
-        $filecontent = fread($filehandle, filesize($file));
-        $tc = substr_count($filecontent, "<testcase");
-        echo "<td>$tc</td>";
-        $error = substr_count($filecontent, "<error");
-        $failure = substr_count($filecontent, "<failure");
-        $total = $error + $failure;
-        echo "<td>$total</td>";
-        echo "</tr>";
-      }
-    }
-  ?>
-</TABLE>
-
-</body>
-
-</html>
\ No newline at end of file