This commit was manufactured by cvs2svn to create branch
'david_williamd_tempTest21'.
diff --git a/releng.wtpbuilder/.buildpath b/releng.wtpbuilder/.buildpath
deleted file mode 100644
index 8bcb4b5..0000000
--- a/releng.wtpbuilder/.buildpath
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<buildpath>
-	<buildpathentry kind="src" path=""/>
-	<buildpathentry kind="con" path="org.eclipse.php.core.LANGUAGE"/>
-</buildpath>
diff --git a/releng.wtpbuilder/.cache/.cvsignore b/releng.wtpbuilder/.cache/.cvsignore
deleted file mode 100644
index 03de8ac..0000000
--- a/releng.wtpbuilder/.cache/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-.dataModel
diff --git a/releng.wtpbuilder/.cvsignore b/releng.wtpbuilder/.cvsignore
deleted file mode 100644
index 85b82bf..0000000
--- a/releng.wtpbuilder/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.cache
-.cache/.dataModel
-temp
diff --git a/releng.wtpbuilder/.project b/releng.wtpbuilder/.project
deleted file mode 100644
index 7e50d0f..0000000
--- a/releng.wtpbuilder/.project
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>releng.wtpbuilder</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.dltk.core.scriptbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.php.core.PhpIncrementalProjectBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.php.core.PHPNature</nature>
-	</natures>
-</projectDescription>
diff --git a/releng.wtpbuilder/.settings/org.eclipse.core.resources.prefs b/releng.wtpbuilder/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index c8361d7..0000000
--- a/releng.wtpbuilder/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 25 23:14:35 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/releng.wtpbuilder/.settings/org.eclipse.core.runtime.prefs b/releng.wtpbuilder/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 97e8c82..0000000
--- a/releng.wtpbuilder/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sat Jun 30 23:53:40 EDT 2007
-eclipse.preferences.version=1
-line.separator=\n
diff --git a/releng.wtpbuilder/.settings/org.eclipse.php.core.prefs b/releng.wtpbuilder/.settings/org.eclipse.php.core.prefs
deleted file mode 100644
index 7f1ff5f..0000000
--- a/releng.wtpbuilder/.settings/org.eclipse.php.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Sun Sep 30 02:13:25 EDT 2007
-eclipse.preferences.version=1
-phpVersion=php5
-use_asp_tags_as_php=false
diff --git a/releng.wtpbuilder/build.properties b/releng.wtpbuilder/build.properties
deleted file mode 100644
index bdb8ed1..0000000
--- a/releng.wtpbuilder/build.properties
+++ /dev/null
@@ -1,45 +0,0 @@
-
-# This is the eclipse releng driver
-# It is only used to drive the build process
-# it must be relative to the build home
-#
-
-# allow the build to be forgiving of resolution problems
-# note, this means things can be built that won't run, but, 
-# in some cases, the packaging "fixes" the problem. 
-# in some cases, this is required, such as when building multiple 
-# versions of singletons 
-resolution.devMode=true
-
-# uncomment if its desired to skip unit tests
-# (if not already defined from elsewhere)
-# skipUnitTests=yes
-
-#
-# in 3.2 based builds, this version is no longer appended to
-# pde builder directory name.
-#eclipse.base.version=3.1.0
-
-archivesFormat=*,*,*-antZip
-
-logExtension=.xml
-# 	Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
-# 	using the JDT Compiler Adapter to compile.
-javacVerbose=true
-# 	javacFailOnError must be false otherwise the
-# 	build will terminated at the first compile error
-javacFailOnError=false
-javacDebugInfo=true
-
-# 	Asks the compiler for verbose output.  This should be set
-#   to true in order for *.bin.log files to be generated when
-# 	using the JDT Compiler Adapter to compile.
-javacVerbose=true
-#############################################################
-
-# Properties introduced in 3.5 M3 (PDE base builder R35_M2). See
-# http://aniefer.blogspot.com/2008/10/sorting-bundles-and-parallel.html
-
-flattenDependencies=true
-parallelCompilation=true
-
diff --git a/releng.wtpbuilder/build.xml b/releng.wtpbuilder/build.xml
deleted file mode 100644
index cd6afc0..0000000
--- a/releng.wtpbuilder/build.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-<project
-    name="build"
-    default="build"
-    basedir=".">
-
-    <!-- = = = standard properties pattern = = = -->
-    <!--
-        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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-    <property
-        file="${ant.project.name}.properties"/>
-
-    <!-- = = = end standard properties pattern = = = -->
-    <fail
-        unless="build.distribution"
-        message="build.distribution must be specified"/>
-    <echo
-        message="build.distribution: ${build.distribution}"/>
-
-    <!-- main -->
-    <target
-        name="build"
-        depends="init"
-        if="build_distro_target_exists">
-        <property
-            name="buildfile"
-            value="${wtp.builder.home}/distribution/${build.distribution}.build/build.xml"/>
-        <echo
-            level="info"
-            message="buildfile: ${buildfile}"/>
-        <!-- build -->
-        <ant
-            antfile="${buildfile}"/>
-    </target>
-    <target
-        name="site"
-        depends="init"
-        if="site_distro_target_exists">
-        <ant
-            antfile="${wtp.builder.home}/distribution/${build.distribution}.site/build.xml"></ant>
-    </target>
-    <target
-        name="test"
-        depends="init"
-        if="tests_distro_target_exists">
-        <ant
-            antfile="${wtp.builder.home}/distribution/${build.distribution}.tests/build.xml">
-            <property
-                name="testRoot"
-                value="${env.PROJECT_TESTS}/${projectname}"/>
-            <property
-                name="dependencyTargets"
-                value="${wtp.builder.home}/scripts/dependency/build.xml"/>
-            <property
-                name="local.cache.dir"
-                value="${env.LOCAL_PREREQS_CACHE}"/>
-        </ant>
-    </target>
-    <target
-        name="upload"
-        depends="init"
-        if="upload_distro_target_exists">
-        <ant
-            antfile="${wtp.builder.home}/distribution/${build.distribution}.upload/build.xml"/>
-    </target>
-    <target
-        name="copyArtifacts"
-        depends="init">
-        <mkdir
-            dir="${localStampedArtifactsDirectory}"/>
-        <mkdir
-            dir="${localStampedArtifactsDirectory}/${buildLabel}"/>
-        <copy
-            todir="${localStampedArtifactsDirectory}/${buildLabel}"
-            overwrite="true">
-            <fileset
-                dir="${buildDirectory}/${buildLabel}"/>
-        </copy>
-    </target>
-    <!--
-        init: 1) set buildBranch property 2) call label.xml to create
-        label.properties file in <BUILD HOME>/projects/<project>/workdir
-        3) check for existence of build.xml file for each of the build,
-        test, upload, site distribution locations and set properties
-    -->
-    <target
-        name="init">
-        <dirname
-            file="${ant.file}"
-            property="wtp.builder.home"/>
-        
-        <!-- if not set above, assume R3.2.0 -->
-        <!-- this happens, for example, when using a "tempTest" branch -->
-        <property
-            name="buildBranch"
-            value="R3.2.0"/>
-        <touch
-            file="${user.home}/.cvspass"/>
-        <!--
-            strip trailing blanks. Seems either Eclipse, or CVS make it
-            hard to not have trailing spaces
-        -->
-        <replaceregexp
-            flags="gm"
-            file="${wtp.builder.home}/build.properties"
-            match=" *$"
-            replace=""/>
-        <property
-            file="${wtp.builder.home}/build.properties"/>
-
-        <!-- creating label.properties file -->
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-        <property
-            file="${buildDirectory}/label.properties"/>
-        <echo
-            level="info"
-            message="label: ${buildDirectory}/label.properties"/>
-        <property
-            name="build.distribution"
-            value="${wtp.builder.home}/distribution/${wtp.builder.home}/distribution/${build.distribution}"/>
-        <available
-            file="${wtp.builder.home}/distribution/${build.distribution}.build/build.xml"
-            type="file"
-            property="build_distro_target_exists"/>
-        <available
-            file="${wtp.builder.home}/distribution/${build.distribution}.site/build.xml"
-            type="file"
-            property="site_distro_target_exists"/>
-        <available
-            file="${wtp.builder.home}/distribution/${build.distribution}.tests/build.xml"
-            type="file"
-            property="tests_distro_target_exists"/>
-        <available
-            file="${wtp.builder.home}/distribution/${build.distribution}.upload/build.xml"
-            type="file"
-            property="upload_distro_target_exists"/>
-        <!--
-            fetch the HEAD stream of all projects if build type
-            specified as N
-        -->
-        <condition
-            property="fetchTag"
-            value="HEAD">
-            <equals
-                arg1="${buildType}"
-                arg2="N"/>
-        </condition>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/build.xml b/releng.wtpbuilder/buildtemplates/build.xml
deleted file mode 100644
index 0f60d06..0000000
--- a/releng.wtpbuilder/buildtemplates/build.xml
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-    <!--
-        Copyright (c) 2009 IBM Corporation and others. All rights
-        reserved. This program and the accompanying materials are made
-        available under the terms of the Eclipse Public License v1.0
-        which accompanies this distribution, and is available at
-        http://www.eclipse.org/legal/epl-v10.html Contributors: IBM
-        Corporation - initial API and implementation Remember, this
-        script, in workbench, should be ran in "same vm as workspace".
-    -->
-<project
-    name="project"
-    default="default"
-    basedir=".">
-    <description>script to create a new build component, based on values
-        in property file</description>
-    <!--
-        If not otherwise specified by caller, hardcode a property file
-        to use (it's used in two ways, one to read in properties, and
-        again in the replace filter elements).
-    -->
-    <property
-        name="componentpropertyfile"
-        value="jsdt.properties"/>
-    <property
-        file="${componentpropertyfile}"/>
-    <!--
-        These are values added to base feature name, before the
-        ".feature" suffix. These are the expected values, but can be
-        overridden in componentpropertyfile.
-    -->
-    <property
-        name="featuresuffix"
-        value=".feature"/>
-    <property
-        name="sdksuffix"
-        value="_sdk.feature"/>
-    <property
-        name="testsuffix"
-        value="_tests"/>
-    <property
-        name="incubating"
-        value="true"/>
-    <property
-        name="prereq.eclipse"
-        value="false"/>
-    <property
-        name="prereq.eclipseplatform"
-        value="false"/>
-    <property
-        name="prereq.emf"
-        value="false"/>
-    <property
-        name="prereq.emfxsd"
-        value="false"/>
-    <property
-        name="prereq.emfvalidation"
-        value="false"/>
-    <property
-        name="prereq.gef"
-        value="false"/>
-    <property
-        name="prereq.dtp"
-        value="false"/>
-    <property
-        name="prereq.wst"
-        value="false"/>
-    <property
-        name="prereq.jst"
-        value="false"/>
-    <property
-        name="prereq.wtp"
-        value="false"/>
-    <!--
-        Some simple "get started" scripts to build files for simple
-        build cases. See an existing property file for description of
-        values required. These algorithms/heuristics assume there's only
-        one feature being worked with per component Note: Nothing is
-        done for "dependancies". Note: Pattern of directories created:
-        component/%shortname% component/%shortname%_sdk
-        component/%shortname%_tests distribution/%shortname%.build
-        distribution/%shortname%.site distribution/%shortname%.tests
-    -->
-    <target
-        name="default"
-        depends="replaceTokens">
-        <property
-            file="${componentpropertyfile}"/>
-        <echo
-            message="  Creating build files for ${shortname}"/>
-        <move
-            todir="../components/${shortname}">
-            <fileset
-                dir="../temp/components/template"/>
-        </move>
-        <move
-            todir="../components/${shortname}_sdk">
-            <fileset
-                dir="../temp/components/template_sdk"/>
-        </move>
-        <move
-            todir="../components/${shortname}_tests">
-            <fileset
-                dir="../temp/components/template_tests"/>
-        </move>
-        <move
-            todir="../distribution/${shortname}.build">
-            <fileset
-                dir="../temp/distribution/template.build"/>
-        </move>
-        <move
-            todir="../distribution/${shortname}.site">
-            <fileset
-                dir="../temp/distribution/template.site"/>
-        </move>
-        <move
-            todir="../distribution/${shortname}.tests">
-            <fileset
-                dir="../temp/distribution/template.tests"/>
-        </move>
-    </target>
-    <target
-        name="replaceTokens"
-        depends="copyToTemp"
-        description="replaces tokens based on property file">
-        <replace
-            dir="../temp"
-            value="error-no-value-specified"
-            propertyFile="${componentpropertyfile}">
-            <replacefilter
-                token="@featurename@"
-                property="featurename"/>
-            <replacefilter
-                token="@zipprefix@"
-                property="zipprefix"/>
-            <replacefilter
-                token="@relengmapsenv@"
-                property="relengmapsenv"/>
-            <replacefilter
-                token="@shortname@"
-                property="shortname"/>
-            <replacefilter
-                token="@longdescription@"
-                property="longdescription"/>
-
-            <replacefilter
-                token="@featuresuffix@"
-                value="${featuresuffix}"/>
-            <replacefilter
-                token="@sdksuffix@"
-                value="${sdksuffix}"/>
-            <replacefilter
-                token="@testsuffix@"
-                value="${testsuffix}"/>
-            <replacefilter
-                token="@incubating@"
-                value="${incubating}"/>
-                	
-            <replacefilter
-                token="@prereq.eclipseplatform@"
-                value="${prereq.eclipseplatform}"/>
-            <replacefilter
-                token="@prereq.eclipse@"
-                value="${prereq.eclipse}"/>
-            <replacefilter
-                token="@prereq.emf@"
-                value="${prereq.emf}"/>
-            <replacefilter
-                token="@prereq.emfxsd@"
-                value="${prereq.emfxsd}"/>
-            <replacefilter
-                token="@prereq.emfvalidation@"
-                value="${prereq.emfvalidation}"/>
-            <replacefilter
-                token="@prereq.gef@"
-                value="${prereq.gef}"/>
-            <replacefilter
-                token="@prereq.dtp@"
-                value="${prereq.dtp}"/>
-            <replacefilter
-                token="@prereq.wst@"
-                value="${prereq.wst}"/>
-            <replacefilter
-                token="@prereq.jst@"
-                value="${prereq.jst}"/>
-            <replacefilter
-                token="@prereq.wtp@"
-                value="${prereq.wtp}"/>
-        </replace>
-    </target>
-    <target
-        name="copyToTemp">
-        <copy
-            todir="../temp"
-            overwrite="true">
-            <fileset
-                dir="../buildtemplates"
-                excludes="build.xml, variables.txt, *.properties"/>
-        </copy>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/buildall.xml b/releng.wtpbuilder/buildtemplates/buildall.xml
deleted file mode 100644
index 0a4f860..0000000
--- a/releng.wtpbuilder/buildtemplates/buildall.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-    name="project"
-    default="default">
-    <target
-        name="default">
-        <ant>
-            <property
-                name="componentpropertyfile"
-                value="xmlsec.properties"/>
-        </ant>
-        <ant>
-            <property
-                name="componentpropertyfile"
-                value="jaxws.properties"/>
-        </ant>
-        <ant>
-            <property
-                name="componentpropertyfile"
-                value="vex.properties"/>
-        </ant>
-        <ant>
-            <property
-                name="componentpropertyfile"
-                value="pave.properties"/>
-        </ant>
-        <ant>
-            <property
-                name="componentpropertyfile"
-                value="jsdt.properties"/>
-        </ant>
-        <ant>
-            <property
-                name="componentpropertyfile"
-                value="xml.properties"/>
-        </ant>
-        <ant>
-            <property
-                name="componentpropertyfile"
-                value="servadapt.properties"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/components/template/build.properties b/releng.wtpbuilder/buildtemplates/components/template/build.properties
deleted file mode 100644
index 5bed879..0000000
--- a/releng.wtpbuilder/buildtemplates/components/template/build.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# This is a subdirectory of $buildDirectory
-# Set collectingFolder and archivePrefix to . if you want to create archives without
-# trailing eclipse in the paths of the included files
-collectingFolder=eclipse
-logExtension=.xml
-# The prefix that will be used in the generated archive.
-# Does not make sense to use a different archivePrefix than collectingFolder, 
-# because zip wouldn't find any files to include into the target zip otherwise
-archivePrefix=eclipse
-
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-##################################################
-# Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
-javacVerbose=true
-
-sign=true
-
-#############################################################
-
-# Properties introduced in 3.5 M3 (PDE base builder R35_M2). See
-# http://aniefer.blogspot.com/2008/10/sorting-bundles-and-parallel.html
-
-flattenDependencies=true
-parallelCompilation=true
-
-
diff --git a/releng.wtpbuilder/buildtemplates/components/template/customTargets.xml b/releng.wtpbuilder/buildtemplates/components/template/customTargets.xml
deleted file mode 100644
index 97fb808..0000000
--- a/releng.wtpbuilder/buildtemplates/components/template/customTargets.xml
+++ /dev/null
@@ -1,356 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-    <!--
-        = = = standard properties pattern = = = 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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- let this project specify properties, if not already set -->
-    <property
-        file="build.properties"/>
-    <fail
-        message="dependency.properties must be specified by distribution script"
-        unless="dependency.properties"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set"/>
-    <echo
-        message="buildDirectory: ${buildDirectory}"/>
-    <!--
-        Run a given ${target} on all elements being built Add on <ant>
-        task for each top level element being built.
-    -->
-    <target
-        name="allElements">
-        <echo
-            level="info"
-            message="Target:${target} "/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="info"
-            message="component: ${component}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}"/>
-        <echo
-            level="debug"
-            message="generic target: ${genericTargets}"/>
-        <echo
-            message="compilerArg: ${compilerArg}"/>
-        <echo
-            message="individualSourceBundles: ${individualSourceBundles}"/>
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature"/>
-            <property
-                name="id"
-                value="@featurename@@featuresuffix@"/>
-        </ant>
-    </target>
-    <!--
-        Targets to assemble the built elements for particular
-        configurations These generally call the generated assemble
-        scripts (named in ${assembleScriptName}) but may also add pre
-        and post processing Add one target for each root element and
-        each configuration
-    -->
-    <target
-        name="assemble.@featurename@@featuresuffix@">
-        <property
-            name="archiveName"
-            value="@zipprefix@-${buildLabel}.zip"/>
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}"/>
-    </target>
-    <target
-        name="prePackage"/>
-    <target
-        name="postPackage">
-        <property
-            name="archiveName"
-            value="@zipprefix@-${buildLabel}.zip"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-            <property
-                name="buildLabel"
-                value="${buildLabel}"/>
-            <property
-                name="archiveName"
-                value="${archiveName}"/>
-        </ant>
-    </target>
-
-    <!-- 
-        Check out map files from repository
-    -->
-    <target
-        name="getMapFiles">
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENG}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.@relengmapsenv@}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-    </target>
-
-
-    <!-- 
-        Steps to do before setup
-    -->
-    <target
-        name="preSetup"></target>
-    <!--
-        Steps to do after setup but before starting the build proper
-    -->
-    <target
-        name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}"/>
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}"/>
-
-        <!-- Get the dependencies -->
-        <antcall
-            target="getDependencies"/>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Get the dependencies based on releng maps -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="getDependencies">
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-            <property
-                name="base.install.dir"
-                value="${buildRoot}"/>
-        </ant>
-    </target>
-
-    <!--
-      Steps to do before fetching the build elements
-    -->
-    <target
-        name="preFetch"></target>
-
-    <!-- 
-      Steps to do after fetching the build elements
-    -->
-    <target
-        name="postFetch"></target>
-
-    <!--
-      Steps to do before generating the build scripts.
-    -->
-    <target
-        name="preGenerate"></target>
-
-    <!--
-      Steps to do after generating the build scripts.
-    -->
-    <target
-        name="postGenerate">
-        <echo
-            message="buildDirectory: ${buildDirectory}"/>
-        <customizeAccessRules
-            bundleDirectory="${buildDirectory}/plugins"/>
-    </target>
-    <!--
-        Steps to do before running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include
-                name="**/about.mappings"/>
-        </replace>
-    </target>
-    <!--
-        Steps to do after running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="postProcess">
-        <condition
-            property="logsAvailable">
-            <istrue
-                value="${javacVerbose}"/>
-        </condition>
-        <antcall
-            target="gatherLogs"/>
-    </target>
-
-
-    <!--
-      Steps to do before running assemble. 
-    -->
-    <target
-        name="preAssemble"></target>
-
-    <!--
-      Steps to do after  running assemble.
-    -->
-    <target
-        name="postAssemble"></target>
-
-    <!--
-      Steps to do after the build is done.
-    -->
-    <target
-        name="postBuild"></target>
-
-    <!--
-      Steps to do to test the build results
-    -->
-    <target
-        name="test"></target>
-
-    <!--
-      Steps to do to publish the build results
-    -->
-    <target
-        name="publish"></target>
-
-    <!--
-      Helper targets
-    -->
-	    <target
-	        name="gatherLogs"
-	        if="logsAvailable">
-	        <mkdir
-	            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
-	        <echo
-	            level="debug"
-	            message="logExtension: ${logExtension}"/>
-	        <antcall
-	            target="allElements">
-	            <param
-	                name="target"
-	                value="gatherLogs"/>
-	            <param
-	                name="logExtension"
-	                value="${logExtension}"/>
-	        </antcall>
-	        <unzip
-	            dest="${buildDirectory}/${buildLabel}/compilelogs"
-	            overwrite="true">
-	            <fileset
-                dir="${buildDirectory}/features/@featurename@@featuresuffix@">
-	                <include
-	                    name="**/*.log.zip"/>
-	            </fileset>
-	        </unzip>
-	        <!--
-	            TODO: it is unclear if the above "gather" and unzip do
-	            anything constructive. I think not and should be removed
-	            (after experimental run, of course.
-	        -->
-	        <!--
-	            workaround: see
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-	        -->
-	        <copy
-	            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
-	            overwrite="true">
-	            <!--
-	                we want all @dot.xml files, but assumes a certain
-	                structure, to include directory for name of plugin
-	            -->
-	            <fileset
-	                dir="${buildDirectory}/features/">
-	                <include
-	                    name="**/feature.temp.folder/"/>
-	                <exclude
-	                    name="**/*tests*feature*/feature.temp.folder/" />
-	                     
-	            </fileset>
-	            <compositemapper>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/@dot.xml"
-	                    to="/\2/@dot.xml"/>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-	                    to="/\2/\3bin.xml"/>
-	            </compositemapper>
-	        </copy>
-	    </target>
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="cleanElement"/>
-        </antcall>
-    </target>
-
-    <!--
-      Default target 
-    -->
-    <target
-        name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/components/template/dependency.xml b/releng.wtpbuilder/buildtemplates/components/template/dependency.xml
deleted file mode 100644
index b10babf..0000000
--- a/releng.wtpbuilder/buildtemplates/components/template/dependency.xml
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-        <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-        
-    <condition
-        property="getprereq.eclipse">
-        <istrue
-            value="@prereq.eclipse@"/>
-    </condition>
-    <condition
-        property="getprereq.eclipseplatform">
-        <istrue
-            value="@prereq.eclipseplatform@"/>
-    </condition>
-    <condition
-        property="getprereq.emf">
-        <istrue
-            value="@prereq.emf@"/>
-    </condition>
-    <condition
-        property="getprereq.emfxsd">
-        <istrue
-            value="@prereq.emfxsd@"/>
-    </condition>
-    <condition
-        property="getprereq.emfvalidation">
-        <istrue
-            value="@prereq.emfvalidation@"/>
-    </condition>
-    <condition
-        property="getprereq.gef">
-        <istrue
-            value="@prereq.gef@"/>
-    </condition>
-    <condition
-        property="getprereq.dtp">
-        <istrue
-            value="@prereq.dtp@"/>
-    </condition>
-    <condition
-        property="getprereq.wst">
-        <istrue
-            value="@prereq.wst@"/>
-    </condition>
-    <condition
-        property="getprereq.jst">
-        <istrue
-            value="@prereq.jst@"/>
-    </condition>
-    <condition
-        property="getprereq.wtp">
-        <istrue
-            value="@prereq.wtp@"/>
-    </condition>
-    <target
-        name="get">
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined, which we do later with
-            statements such if="${groupId}.url"
-        -->
-        <property
-            file="${dependency.properties}"/>
-        <antcall
-            target="prereq.eclipse"/>
-        <antcall
-            target="prereq.eclipseplatform"/>
-        <antcall
-            target="prereq.emf"/>
-        <antcall
-            target="prereq.emfxsd"/>
-        <antcall
-            target="prereq.emfvalidation"/>
-        <antcall
-            target="prereq.gef"/>
-        <antcall
-            target="prereq.dtp"/>
-        <antcall
-            target="prereq.wst"/>
-        <antcall
-            target="prereq.jst"/>
-        <antcall
-            target="prereq.wtp"/>
-    </target>
-    <target
-        name="prereq.eclipse"
-        if="getprereq.eclipse">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.eclipseplatform"
-        if="getprereq.eclipseplatform">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipseplatform"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emf"
-        if="getprereq.emf">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfxsd"
-        if="getprereq.emfxsd">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfvalidation"
-        if="getprereq.emfvalidation">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfvalidation"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.gef"
-        if="getprereq.gef">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.dtp"
-        if="getprereq.dtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="dtp"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wst"
-        if="getprereq.wst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.jst"
-        if="getprereq.jst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="jst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wtp"
-        if="getprereq.wtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstall"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/components/template_sdk/build.properties b/releng.wtpbuilder/buildtemplates/components/template_sdk/build.properties
deleted file mode 100644
index 5bed879..0000000
--- a/releng.wtpbuilder/buildtemplates/components/template_sdk/build.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# This is a subdirectory of $buildDirectory
-# Set collectingFolder and archivePrefix to . if you want to create archives without
-# trailing eclipse in the paths of the included files
-collectingFolder=eclipse
-logExtension=.xml
-# The prefix that will be used in the generated archive.
-# Does not make sense to use a different archivePrefix than collectingFolder, 
-# because zip wouldn't find any files to include into the target zip otherwise
-archivePrefix=eclipse
-
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-##################################################
-# Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
-javacVerbose=true
-
-sign=true
-
-#############################################################
-
-# Properties introduced in 3.5 M3 (PDE base builder R35_M2). See
-# http://aniefer.blogspot.com/2008/10/sorting-bundles-and-parallel.html
-
-flattenDependencies=true
-parallelCompilation=true
-
-
diff --git a/releng.wtpbuilder/buildtemplates/components/template_sdk/customTargets.xml b/releng.wtpbuilder/buildtemplates/components/template_sdk/customTargets.xml
deleted file mode 100644
index dc4859a..0000000
--- a/releng.wtpbuilder/buildtemplates/components/template_sdk/customTargets.xml
+++ /dev/null
@@ -1,356 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-    <!--
-        = = = standard properties pattern = = = 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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- let this project specify properties, if not already set -->
-    <property
-        file="build.properties"/>
-    <fail
-        message="dependency.properties must be specified by distribution script"
-        unless="dependency.properties"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set"/>
-    <echo
-        message="buildDirectory: ${buildDirectory}"/>
-    <!--
-        Run a given ${target} on all elements being built Add on <ant>
-        task for each top level element being built.
-    -->
-    <target
-        name="allElements">
-        <echo
-            level="info"
-            message="Target:${target} "/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="info"
-            message="component: ${component}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}"/>
-        <echo
-            level="debug"
-            message="generic target: ${genericTargets}"/>
-        <echo
-            message="compilerArg: ${compilerArg}"/>
-        <echo
-            message="individualSourceBundles: ${individualSourceBundles}"/>
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature"/>
-            <property
-                name="id"
-                value="@featurename@@sdksuffix@"/>
-        </ant>
-    </target>
-    <!--
-        Targets to assemble the built elements for particular
-        configurations These generally call the generated assemble
-        scripts (named in ${assembleScriptName}) but may also add pre
-        and post processing Add one target for each root element and
-        each configuration
-    -->
-    <target
-        name="assemble.@featurename@@sdksuffix@">
-        <property
-            name="archiveName"
-            value="@zipprefix@-sdk-${buildLabel}.zip"/>
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}"/>
-    </target>
-    <target
-        name="prePackage"/>
-    <target
-        name="postPackage">
-        <property
-            name="archiveName"
-            value="@zipprefix@-sdk-${buildLabel}.zip"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-            <property
-                name="buildLabel"
-                value="${buildLabel}"/>
-            <property
-                name="archiveName"
-                value="${archiveName}"/>
-        </ant>
-    </target>
-
-    <!--
-        Check out map files from repository
-        -->
-    <target
-        name="getMapFiles">
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENG}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.@relengmapsenv@}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-    </target>
-
-
-    <!-- 
-        Steps to do before setup
-    -->
-    <target
-        name="preSetup"></target>
-    <!--
-        Steps to do after setup but before starting the build proper
-    -->
-    <target
-        name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}"/>
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}"/>
-
-        <!-- Get the dependencies -->
-        <antcall
-            target="getDependencies"/>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Get the dependencies based on releng maps -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="getDependencies">
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-            <property
-                name="base.install.dir"
-                value="${buildRoot}"/>
-        </ant>
-    </target>
-
-    <!--
-      Steps to do before fetching the build elements
-    -->
-    <target
-        name="preFetch"></target>
-
-    <!-- 
-      Steps to do after fetching the build elements
-    -->
-    <target
-        name="postFetch"></target>
-
-    <!--
-      Steps to do before generating the build scripts.
-    -->
-    <target
-        name="preGenerate"></target>
-
-    <!--
-      Steps to do after generating the build scripts.
-    -->
-    <target
-        name="postGenerate">
-        <echo
-            message="buildDirectory: ${buildDirectory}"/>
-        <customizeAccessRules
-            bundleDirectory="${buildDirectory}/plugins"/>
-    </target>
-    <!--
-        Steps to do before running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include
-                name="**/about.mappings"/>
-        </replace>
-    </target>
-    <!--
-        Steps to do after running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="postProcess">
-        <condition
-            property="logsAvailable">
-            <istrue
-                value="${javacVerbose}"/>
-        </condition>
-        <antcall
-            target="gatherLogs"/>
-    </target>
-
-
-    <!--
-      Steps to do before running assemble. 
-        -->
-    <target
-        name="preAssemble"></target>
-
-    <!--
-      Steps to do after  running assemble.
-    -->
-    <target
-        name="postAssemble"></target>
-
-    <!--
-      Steps to do after the build is done.
-    -->
-    <target
-        name="postBuild"></target>
-
-    <!--
-      Steps to do to test the build results
-    -->
-    <target
-        name="test"></target>
-
-    <!--
-      Steps to do to publish the build results
-    -->
-    <target
-        name="publish"></target>
-
-    <!--
-      Helper targets
-    -->
-	    <target
-	        name="gatherLogs"
-	        if="logsAvailable">
-	        <mkdir
-	            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
-	        <echo
-	            level="debug"
-	            message="logExtension: ${logExtension}"/>
-	        <antcall
-	            target="allElements">
-	            <param
-	                name="target"
-	                value="gatherLogs"/>
-	            <param
-	                name="logExtension"
-	                value="${logExtension}"/>
-	        </antcall>
-	        <unzip
-	            dest="${buildDirectory}/${buildLabel}/compilelogs"
-	            overwrite="true">
-	            <fileset
-                dir="${buildDirectory}/features/@featurename@@sdksuffix@">
-	                <include
-	                    name="**/*.log.zip"/>
-	            </fileset>
-	        </unzip>
-	        <!--
-	            TODO: it is unclear if the above "gather" and unzip do
-	            anything constructive. I think not and should be removed
-	            (after experimental run, of course.
-	        -->
-	        <!--
-	            workaround: see
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-	        -->
-	        <copy
-	            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
-	            overwrite="true">
-	            <!--
-	                we want all @dot.xml files, but assumes a certain
-	                structure, to include directory for name of plugin
-	            -->
-	            <fileset
-	                dir="${buildDirectory}/features/">
-	                <include
-	                    name="**/feature.temp.folder/"/>
-	                <exclude
-	                    name="**/*tests*feature*/feature.temp.folder/" />
-	                     
-	            </fileset>
-	            <compositemapper>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/@dot.xml"
-	                    to="/\2/@dot.xml"/>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-	                    to="/\2/\3bin.xml"/>
-	            </compositemapper>
-	        </copy>
-	    </target>
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="cleanElement"/>
-        </antcall>
-    </target>
-
-    <!--
-      Default target 
-    -->
-    <target
-        name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/components/template_sdk/dependency.xml b/releng.wtpbuilder/buildtemplates/components/template_sdk/dependency.xml
deleted file mode 100644
index a09c8f8..0000000
--- a/releng.wtpbuilder/buildtemplates/components/template_sdk/dependency.xml
+++ /dev/null
@@ -1,225 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-        <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-        
-	    <condition
-	        property="getprereq.eclipse">
-	        <istrue
-	            value="@prereq.eclipse@"/>
-	    </condition>
-	    <condition
-	        property="getprereq.eclipseplatform">
-	        <istrue
-	            value="@prereq.eclipseplatform@"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emf">
-	        <istrue
-	            value="@prereq.emf@"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfxsd">
-	        <istrue
-	            value="@prereq.emfxsd@"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfvalidation">
-	        <istrue
-	            value="@prereq.emfvalidation@"/>
-	    </condition>
-	    <condition
-	        property="getprereq.gef">
-	        <istrue
-	            value="@prereq.gef@"/>
-	    </condition>
-	    <condition
-	        property="getprereq.dtp">
-	        <istrue
-	            value="@prereq.dtp@"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wst">
-	        <istrue
-	            value="@prereq.wst@"/>
-	    </condition>
-	    <condition
-	        property="getprereq.jst">
-	        <istrue
-	            value="@prereq.jst@"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wtp">
-	        <istrue
-	            value="@prereq.wtp@"/>
-	    </condition>
-	            	
-    <target
-        name="get">
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined, which we do later with
-            statements such if="${groupId}.url"
-        -->
-        <property
-            file="${dependency.properties}"/>
-        <antcall
-            target="prereq.eclipse"/>
-        <antcall
-            target="prereq.eclipseplatform"/>
-        <antcall
-            target="prereq.emf"/>
-        <antcall
-            target="prereq.emfxsd"/>
-        <antcall
-            target="prereq.emfvalidation"/>
-        <antcall
-            target="prereq.gef"/>
-        <antcall
-            target="prereq.dtp"/>
-        <antcall
-            target="prereq.wst"/>
-        <antcall
-            target="prereq.jst"/>
-        <antcall
-            target="prereq.wtp"/>
-    </target>
-    <target
-        name="prereq.eclipse"
-        if="getprereq.eclipse">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.eclipseplatform"
-        if="getprereq.eclipseplatform">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipseplatform"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emf"
-        if="getprereq.emf">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfxsd"
-        if="getprereq.emfxsd">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfvalidation"
-        if="getprereq.emfvalidation">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfvalidation"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.gef"
-        if="getprereq.gef">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.dtp"
-        if="getprereq.dtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="dtp"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wst"
-        if="getprereq.wst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.jst"
-        if="getprereq.jst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="jst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wtp"
-        if="getprereq.wtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstall"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/components/template_tests/build.properties b/releng.wtpbuilder/buildtemplates/components/template_tests/build.properties
deleted file mode 100644
index 4d26330..0000000
--- a/releng.wtpbuilder/buildtemplates/components/template_tests/build.properties
+++ /dev/null
@@ -1,46 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# This is a subdirectory of $buildDirectory
-# Set collectingFolder and archivePrefix to . if you want to create archives without
-# trailing eclipse in the paths of the included files
-collectingFolder=eclipse
-logExtension=.xml
-# The prefix that will be used in the generated archive.
-# Does not make sense to use a different archivePrefix than collectingFolder, 
-# because zip wouldn't find any files to include into the target zip otherwise
-archivePrefix=eclipse
-
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-##################################################
-# Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
-javacVerbose=true
-
-sign=false
-
-#############################################################
-
-# Properties introduced in 3.5 M3 (PDE base builder R35_M2). See
-# http://aniefer.blogspot.com/2008/10/sorting-bundles-and-parallel.html
-
-flattenDependencies=true
-parallelCompilation=true
-
diff --git a/releng.wtpbuilder/buildtemplates/components/template_tests/customTargets.xml b/releng.wtpbuilder/buildtemplates/components/template_tests/customTargets.xml
deleted file mode 100644
index 75528ea..0000000
--- a/releng.wtpbuilder/buildtemplates/components/template_tests/customTargets.xml
+++ /dev/null
@@ -1,356 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-    <!--
-        = = = standard properties pattern = = = 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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- let this project specify properties, if not already set -->
-    <property
-        file="build.properties"/>
-    <fail
-        message="dependency.properties must be specified by distribution script"
-        unless="dependency.properties"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set"/>
-    <echo
-        message="buildDirectory: ${buildDirectory}"/>
-    <!--
-        Run a given ${target} on all elements being built Add on <ant>
-        task for each top level element being built.
-    -->
-    <target
-        name="allElements">
-        <echo
-            level="info"
-            message="Target:${target} "/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="info"
-            message="component: ${component}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}"/>
-        <echo
-            level="debug"
-            message="generic target: ${genericTargets}"/>
-        <echo
-            message="compilerArg: ${compilerArg}"/>
-        <echo
-            message="individualSourceBundles: ${individualSourceBundles}"/>
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature"/>
-            <property
-                name="id"
-                value="@featurename@@testsuffix@@featuresuffix@"/>
-        </ant>
-    </target>
-    <!--
-        Targets to assemble the built elements for particular
-        configurations These generally call the generated assemble
-        scripts (named in ${assembleScriptName}) but may also add pre
-        and post processing Add one target for each root element and
-        each configuration
-    -->
-    <target
-        name="assemble.@featurename@@testsuffix@@featuresuffix@">
-        <property
-            name="archiveName"
-            value="@zipprefix@-tests-${buildLabel}.zip"/>
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}"/>
-    </target>
-    <target
-        name="prePackage"/>
-    <target
-        name="postPackage">
-        <property
-            name="archiveName"
-            value="@zipprefix@-tests-${buildLabel}.zip"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-            <property
-                name="buildLabel"
-                value="${buildLabel}"/>
-            <property
-                name="archiveName"
-                value="${archiveName}"/>
-        </ant>
-    </target>
-
-    <!-- 
-        Check out map files from repository
-    -->
-    <target
-        name="getMapFiles">
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENG}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.@relengmapsenv@}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-    </target>
-
-
-    <!-- 
-        Steps to do before setup
-    -->
-    <target
-        name="preSetup"></target>
-    <!--
-        Steps to do after setup but before starting the build proper
-    -->
-    <target
-        name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}"/>
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}"/>
-
-        <!-- Get the dependencies -->
-        <antcall
-            target="getDependencies"/>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Get the dependencies based on releng maps -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="getDependencies">
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-            <property
-                name="base.install.dir"
-                value="${buildRoot}"/>
-        </ant>
-    </target>
-
-    <!--
-      Steps to do before fetching the build elements
-    -->
-    <target
-        name="preFetch"></target>
-
-    <!-- 
-      Steps to do after fetching the build elements
-    -->
-    <target
-        name="postFetch"></target>
-
-    <!--
-      Steps to do before generating the build scripts.
-    -->
-    <target
-        name="preGenerate"></target>
-
-    <!--
-      Steps to do after generating the build scripts.
-    -->
-    <target
-        name="postGenerate">
-        <echo
-            message="buildDirectory: ${buildDirectory}"/>
-        <customizeAccessRules
-            bundleDirectory="${buildDirectory}/plugins"/>
-    </target>
-    <!--
-        Steps to do before running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include
-                name="**/about.mappings"/>
-        </replace>
-    </target>
-    <!--
-        Steps to do after running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="postProcess">
-        <condition
-            property="logsAvailable">
-            <istrue
-                value="${javacVerbose}"/>
-        </condition>
-        <antcall
-            target="gatherLogs"/>
-    </target>
-
-
-    <!--
-      Steps to do before running assemble. 
-        -->
-    <target
-        name="preAssemble"></target>
-
-    <!--
-      Steps to do after  running assemble.
-    -->
-    <target
-        name="postAssemble"></target>
-
-    <!--
-      Steps to do after the build is done.
-    -->
-    <target
-        name="postBuild"></target>
-
-    <!--
-      Steps to do to test the build results
-    -->
-    <target
-        name="test"></target>
-
-    <!--
-      Steps to do to publish the build results
-    -->
-    <target
-        name="publish"></target>
-
-    <!--
-      Helper targets
-    -->
-	    <target
-	        name="gatherLogs"
-	        if="logsAvailable">
-	        <mkdir
-            dir="${buildDirectory}/${buildLabel}/testcompilelogs"/>
-	        <echo
-	            level="debug"
-	            message="logExtension: ${logExtension}"/>
-	        <antcall
-	            target="allElements">
-	            <param
-	                name="target"
-	                value="gatherLogs"/>
-	            <param
-	                name="logExtension"
-	                value="${logExtension}"/>
-	        </antcall>
-	        <unzip
-            dest="${buildDirectory}/${buildLabel}/testcompilelogs"
-            overwrite="true">
-	            <fileset
-                dir="${buildDirectory}/features/@featurename@@testsuffix@@featuresuffix@">
-	                <include
-	                    name="**/*.log.zip"/>
-	            </fileset>
-	        </unzip>
-	        <!--
-	            TODO: it is unclear if the above "gather" and unzip do
-	            anything constructive. I think not and should be removed
-	            (after experimental run, of course.
-	        -->
-	        <!--
-	            workaround: see
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-	        -->
-	        <copy
-	            todir="${buildDirectory}/${buildLabel}/testcompilelogs/plugins"
-	            overwrite="true">
-	            <!--
-	                we want all @dot.xml files, but assumes a certain
-	                structure, to include directory for name of plugin
-	            -->
-	            <fileset
-	                dir="${buildDirectory}/features/">
-	                <include
-	                    name="**/feature.temp.folder/"/>
-	                <exclude
-	                    name="**/*tests*feature*/feature.temp.folder/" />
-	                     
-	            </fileset>
-	            <compositemapper>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/@dot.xml"
-	                    to="/\2/@dot.xml"/>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-	                    to="/\2/\3bin.xml"/>
-	            </compositemapper>
-	        </copy>
-	    </target>
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="cleanElement"/>
-        </antcall>
-    </target>
-
-    <!--
-      Default target 
-    -->
-    <target
-        name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/components/template_tests/dependency.xml b/releng.wtpbuilder/buildtemplates/components/template_tests/dependency.xml
deleted file mode 100644
index 90a412c..0000000
--- a/releng.wtpbuilder/buildtemplates/components/template_tests/dependency.xml
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-        <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-        
-	    <condition
-	        property="getprereq.eclipse">
-	        <istrue
-	            value="@prereq.eclipse@"/>
-	    </condition>
-	    <condition
-	        property="getprereq.eclipseplatform">
-	        <istrue
-	            value="@prereq.eclipseplatform@"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emf">
-	        <istrue
-	            value="@prereq.emf@"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfxsd">
-	        <istrue
-	            value="@prereq.emfxsd@"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfvalidation">
-	        <istrue
-	            value="@prereq.emfvalidation@"/>
-	    </condition>
-	    <condition
-	        property="getprereq.gef">
-	        <istrue
-	            value="@prereq.gef@"/>
-	    </condition>
-	    <condition
-	        property="getprereq.dtp">
-	        <istrue
-	            value="@prereq.dtp@"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wst">
-	        <istrue
-	            value="@prereq.wst@"/>
-	    </condition>
-	    <condition
-	        property="getprereq.jst">
-	        <istrue
-	            value="@prereq.jst@"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wtp">
-	        <istrue
-	            value="@prereq.wtp@"/>
-	    </condition>
-    <target
-        name="get">
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined, which we do later with
-            statements such if="${groupId}.url"
-        -->
-        <property
-            file="${dependency.properties}"/>
-        <antcall
-            target="prereq.eclipse"/>
-        <antcall
-            target="prereq.eclipseplatform"/>
-        <antcall
-            target="prereq.emf"/>
-        <antcall
-            target="prereq.emfxsd"/>
-        <antcall
-            target="prereq.emfvalidation"/>
-        <antcall
-            target="prereq.gef"/>
-        <antcall
-            target="prereq.dtp"/>
-        <antcall
-            target="prereq.wst"/>
-        <antcall
-            target="prereq.jst"/>
-        <antcall
-            target="prereq.wtp"/>
-       <antcall
-           target="getAndInstall">
-           <param
-               name="groupId"
-               value="eclipseTestFramework"/>    
-       	</antcall>
-    </target>
-    <target
-        name="prereq.eclipse"
-        if="getprereq.eclipse">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.eclipseplatform"
-        if="getprereq.eclipseplatform">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipseplatform"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emf"
-        if="getprereq.emf">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfxsd"
-        if="getprereq.emfxsd">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfvalidation"
-        if="getprereq.emfvalidation">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfvalidation"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.gef"
-        if="getprereq.gef">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.dtp"
-        if="getprereq.dtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="dtp"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wst"
-        if="getprereq.wst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.jst"
-        if="getprereq.jst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="jst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wtp"
-        if="getprereq.wtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstall"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/dali.properties b/releng.wtpbuilder/buildtemplates/dali.properties
deleted file mode 100644
index c55dfbb..0000000
--- a/releng.wtpbuilder/buildtemplates/dali.properties
+++ /dev/null
@@ -1,42 +0,0 @@
-# under development, not finished, untested
-
-# 'shortname' effects all foldernames too, plus some content, in distribution section
-# should be same name as this property file (for future use). 
-shortname=wtpdali
-
-
-# These first three properties are mainly for component templates
-
-#  'featurename' assumes group of three features
-#  a) featurename.feature
-#  b) featurename_sdk.feature
-#  c) featurename_tests.feature
-
-featurename=org.eclipse.jpt
-
-#  'zipprefix' is prefixed to -[type]-${buildlabel},
-#  where type is empty, 'sdk' or 'tests',
-#  usually of the form [top-level project]-[project]-[component]
-#  for example, wtp-incubator-xmlsecurity
-zipprefix=wtp-dali
-
-#  'relengmapseng' must match the environment variable set in
-#  commonComputedVariables, such as RELENGXMLSEC
-relengmapsenv=RELENGDALI
-
-#  prereq is the basic prereq on top of platform, jdt, emf, gef
-#  (only realistic options for right now are wst, jst).
-basicprereq=wtp
-
-# These next properties are mainly for distribution template files
-
-# longdescription appears on the download webpage
-longdescription=The Zip file contains productized Dali Developer Tools
-
-featuresuffix=.assembly.feature
-
-# special case
-sdksuffix=_sdk.assebly.feature
-
-# omit (or set to true) for incubating projects for proper webpage
-incubating=false
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.build/build.xml b/releng.wtpbuilder/buildtemplates/distribution/template.build/build.xml
deleted file mode 100644
index c58c1a1..0000000
--- a/releng.wtpbuilder/buildtemplates/distribution/template.build/build.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<project
-    default="build"
-    basedir=".">
-    <fail
-        unless="wtp.builder.home"/>
-    <property
-        file="${wtp.builder.home}/build.properties"/>
-    <target
-        name="build"
-        depends="getBaseBuilder">
-        <dirname
-            file="${ant.file}"
-            property="distribution.wtp.build.dir"/>
-        <property
-            name="buildTargets"
-            value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
-        <!--
-            for this distribution, dependencies come from project's
-            releng map project
-        -->
-        <property
-            name="dependency.properties"
-            value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-
-        <!-- calling label.xml to createg label.properties file -->
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-        <echo
-            level="info"
-            message="invoking buildTargets: ${buildTargets} to build for each component"/>
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="@shortname@"/>
-        </ant>
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="@shortname@_sdk"/>
-        </ant>
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="@shortname@_tests"/>
-            <property
-                name="eclipseBuildFailOnError"
-                value="false"/>
-        </ant>
-
-        <!-- package -->
-        <antcall
-            target="package"/>
-    </target>
-
-    <!-- invoking runbuild.xml targetting getBaseBuilder -->
-    <target
-        name="getBaseBuilder"
-        if="eclipse.builder.fetch">
-        <dirname
-            file="${ant.file}"
-            property="wtbuilder.dir"/>
-        <property
-            name="buildTargets"
-            value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
-        <echo
-            level="info"
-            message="invoking buildTargets: ${buildTargets} -> getBaseBuilder"/>
-        <ant
-            antfile="${buildTargets}"
-            target="getBaseBuilder"/>
-    </target>
-    <target
-        name="package">
-        <!--
-            post, post packaging, for WTP ... "manually" assemble the
-            desired zips
-        -->
-        <!-- nothing to assemble right now -->
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.site/build.xml b/releng.wtpbuilder/buildtemplates/distribution/template.site/build.xml
deleted file mode 100644
index 39fc90e..0000000
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/build.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-<project
-    name="Build specific targets and properties"
-    default="build"
-    basedir=".">
-    <!--
-        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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- = = = end standard properties pattern = = = -->
-    <echo
-        message="ant.file: ${ant.file}"/>
-    <target
-        name="build">
-    	<mkdir dir="${buildDirectory}/${buildLabel} "/>
-        <java
-            jar="${eclipse.launcher}"
-            fork="true"
-            failonerror="true">
-            <jvmarg
-                value="-Dosgi.ws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dosgi.os=${env.BASEOS}"/>
-            <jvmarg
-                value="-Dosgi.arch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-Dbuild.donottagmaps=${build.donottagmaps}"/>
-            <jvmarg
-                value="-DbuildBranch=${buildBranch}"/>
-            <jvmarg
-                value="-DbuildType=${buildType}"/>
-            <jvmarg
-                value="-DbuildId=${buildId}"/>
-            <jvmarg
-                value="-DmapVersionTag=${mapVersionTag}"/>
-            <jvmarg
-                value="-Dbuild.distribution=${build.distribution}"/>
-            <jvmarg
-                value="-DbuildDirectory=${buildDirectory}"/>
-            <jvmarg
-                value="-Dwtp.builder.home=${wtp.builder.home}"/>
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <jvmarg
-                value="-Dprojectname=${projectname}"/>
-            <jvmarg
-                value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
-            <jvmarg
-                value="-DurlLogLocation=${buildDirectory}/${buildLabel}/outgoinghttplogfromsitebuild.log"/>
-            <arg
-                value="-data"/>
-            <arg
-                value="${basedir}/workspace"/>
-            <arg
-                value="-application"/>
-            <arg
-                value="org.eclipse.ant.core.antRunner"/>
-            <arg
-                value="-buildfile"/>
-            <arg
-                value="${ant.file}"/>
-            <arg
-                value="publish"/>
-        </java>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Steps to do to publish the build results -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="publish">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-        <property
-            file="${buildDirectory}/label.properties"/>
-        <property
-            name="publish.xml"
-            value="${component.dir}/publish.xml"/>
-        <property
-            name="indexFileName"
-            value="index.php"/>
-        <property
-            name="result"
-            value="${buildDirectory}/${buildLabel}"/>
-        <property
-            name="indexTemplateFilename"
-            value="index.html.template.php"/>
-        <copy
-            file="${wtp.builder.home}/distribution/wtp.site/templateFiles/${indexTemplateFilename}"
-            tofile="${buildDirectory}/${indexFileName}"/>
-        <condition
-            property="isBuildTested"
-            value="true">
-            <available
-                file="${buildDirectory}/${buildLabel}/testResults/html"/>
-        </condition>
-        <ant
-            antfile="${publish.xml}"
-            dir="${component.dir}">
-            <property
-                name="dropTokenList"
-                value="%wtpruntime%,%wtpsdk%,%wtptest%,%wst%,%wst-sdk%,%wst-tests%,%jst-tests%,%wst-perf-tests%,%jst-perf-tests%,%jpt-runtime%,%jpt-sdk%,%jpt-tests%"/>
-            <property
-                name="webtoolsDownloadURL"
-                value="http://www.eclipse.org/downloads/download.php?file=/webtools/committers/drops"/>
-            <property
-                name="buildBranch"
-                value="${buildBranch}"/>
-            <property
-                name="isBuildTested"
-                value="${isBuildTested}"/>
-            <property
-                name="indexTemplateFilename"
-                value="${indexTemplateFilename}"/>
-        </ant>
-
-        <!--  Get the build map over for the results to point to. -->
-        <copy
-            file="${buildDirectory}/directory.txt"
-            tofile="${result}/directory.txt"/>
-
-        <!-- Copy info for build identification -->
-        <copy
-            file="${buildDirectory}/buildmachineinfo.properties"
-            tofile="${result}/buildmachineinfo.properties"/>
-
-        <!-- http access logs -->
-        <copy
-            todir="${result}/"
-            failonerror="false">
-            <fileset
-                dir="${buildDirectory}"
-                includes="*.log"/>
-        </copy>
-
-        <!-- ant build log, from control directory -->
-        <copy
-            todir="${result}/"
-            failonerror="false">
-            <fileset
-                dir="${env.ANT_WORKING}/${projectname}"
-                includes="antBuilderOutput.log"/>
-        </copy>
-
-
-
-        <!-- final count files -->
-        <countBuildFiles
-            sourceDirectory="${buildDirectory}/${buildLabel}"
-            filterString=".zip,.tar.gz"
-            outputFile="${buildDirectory}/${buildLabel}/files.count"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.site/compilerXMLOutputToHTML.xsl b/releng.wtpbuilder/buildtemplates/distribution/template.site/compilerXMLOutputToHTML.xsl
deleted file mode 100644
index ffc7905..0000000
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/compilerXMLOutputToHTML.xsl
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet
-    version="1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-    <xsl:output
-        method="html"
-        indent="yes"/>
-    <xsl:template
-        match="/">
-        <html>
-            <body>
-                <xsl:apply-templates
-                    select="compiler"/>
-            </body>
-        </html>
-    </xsl:template>
-    <xsl:template
-        match="compiler">
-        <h2>Compiler Report</h2>
-        <p>
-            Compiler:
-            <xsl:value-of
-                select="@name"/>
-            <xsl:text>   </xsl:text>
-            Version:
-            <xsl:value-of
-                select="@version"/>
-        </p>
-        <xsl:apply-templates
-            select="stats"/>
-        <xsl:apply-templates
-            select="sources"/>
-    </xsl:template>
-    <xsl:template
-        name="stats"
-        match="stats">
-        <p>
-            Number of source files:
-            <xsl:value-of
-                select="count(..//source)"/>
-            Number of classfiles:
-            <xsl:value-of
-                select="number_of_classfiles/@value"/>
-        </p>
-        <p>
-            Problems:
-            <xsl:value-of
-                select="problem_summary/@problems"/>
-            (Errors:
-            <xsl:value-of
-                select="problem_summary/@errors"/>
-            Warnings:
-            <xsl:value-of
-                select="problem_summary/@warnings"/>
-            )
-        </p>
-    </xsl:template>
-    <xsl:template
-        name="sources"
-        match="sources">
-        <xsl:if
-            test="count(source) > 0">
-            <dl>
-                <xsl:for-each
-                    select="source">
-                    <xsl:variable
-                        name="package"
-                        select="normalize-space(@package)">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="path"
-                        select="normalize-space(@path)">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="classname"
-                        select="substring-after($path, $package)">
-                    </xsl:variable>
-                    <xsl:if
-                        test="count(problems) > 0">
-                        <dt
-                            style="font-weight: bold; color: black">
-                            Source File:
-                            <xsl:value-of
-                                select="$package"/>
-                            <xsl:value-of
-                                select="$classname"/>
-                        </dt>
-                        <xsl:apply-templates
-                            select="problems">
-                            <xsl:with-param
-                                name="classname">
-                                <xsl:value-of
-                                    select="$classname"/>
-                            </xsl:with-param>
-                        </xsl:apply-templates>
-                    </xsl:if>
-                </xsl:for-each>
-            </dl>
-        </xsl:if>
-    </xsl:template>
-    <xsl:template
-        match="problems">
-        <xsl:param
-            name="classname"/>
-        <xsl:for-each
-            select="problem">
-            <dd
-                style="font-weight: normal; color: black">
-                <xsl:value-of
-                    select="position()"/>
-                <xsl:text>.  </xsl:text>
-                <xsl:value-of
-                    select="@severity"/>
-                <xsl:text>:  </xsl:text>
-                <xsl:value-of
-                    select="@id"/>
-                <xsl:variable
-                    name="lineNumber"
-                    select="@line">
-                </xsl:variable>
-                <xsl:for-each
-                    select="message">
-                    <p
-                        style="margin-left: +.5in; font-size: -1; margin-top: 0;margin-bottom:0;">
-                        <small>
-                            <xsl:value-of
-                                select="@value"/>
-                        </small>
-                    </p>
-                </xsl:for-each>
-                <xsl:for-each
-                    select="source_context">
-                    <xsl:variable
-                        name="pre"
-                        select="substring(@value,0,(@sourceStart + 1))">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="main"
-                        select="substring(@value,(@sourceStart + 1),(((@sourceEnd + 1) - (@sourceStart + 1)) + 1))">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="end"
-                        select="substring(@value,(@sourceEnd + 2))">
-                    </xsl:variable>
-                    <p
-                        style="margin-left: +.5in; font-size: -2; margin-top: 0;margin-bottom:0;">
-                        <xsl:value-of
-                            select="substring($classname,2)"/>
-                        :
-                    </p>
-                    <p
-                        style="margin-left: +.5in; font-size: -2;font-family: monospace; margin-top: 0;margin-bottom:0;">
-                        <xsl:value-of
-                            select="$lineNumber"/>
-                        :
-                        <xsl:value-of
-                            select="$pre"/>
-                        <b>
-                            <u>
-                                <xsl:value-of
-                                    select="$main"/>
-                            </u>
-                        </b>
-                        <xsl:value-of
-                            select="$end"/>
-                    </p>
-                </xsl:for-each>
-            </dd>
-        </xsl:for-each>
-    </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.site/publish.xml b/releng.wtpbuilder/buildtemplates/distribution/template.site/publish.xml
deleted file mode 100644
index 71afb65..0000000
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/publish.xml
+++ /dev/null
@@ -1,821 +0,0 @@
-<project
-    name="Publish Build"
-    default="default"
-    basedir=".">
-    <!--
-        Properties that must be passed to this script: buildDirectory:
-        Path to perform the build in. (A working directory) buildType:
-        Type of build (nightly, integration etc.) buildId: Build name
-        buildLabel: <buildType>-<buildName>-<timestamp>
-    -->
-    <property
-        environment="env"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be provided to publish"/>
-    <fail
-        unless="buildLabel"
-        message="buildLabel must be provided to publish"/>
-    <fail
-        unless="wtp.builder.home"
-        message="wtp.builder.home must be provided to publish"/>
-    <fail
-        unless="build.distribution"
-        message="build.distribution must be provided to publish"/>
-    <property
-        name="resultDir"
-        value="${buildDirectory}/${buildLabel}"/>
-    <!--name of generated index page-->
-    <property
-        name="indexFileName"
-        value="index.php"/>
-    <property
-        name="templateDir"
-        value="${wtp.builder.home}/distribution/${build.distribution}.site"/>
-    <property
-        name="resultingIndex"
-        value="${resultDir}/${indexFileName}"/>
-    <echo
-        level="debug"
-        message="resultDir: ${resultDir}"/>
-    <echo
-        level="debug"
-        message="templateDir: ${templateDir}"/>
-    <echo
-        level="debug"
-        message="resultingIndex: ${resultingIndex}"/>
-    <target
-        name="default">
-        <copy
-            overwrite="true"
-            file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/${indexTemplateFilename}"
-            tofile="${resultingIndex}"/>
-        <antcall
-            target="countFiles"/>
-        <antcall
-            target="generateCompileIndex"/>
-        <antcall
-            target="generateJUnitTestsIndex"/>
-        <antcall
-            target="getStaticFiles"/>
-    </target>
-    <target
-        name="generateCompileIndex">
-        <!--
-            <taskdef name="indexResults"
-            classname="org.eclipse.wtp.releng.tools.ResultsSummaryGenerator"
-            />
-        -->
-        <!--
-            isBuildTested: true|false should JUnit plugin test results
-            be used to generate index page dropTokenList: comma
-            separated list of strings which should be replaced by the
-            fileName attribute settings in the testManifest.xml.
-            xmlDirectoryName: path to directory containing JUnit plugin
-            test results in xml format (see doc is org.eclipse.test).
-            dropDirectoryName: path to directory containing the result
-            of the build. testResultsTemplateFileName: path to template
-            file used to generate page with links to JUnit test results
-            testResultsHtmlFileName: name of file which will be
-            generated with links to JUnit test results dropHtmlFileName:
-            name of generated index page hrefTestResultsTargetPath:
-            relative path from index page to directory containing JUnit
-            html test results hrefCompileLogsTargetPath: relative path
-            from index page directory containing compilelogs
-            testManifestFileName: name of xml file containing
-            descriptions of zip types and log files
-        -->
-        <property
-            file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-
-        <!-- create tables of test plugin compiles first -->
-        <antcall
-            target="generateTestCompileOutput">
-            <param
-                name="outputDirectory"
-                value="${resultDir}/testcompilelogs"/>
-        </antcall>
-
-        <!-- create table of code plugins compiles -->
-        <antcall
-            target="generateCompileOutput">
-            <param
-                name="outputDirectory"
-                value="${resultDir}/compilelogs"/>
-        </antcall>
-        <tstamp>
-            <format
-                property="TODAY"
-                pattern="MMMM d, yyyy"/>
-        </tstamp>
-
-        <!--  Insert Build Type descriptor  -->
-        <antcall
-            target="${buildType}"/>
-        <antcall
-            target="writeData"/>
-        <!--
-            Update timestamp on file to permit overwrite through Ant
-            copy task
-        -->
-        <touch
-            file="${resultingIndex}"/>
-    </target>
-    <target
-        name="generateTestCompileOutput"
-        depends="checkIfCompileLogs"
-        if="doCompileLogs">
-        <summarizeResults
-            isBuildTested="false"
-            includeAll="true"
-            dropTokenList="${dropTokenList}"
-            xmlDirectoryName=""
-            dropDirectoryName="${resultDir}"
-            testResultsTemplateFileName="${templateDir}/templateFiles/testCompileResults.php.template"
-            testResultsHtmlFileName="testCompileResults.php"
-            hrefTestResultsTargetPath=""
-            hrefCompileLogsTargetPath="testcompilelogs"
-            compileLogsDirectoryName="${outputDirectory}"/>
-        <antcall
-            target="compilerXMLToHTML"/>
-    </target>
-    <target
-        name="generateCompileOutput"
-        depends="checkIfCompileLogs"
-        if="doCompileLogs">
-        <summarizeResults
-            isBuildTested="false"
-            includeAll="true"
-            dropTokenList="${dropTokenList}"
-            xmlDirectoryName=""
-            dropDirectoryName="${resultDir}"
-            testResultsTemplateFileName="${templateDir}/templateFiles/compileResults.php.template"
-            testResultsHtmlFileName="compileResults.php"
-            hrefTestResultsTargetPath="testResults/html"
-            hrefCompileLogsTargetPath="compilelogs"
-            compileLogsDirectoryName="${outputDirectory}"/>
-        <antcall
-            target="compilerXMLToHTML"/>
-    </target>
-    <target
-        name="compilerXMLToHTML">
-        <xslt
-            basedir="${outputDirectory}"
-            destdir="${outputDirectory}"
-            includes="**/*.xml"
-            scanincludeddirectories="true"
-            style="compilerXMLOutputToHTML.xsl"
-            force="true"/>
-    </target>
-    <target
-        name="generateJUnitTestsIndex"
-        depends="checkIfTested"
-        if="doTests">
-        <!--
-            isBuildTested: true|false should JUnit plugin test results
-            be used to generate index page dropTokenList: comma
-            separated list of strings which should be replaced by the
-            fileName attribute settings in the testManifest.xml.
-            xmlDirectoryName: path to directory containing JUnit plugin
-            test results in xml format (see doc is org.eclipse.test).
-            dropDirectoryName: path to directory containing the result
-            of the build. testResultsTemplateFileName: path to template
-            file used to generate page with links to JUnit test results
-            testResultsHtmlFileName: name of file which will be
-            generated with links to JUnit test results dropHtmlFileName:
-            name of generated index page hrefTestResultsTargetPath:
-            relative path from index page to directory containing JUnit
-            html test results hrefCompileLogsTargetPath: relative path
-            from index page directory containing compilelogs
-            testManifestFileName: name of xml file containing
-            descriptions of zip types and log files
-        -->
-        <property
-            file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-
-        <!-- create table of test plugin compiles first -->
-        <!-- set isBuildTested to true for the "compile only" results -->
-        <summarizeResults
-            isBuildTested="true"
-            dropTokenList="${dropTokenList}"
-            dropDirectoryName="${resultDir}"
-            xmlDirectoryName="${resultDir}/testResults/xml"
-            testResultsTemplateFileName="${templateDir}/templateFiles/testResults.php.template"
-            testResultsHtmlFileName="testResults.php"
-            hrefTestResultsTargetPath="testResults/html"
-            compileLogsDirectoryName=""/>
-        <tstamp>
-            <format
-                property="TODAY"
-                pattern="MMMM d, yyyy"/>
-        </tstamp>
-
-        <!--  Insert Build Type descriptor  -->
-        <antcall
-            target="${buildType}"/>
-        <antcall
-            target="writeData"/>
-        <!--
-            Update timestamp on file to permit overwrite through Ant
-            copy task
-        -->
-        <touch
-            file="${resultingIndex}"/>
-    </target>
-    <target
-        name="getStaticFiles">
-        <!--get static files required in the buildLabel directory-->
-        <copy
-            todir="${resultDir}">
-            <fileset
-                dir="${templateDir}/staticDropFiles"/>
-        </copy>
-
-        <!--copy buildnotes from plugin directories-->
-        <mkdir
-            dir="${resultDir}/buildnotes"/>
-        <copy
-            todir="${resultDir}/buildnotes"
-            flatten="true">
-            <fileset
-                dir="${buildDirectory}/plugins"
-                includes="**/buildnotes_*.html"/>
-            <fileset
-                dir="${buildDirectory}/features"
-                includes="**/buildnotes_*.html"/>
-        </copy>
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/full/logIndex.php"/>
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/testLogs/logIndex.php"/>
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/testSysErrorLogs/logIndex.php"/>
-    </target>
-    <target
-        name="updateSite">
-
-
-        <!-- get our authored, tokenized site.xml file -->
-        <copy
-            file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/siteWTP.xml"
-            tofile="${buildDirectory}/${buildLabel}/updateSite/site.xml"
-            overwrite="true"
-            failonerror="true"/>
-        <!--
-            get the ${buildDirectory}/finalPluginsVersions.properties,
-            and read as properties
-        -->
-        <!-- substitute property value for tokens -->
-        <replace
-            file="${buildDirectory}/${buildLabel}/updateSite/site.xml"
-            propertyfile="${buildDirectory}/finalFeaturesVersions.properties">
-            <replacefilter
-                token="@org.eclipse.wtp@"
-                property="org.eclipse.wtp"/>
-            <replacefilter
-                token="@org.eclipse.wtp.sdk@"
-                property="org.eclipse.wtp.sdk"/>
-            <replacefilter
-                token="@org.eclipse.jst@"
-                property="org.eclipse.jst"/>
-            <replacefilter
-                token="@org.eclipse.jst.sdk@"
-                property="org.eclipse.jst.sdk"/>
-            <replacefilter
-                token="@org.eclipse.jpt.feature@"
-                property="org.eclipse.jpt.feature"/>
-            <replacefilter
-                token="@org.eclipse.jpt_sdk.feature@"
-                property="org.eclipse.jpt_sdk.feature"/>
-        </replace>
-    </target>
-    <target
-        name="countFiles">
-        <!--
-            files.count is a file that should exist in the drop
-            directory with a count of the zip files in the same
-            directory. It is required to generate a link to the build on
-            the downloads page.
-        -->
-        <countBuildFiles
-            sourceDirectory="${resultDir}"
-            filterString=".zip,.tar.gz"
-            outputFile="${resultDir}/files.count"/>
-    </target>
-
-    <!--Build type descriptors-->
-    <target
-        name="I">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Integration"/>
-    </target>
-    <target
-        name="S">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Stable"/>
-    </target>
-    <target
-        name="N">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Nightly"/>
-    </target>
-    <target
-        name="M">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Maintenance"/>
-    </target>
-    <target
-        name="R">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Release"/>
-    </target>
-    <target
-        name="T">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Test"/>
-    </target>
-    <target
-        name="P">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Patches"/>
-    </target>
-    <target
-        name="checkIfTested">
-        <echo
-            level="debug"
-            message="isBuildTested: ${isBuildTested}"/>
-        <condition
-            property="doTests">
-            <equals
-                arg1="${isBuildTested}"
-                arg2="true"
-                trim="true"
-                casesensitive="false"/>
-        </condition>
-    </target>
-    <target
-        name="checkIfCompileLogs">
-        <condition
-            property="doCompileLogs">
-            <available
-                file="${outputDirectory}"/>
-        </condition>
-    </target>
-    <target
-        name="writeData">
-        <!--  Insert Build Date  -->
-        <replace
-            file="${resultingIndex}"
-            token="@date@"
-            value="${TODAY}"/>
-
-        <!--  Insert Build Name  -->
-        <replace
-            file="${resultingIndex}"
-            token="@build@"
-            value="${buildLabel}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@buildBranch@"
-            value="${buildBranch}"/>
-
-        <!--  Insert PreRequsites  -->
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformFile@"
-            value="${eclipseplatform.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformURL@"
-            value="${eclipseplatform.url}/${eclipseplatform.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformBuildURL@"
-            value="${eclipseplatform.url}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformfilelinux@"
-            value="${eclipseplatform.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformfilewindows@"
-            value="${eclipseplatform.file.win32-win32-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformfilemacos@"
-            value="${eclipseplatform.file.macosx-carbon-ppc}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformBuildHome@"
-            value="${eclipseplatform.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatform.mirror.prefixuri@"
-            value="${eclipseplatform.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatform.fspath.prefix@"
-            value="${eclipseplatform.fspath.prefix}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseFile@"
-            value="${eclipse.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseURL@"
-            value="${eclipse.url}/${eclipse.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseBuildURL@"
-            value="${eclipse.url}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilelinux@"
-            value="${eclipse.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilewindows@"
-            value="${eclipse.file.win32-win32-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilemacos@"
-            value="${eclipse.file.macosx-carbon-ppc}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseBuildHome@"
-            value="${eclipse.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipse.mirror.prefixuri@"
-            value="${eclipse.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipse.fspath.prefix@"
-            value="${eclipse.fspath.prefix}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@testURL@"
-            value="${eclipseTestFramework.url}/${eclipseTestFramework.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@testFile@"
-            value="${eclipseTestFramework.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfName@"
-            value="${emf.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfDescription@"
-            value="${emf.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfFile@"
-            value="${emf.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfURL@"
-            value="${emf.url}/${emf.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfBuildHome@"
-            value="${emf.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emf.mirror.prefixuri@"
-            value="${emf.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsourceURL@"
-            value="${emfsourcedoc.url}/${emfsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsourceFile@"
-            value="${emfsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsourceName@"
-            value="${emfsourcedoc.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsourceDescription@"
-            value="${emfsourcedoc.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsourceBuildHome@"
-            value="${emfsourcedoc.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsource.mirror.prefixuri@"
-            value="${emfsourcedoc.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsourceURL@"
-            value="${emfxsdsourcedoc.url}/${emfsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsourceFile@"
-            value="${emfxsdsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsourceName@"
-            value="${emfxsdsourcedoc.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsourceDescription@"
-            value="${emfxsdsourcedoc.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsourceBuildHome@"
-            value="${emfxsdsourcedoc.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsource.mirror.prefixuri@"
-            value="${emfxsdsourcedoc.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdFile@"
-            value="${emfxsd.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdName@"
-            value="${emfxsd.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdDescription@"
-            value="${emfxsd.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdURL@"
-            value="${emfxsd.url}/${emfxsd.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdBuildHome@"
-            value="${emfxsd.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsd.mirror.prefixuri@"
-            value="${emfxsd.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationFile@"
-            value="${emfvalidation.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationURL@"
-            value="${emfvalidation.url}/${emfvalidation.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationBuildHome@"
-            value="${emfvalidation.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidation.mirror.prefixuri@"
-            value="${emfvalidation.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationName@"
-            value="${emfvalidation.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationDescription@"
-            value="${emfvalidation.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsourceFile@"
-            value="${emfvalidationsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsourceURL@"
-            value="${emfvalidationsourcedoc.url}/${emfvalidationsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsourceBuildHome@"
-            value="${emfvalidationsourcedoc.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsource.mirror.prefixuri@"
-            value="${emfvalidationsourcedoc.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsourceName@"
-            value="${emfvalidationsourcedoc.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsourceDescription@"
-            value="${emfvalidationsourcedoc.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstName@"
-            value="${wst.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstDescription@"
-            value="${wst.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstFile@"
-            value="${wst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstURL@"
-            value="${wst.url}/${wst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstBuildHome@"
-            value="${wst.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wst.mirror.prefixuri@"
-            value="${wst.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstName@"
-            value="${jst.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstDescription@"
-            value="${jst.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstFile@"
-            value="${jst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstURL@"
-            value="${jst.url}/${jst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstBuildHome@"
-            value="${jst.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jst.mirror.prefixuri@"
-            value="${jst.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpName@"
-            value="${wtp.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpDescription@"
-            value="${wtp.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpFile@"
-            value="${wtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpURL@"
-            value="${wtp.url}/${wtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpBuildHome@"
-            value="${wtp.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtp.mirror.prefixuri@"
-            value="${wtp.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefFile@"
-            value="${gef.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefURL@"
-            value="${gef.url}/${gef.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefBuildHome@"
-            value="${gef.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gef.mirror.prefixuri@"
-            value="${gef.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefName@"
-            value="${gef.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefDescription@"
-            value="${gef.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipserelengFile@"
-            value="${eclipsereleng.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipserelengURL@"
-            value="${eclipsereleng.url}/${eclipsereleng.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipFile@"
-            value="${orbitthirdpartyzip.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipURL@"
-            value="${orbitthirdpartyzip.url}/${orbitthirdpartyzip.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipBuildHome@"
-            value="${orbitthirdpartyzip.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzip.mirror.prefixuri@"
-            value="${orbitthirdpartyzip.mirror.prefixuri}"/>
-
-
-        <!-- no longer used. Post 1.5.5 -->
-        <replace
-            file="${resultingIndex}"
-            token="@jemFile@"
-            value="${jem.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jemURL@"
-            value="${jem.url}/${jem.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jemBuildHome@"
-            value="${jem.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jem.mirror.prefixuri@"
-            value="${jem.mirror.prefixuri}"/>
-        <!--
-            these token/s should not exist in maintenance stream, but do
-            no harm done, so in the interests of keeping builder streams
-            in sync, we'll leave them here as place hold
-        -->
-        <replace
-            file="${resultingIndex}"
-            token="@dtpFile@"
-            value="${dtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtpURL@"
-            value="${dtp.url}/${dtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtpBuildHome@"
-            value="${dtp.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtp.mirror.prefixuri@"
-            value="${dtp.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtpName@"
-            value="${dtp.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtpDescription@"
-            value="${dtp.description}"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/access_err.gif b/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/access_err.gif
deleted file mode 100644
index 4f0748a..0000000
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/access_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/access_warn.gif b/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/access_warn.gif
deleted file mode 100644
index 8386e3e..0000000
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/access_warn.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/buildNotes.php b/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/buildNotes.php
deleted file mode 100644
index f666887..0000000
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/buildNotes.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<html>
-<head>
-<?php
-$parts = explode("/", getcwd());
-$parts2 = explode("-", $parts[count($parts) - 1]);
-$buildName = $parts2[1];
-
-echo "<title>Build Notes for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Build Notes</font></b></p>
-
-<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"> Build Notes for <?php echo "$buildName"; ?></font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$hasNotes = false;
-$aDirectory = dir("buildnotes");
-while ($anEntry = $aDirectory->read()) {
-	if ($anEntry != "." && $anEntry != "..") {
-		//print_r($anEntry);
-		//echo "<br />";
-
-		$subject = $anEntry;
-		$pattern = '/^buildnotes_(.*)/i';
-		preg_match($pattern, $subject, $matches);
-		$subject = $matches[1];
-		//print_r($subject);
-		//echo "<br />";
-		$pattern = '/^(.*)\.html$/';
-		preg_match($pattern, $subject, $matches);
-		//print_r($matches);
-		//echo "<br />";
-
-		$component = $matches[1];
-
-		$line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
-		echo "<tr>";
-		echo "$line";
-		echo "</tr>";
-		$hasNotes = true;
-
-	}
-}
-$aDirectory.closedir();
-if (!$hasNotes) {
-	echo "<br>There are no build notes for this build.";
-}
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/compile_err.gif b/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/compile_err.gif
deleted file mode 100644
index c2bfdd6..0000000
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/compile_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/compile_warn.gif b/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/compile_warn.gif
deleted file mode 100644
index cf4fdf9..0000000
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/compile_warn.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/consoleLogs.php b/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/consoleLogs.php
deleted file mode 100644
index 2ee3c36..0000000
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/consoleLogs.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<html>
-<head>
-<?php
-$parts = explode("/", getcwd());
-$parts2 = explode("-", $parts[count($parts) - 1]);
-$buildName = $parts2[1];
-
-echo "<title>Test Console Output for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-<title>Console Logs from Running JUnit Plug-in Tests</title>
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b></p>
-
-<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">Console output from running
-		JUnit plugin tests for <?php echo "$buildName"; ?> </font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$rootDir = "testResults/consolelogs";
-$hasNotes = false;
-$aDirectory = dir($rootDir);
-$index = 0;
-$dirindex = 0;
-while ($anEntry = $aDirectory->read()) {
-	if ($anEntry != "." && $anEntry != "..") {
-		if (is_file("$rootDir/$anEntry")) {
-			$entries[$index] = $anEntry;
-			$index++;
-		} else if (is_dir("$rootDir/$anEntry")) {
-			$direntries[$dirindex] = $anEntry;
-			$dirindex++;
-		}
-	}
-}
-$aDirectory->close();
-
-
-sort($entries);
-sort($direntries);
-
-for ($i = 0; $i < $dirindex; $i++) {
-	$anEntry = $direntries[$i];
-	$line = "<td><a href=\"testResults/consolelogs/$anEntry/logIndex.php\">$anEntry</a></td>";
-	echo "<tr>";
-	echo "$line";
-	echo "</tr>";
-}
-for ($i = 0; $i < $index; $i++) {
-	$anEntry = $entries[$i];
-	$logsize = filesize("testResults/consolelogs/$anEntry");
-
-
-	$level = 0;
-	if ($logsize > 20000) {
-		$level = 2;
-	}
-	else if ($logsize > 2000) {
-		$level = 1;
-	}
-
-	if ($level == 0) {
-		$line = "<td><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-	}
-	else if ($level == 1) {
-		$line = "<td><em><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-	} else if ($level == 2) {
-		$line = "<td><strong><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-	}
-
-
-	echo "<tr>";
-	echo "$line";
-	echo "</tr>";
-	$hasNotes = true;
-}
-
-if (!$hasNotes) {
-	echo "<br>There are no test logs for this build.";
-}
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/junit_err.gif b/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/junit_err.gif
deleted file mode 100644
index 1b7ff9d..0000000
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/junit_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/logIndex.php b/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/logIndex.php
deleted file mode 100644
index 721ca00..0000000
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/logIndex.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<html>
-<head>
-<?php
-
-function endsWith( $str, $sub ) {
-
-	return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub );
-}
-
-$parts = explode("/", getcwd());
-$parts2 = explode("-", $parts[count($parts) - 1]);
-$buildName = $parts2[1];
-
-echo "<title>Test Console Output for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-<title>Console Logs from Running JUnit Plug-in Tests</title>
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b></p>
-
-<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">Console output from running
-		JUnit plugin tests for <?php echo "$buildName"; ?> </font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$hasNotes = false;
-$aDirectory = dir(".");
-$index = 0;
-while ($anEntry = $aDirectory->read()) {
-	if ($anEntry != "." && $anEntry != ".." && !endsWith(__FILE__, $anEntry)) {
-		$entries[$index] = $anEntry;
-		$index++;
-	}
-}
-aDirectory.closedir();
-
-
-sort($entries);
-
-for ($i = 0; $i < $index; $i++) {
-	$anEntry = $entries[$i];
-	$logsize = filesize("$anEntry");
-
-
-	$level = 0;
-	if ($logsize > 20000) {
-		$level = 2;
-	}
-	else if ($logsize > 2000) {
-		$level = 1;
-	}
-
-	if ($level == 0) {
-		$line = "<td><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-	}
-	else if ($level == 1) {
-		$line = "<td><em><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-	} else if ($level == 2) {
-		$line = "<td><strong><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-	}
-
-
-	echo "<tr>";
-	echo "$line";
-	echo "</tr>";
-	$hasNotes = true;
-}
-
-if (!$hasNotes) {
-	echo "<br>There are no test logs for this build.";
-}
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/miscUtil.php b/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/miscUtil.php
deleted file mode 100644
index 5001f38..0000000
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/miscUtil.php
+++ /dev/null
@@ -1,219 +0,0 @@
-<?php
-
-// todo: unsure if can handle filenames that are URLs?
-// handy constant to compute file size in megabytes
-
-function fileSizeInMegs($filename) {
-	$onemeg=1024*1024;
-	$zipfilesize=filesize($filename);
-	$zipfilesize=round($zipfilesize/$onemeg, 0);
-	return $zipfilesize;
-}
-
-function fileSizeForDisplay($filename) {
-	$onekilo=1024;
-	$onemeg=$onekilo * $onekilo;
-	$criteria = 10 * $onemeg;
-	$scaleChar = "M";
-	if (file_exists($filename)) {
-		$zipfilesize=filesize($filename);
-		if ($zipfilesize > $criteria) {
-			$zipfilesize=round($zipfilesize/$onemeg, 0);
-			$scaleChar = "M";
-		}
-		else {
-			$zipfilesize=round($zipfilesize/$onekilo, 0);
-			$scaleChar = "K";
-		}
-	}
-	else {
-		$zipfilesize = 0;
-	}
-	$result =  "(" . $zipfilesize . $scaleChar . ")";
-	return $result;
-}
-
-
-function displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription) {
-	echo "<td align=\"right\" valign=\"top\" width=\"30%\">";
-	echo "<a href=\"$downloadprefix$filename\">" . $fileShortDescription . "</a>";
-	echo "</td><td align=\"right\" valign=\"top\" width=\"3%\">";
-	echo $zipfilesize;
-	echo "</td>";
-	echo "<td align=\"right\" valign=\"top\" width=\"2%\">";
-	echo "[<a href=\"checksum/$filename.md5\">md5</a>]";
-	echo "</td>";
-}
-
-function resourceExist($url, $mirrorPrefixuri, $prereqfilename, $eclipseFSpathPrefix)
-{
-	$result = false;
-
-	$allowURLopen = ini_get('allow_url_fopen');
-
-	if ($allowURLopen && stream_last_modified($url)) {
-		$result = true;
-	}
-	else {
-		// TODO: for now, we'll do a raw check on the whole file name, since enable_url_open
-		// is off. better would be to check if we are on build.eclipse.org or download.eclipse.org?
-		$wholePath = trim($eclipseFSpathPrefix) . "/" . trim($mirrorPrefixuri) . "/" . trim($prereqfilename);
-		if (file_exists($wholePath)) {
-			$result = true;
-		}
-	}
-	return $result;
-}
-
-function stream_last_modified($url)
-{
-	if (function_exists('version_compare') && version_compare(phpversion(), '4.3.0') > 0)
-	{
-		if (!($fp = @fopen($url, 'r')))
-		return NULL;
-
-		$meta = stream_get_meta_data($fp);
-		for ($j = 0; isset($meta['wrapper_data'][$j]); $j++)
-		{
-			if (strstr(strtolower($meta['wrapper_data'][$j]), 'last-modified'))
-			{
-				$modtime = substr($meta['wrapper_data'][$j], 15);
-				break;
-			}
-		}
-		fclose($fp);
-	}
-	else
-	{
-		$parts = parse_url($url);
-		$host  = $parts['host'];
-		$path  = $parts['path'];
-
-		if (!($fp = @fsockopen($host, 80)))
-		return NULL;
-
-		$req = "HEAD $path HTTP/1.0\r\nUser-Agent: PHP/".phpversion()."\r\nHost: $host:80\r\nAccept: */*\r\n\r\n";
-		fputs($fp, $req);
-
-		while (!feof($fp))
-		{
-			$str = fgets($fp, 4096);
-			if (strstr(strtolower($str), 'last-modified'))
-			{
-				$modtime = substr($str, 15);
-				break;
-			}
-		}
-		fclose($fp);
-	}
-	return isset($modtime) ? strtotime($modtime) : time();
-}
-
-function isMirrored($uriToCheck) {
-	global $debugScript;
-	global $debugFunctions;
-	$localuri = $uriToCheck;
-
-	$debugMirrorList = false;
-	if ($debugScript) {
-		echo "uriToCheck: " . $localuri . "<br />";
-	}
-
-	$xmlcount = 0;
-
-	/* This method true and accurate method of parsing mirror results
-	 * may be expensive, and would
-	 * likely cause artificially high counts of "downloads".
-	 * Could maybe use if somehow only checked once ever 5 minutes or something.
-
-
-	 // turn off warnings, as sometimes HTML is returned, which causes lots of warnings
-	 $holdLevel = error_reporting(E_ERROR);
-	 $mirrorsxml=simplexml_load_file(rawurlencode($localuri) . urlencode("&format=xml"));
-	 error_reporting($holdLevel);
-
-
-	 if ($mirrorsxml) {
-	 if ($debugFunctions) {
-	 echo "root node: " . $mirrorsxml->getName() . "<br />";
-	 }
-	 if (strcmp($mirrorsxml->getName(), "mirrors") == 0) {
-	 foreach ($mirrorsxml->children() as $mirror) {
-	 if (strcmp($mirror->getName(),"mirror") == 0) {
-	 $xmlcount=$xmlcount+1;
-	 }
-	 if ($debugMirrorList) {
-	 print_r($mirror);
-	 echo "<br />";
-	 }
-	 }
-	 }
-	 if ($debugFunctions) {
-	 echo "Mirror count: " . $xmlcount . "<br />";
-	 }
-	 }
-	 */
-	/*
-	 * Use simple heuristic based on pattern
-	 * in the URI ... if it contains "/downloads/" then assume it's mirrored
-	 */
-	if (strpos($uriToCheck, "webtools/downloads/") > 0) {
-		$xmlcount = 1;
-	}
-	return ($xmlcount > 0);
-
-}
-
-// TODO: replace with Phoenix variables
-function getPlatform () {
-	global $debugScript;
-	global $debugFunctions;
-	// getBrowser is expensive, so cache the data
-	static $browser;
-	$platform = "unknown";
-
-
-	if(ini_get("browscap")) {
-		if(!isset($browser)){
-			$browser = get_browser(null, true);
-		}
-
-		if ($browser) {
-			$rawPlatform = $browser['platform'];
-			if ($debugFunctions) {
-				echo "browser platfrom: " . $rawPlatform . "<br />" ;
-			}
-
-			if ($debugFunctions) {
-				$browserKeys = array_keys($browser);
-				foreach ($browserKeys as $key) {
-					echo $key . ": " . $browser[$key] . "<br />";
-				}
-			}
-		}
-		if (strpos($rawPlatform, "Win") === 0) {
-			$platform="windows";
-		} else if (strpos($rawPlatform, "Linux") === 0) {
-			$platform="linux";
-		} else if (strpos($rawPlatform, "Mac") === 0) {
-			$platform="mac";
-		}
-	}
-	return $platform;
-}
-
-
-function getPrereqReferenceOrName($eclipseMirrorScript, $mirrorPrefixuri, $prerequrl, $prereqfilename, $eclipseFSpathPrefix) {
-	// todo: we really only need "if exists" so could make a bit more efficient
-	// I tried "file_exists" but is didn't seem to work on my test server
-	// For these pre-reqs, we assume if they exist, they are mirrored. This is true
-	// 99% of the time.
-
-	if (resourceExist($prerequrl, $mirrorPrefixuri, $prereqfilename, $eclipseFSpathPrefix)) {
-		$reflink="<a href=\"" . $eclipseMirrorScript . $mirrorPrefixuri . "/" . $prereqfilename . "\">" . $prereqfilename . "</a>";
-	} else {
-		$reflink=$prereqfilename;
-	}
-	return $reflink;
-}
-?>
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/pending.gif b/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/pending.gif
deleted file mode 100644
index 66db2a6..0000000
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/pending.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/pending1.gif b/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/pending1.gif
deleted file mode 100644
index 1b2ea6e..0000000
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/pending1.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/report2.php b/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/report2.php
deleted file mode 100644
index cb68e7b..0000000
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/report2.php
+++ /dev/null
@@ -1,45 +0,0 @@
-
-<?php
-
-function parse_testResults($filename)
-{
-	$junitFailures = 0;
-	if (is_file($filename)) {
-		$handle = @fopen($filename, "r");
-		if ($handle)
-		{
-			$size = filesize($filename);
-			$content = fread($handle, $size);
-			fclose($handle);
-			$junitStart = strpos($content, "Errors &amp; Failures");
-			$junitEnd = strpos($content, "</table>", $junitStart);
-			$junitInfo = substr($content, $junitStart, $junitEnd - $junitStart);
-			$start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">");
-			while ($start !== false)
-			{
-				$start += 29;
-				$stop = strpos($junitInfo, "</font></b></td>", $start);
-				if ($stop !== false)
-				{
-					$result = substr($junitInfo, $start, $stop - $start);
-					if (is_numeric($result))
-					{
-						$junitFailures += $result;
-					}
-					else if (strcmp($result, "DNF") == 0)
-					{
-						$junitFailures++;
-					}
-				}
-				$start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">", $stop);
-			}
-			$results = array($junitFailures);
-			return $results;
-		}
-	}
-}
-
-
-?>
-
-
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.site/templateFiles/compileResults.php.template b/releng.wtpbuilder/buildtemplates/distribution/template.site/templateFiles/compileResults.php.template
deleted file mode 100644
index f785771..0000000
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/templateFiles/compileResults.php.template
+++ /dev/null
@@ -1,76 +0,0 @@
-<html>
-<head>
-
-<?php
-        $parts = explode("/", getcwd());
-        $parts2 = explode("-", $parts[count($parts) - 1]);
-        $buildName = $parts2[1];
-
-        echo "<title>Compile Logs: Code Bundles for $buildName</title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2%;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-}
-</style>
-</head>
-<body>
-
-<?php
-        echo "<h1>Compile Logs: Code Bundles for $buildName</h1>";
-?>
-
-
-<table id=tabledata align = "center" width="75%" border="1">
-  <tr>
-    <td class="bold" align="center">Compile Logs</td>
-    <td class="bold" align="center">Compile Errors</td>
-    <td class="bold" align="center">Compiler Warnings</td>
-    <td class="bold" align="center">Access Violations</td>
-    <td class="bold" align="center">Access Warnings</td>
-  </tr>
-
-  %compilelogs%
-
-</table>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.site/templateFiles/index.html.template.php b/releng.wtpbuilder/buildtemplates/distribution/template.site/templateFiles/index.html.template.php
deleted file mode 100644
index 8a0b0e5..0000000
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/templateFiles/index.html.template.php
+++ /dev/null
@@ -1,850 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<?php
-
-ini_set("display_errors", "true");
-error_reporting (E_ALL);
-
-
-$buildBranch="@buildBranch@";
-$build="@build@";
-$type="@type@";
-$builddate="@date@";
-
-$eclipseMirrorPrefixuri="@eclipse.mirror.prefixuri@";
-$eclipseFSpathPrefix="@eclipse.fspath.prefix@";
-
-$eclipsefilelinux="@eclipsefilelinux@";
-$eclipsefilewindows="@eclipsefilewindows@";
-$eclipsefilemacosx="@eclipsefilemacos@";
-
-$eclipseURL="@eclipseURL@";
-$eclipseFile="@eclipseFile@";
-$eclipseBuildURL="@eclipseBuildURL@";
-$eclipseBuildHome="@eclipseBuildHome@";
-$eclipseName="@eclipseName@";
-$eclipseDescription="@eclipseDescription@";
-
-$eclipseplatformMirrorPrefixuri="@eclipseplatform.mirror.prefixuri@";
-$eclipseplatformFSpathPrefix="@eclipse.fspath.prefix@";
-
-$eclipseplatformfilelinux="@eclipseplatformfilelinux@";
-$eclipseplatformfilewindows="@eclipseplatformfilewindows@";
-$eclipseplatformfilemacosx="@eclipseplatformfilemacos@";
-
-$eclipseplatformURL="@eclipseplatformURL@";
-$eclipseplatformFile="@eclipseplatformFile@";
-$eclipseplatformBuildURL="@eclipseplatformBuildURL@";
-$eclipseplatformBuildHome="@eclipseplatformBuildHome@";
-$eclipseplatformName="@eclipseplatformName@";
-$eclipseplatformDescription="@eclipseplatformDescription@";
-
-$testURL="@testURL@";
-$testFile="@testFile@";
-
-$wstURL="@wstURL@";
-$wstFile="@wstFile@";
-$wstMirrorPrefixuri="@wst.mirror.prefixuri@";
-$wstBuildHome="@wstBuildHome@";
-$wstName="@wstName@";
-$wstDescription="@wstDescription@";
-
-$jstURL="@jstURL@";
-$jstFile="@jstFile@";
-$jstMirrorPrefixuri="@jst.mirror.prefixuri@";
-$jstBuildHome="@jstBuildHome@";
-$jstName="@jstName@";
-$jstDescription="@jstDescription@";
-
-$wtpURL="@wtpURL@";
-$wtpFile="@wtpFile@";
-$wtpMirrorPrefixuri="@wtp.mirror.prefixuri@";
-$wtpBuildHome="@wtpBuildHome@";
-$wtpName="@wtpName@";
-$wtpDescription="@wtpDescription@";
-
-$gefURL="@gefURL@";
-$gefFile="@gefFile@";
-$gefMirrorPrefixuri="@gef.mirror.prefixuri@";
-$gefBuildHome="@gefBuildHome@";
-$gefName="@getName@";
-$gefDescription="@gefDescription@";
-
-$emfURL="@emfURL@";
-$emfFile="@emfFile@";
-$emfMirrorPrefixuri="@emf.mirror.prefixuri@";
-$emfBuildHome="@emfBuildHome@";
-$emfName="@emfName@";
-$emfDescription="@emfDescription@";
-
-$emfsourceURL="@emfsourceURL@";
-$emfsourceFile="@emfsourceFile@";
-$emfsourceMirrorPrefixuri="@emfsource.mirror.prefixuri@";
-$emfsourceBuildHome="@emfsourceBuildHome@";
-$emfsourceName="@emfsourceName@";
-$emfsourceDescription="@emfsourceDescription@";
-
-
-$emfxsdURL="@emfxsdURL@";
-$emfxsdFile="@emfxsdFile@";
-$emfxsdMirrorPrefixuri="@emfxsd.mirror.prefixuri@";
-$emfxsdBuildHome="@emfxsdBuildHome@";
-$emfxsdName="@emfxsdName@";
-$emfxsdDescription="@emfxsdDescription@";
-
-$emfxsdsourceURL="@emfxsdsourceURL@";
-$emfxsdsourceFile="@emfxsdsourceFile@";
-$emfxsdsourceMirrorPrefixuri="@emfxsdsource.mirror.prefixuri@";
-$emfxsdsourceBuildHome="@emfxsdsourceBuildHome@";
-$emfxsdsourceName="@emfxsdsourceName@";
-$emfxsdsourceDescription="@emfxsdsourceDescription@";
-
-
-$emfvalidationURL="@emfvalidationURL@";
-$emfvalidationFile="@emfvalidationFile@";
-$emfvalidationMirrorPrefixuri="@emfvalidation.mirror.prefixuri@";
-$emfvalidationBuildHome="@emfvalidationBuildHome@";
-$emfvalidationName="@emfvalidationName@";
-$emfvalidationDescription="@emfvalidationDescription@";
-
-$emfvalidationsourceURL="@emfvalidationsourceURL@";
-$emfvalidationsourceFile="@emfvalidationsourceFile@";
-$emfvalidationsourceMirrorPrefixuri="@emfvalidationsource.mirror.prefixuri@";
-$emfvalidationsourceBuildHome="@emfvalidationsourceBuildHome@";
-$emfvalidationsourceName="@emfvalidationsourceName@";
-$emfvalidationsourceDescription="@emfvalidationsourceDescription@";
-
-
-$dtpURL="@dtpURL@";
-$dtpFile="@dtpFile@";
-$dtpMirrorPrefixuri="@dtp.mirror.prefixuri@";
-$dtpBuildHome="@dtpBuildHome@";
-$dtpName="@dtpName@";
-$dtpDescription="@dtpDescription@";
-
-
-$eclipserelengFile="@eclipserelengFile@";
-$eclipserelengURL="@eclipserelengURL@";
-$orbitthirdpartyzipFile="@orbitthirdpartyzipFile@";
-$orbitthirdpartyzipURL="@orbitthirdpartyzipURL@";
-$orbitthirdpartyzipBuildHome="@orbitthirdpartyzipBuildHome@";
-$orbitthirdpartyzipMirrorPrefixuri="@orbitthirdpartyzip.mirror.prefixuri@";
-
-
-$prereq_eclipse="@prereq.eclipse@";
-$prereq_eclipseplatform="@prereq.eclipseplatform@";
-$prereq_emf="@prereq.emf@";
-$prereq_emfxsd="@prereq.emfxsd@";
-$prereq_emfvalidation="@prereq.emfvalidation@";
-$prereq_gef="@prereq.gef@";
-$prereq_dtp="@prereq.dtp@";
-$prereq_wst="@prereq.wst@";
-$prereq_jst="@prereq.jst@";
-$prereq_wtp="@prereq.wtp@";
-
-
-include("miscUtil.php");
-
-
-
-
-$debugScript = false;
-$debugFunctions = false;
-
-$defaultMirrorScript="";
-$defaultWTPMirrorPrefix="./";
-
-$eclipseMirrorScript="http://www.eclipse.org/downloads/download.php?file=";
-
-// TODO: improve so this hard coding isn't required.
-// This depends on the declare script changing webtools/committers to webtools/downloads
-// And, the logic is such that if it is not mirrored, this URI is not used at all, just
-// a relative reference only
-$eclipseWTPMirrorPrefix="/webtools/committers/drops/$buildBranch/$build/";
-
-
-$mirrorScript=$defaultMirrorScript;
-$downloadprefix=$defaultWTPMirrorPrefix;
-
-
-$keytestMirrorString=$eclipseMirrorScript . "$eclipseWTPMirrorPrefix/@zipprefix@-sdk-$build.zip";
-if (isMirrored($keytestMirrorString) ) {
-	$mirrorScript=$eclipseMirrorScript;
-	$downloadprefix="${mirrorScript}${eclipseWTPMirrorPrefix}";
-}
-
-if ($debugScript)  {
-	echo "inferred platform: " . getPlatform();
-}
-
-
-// our summary results handling requires php 5 (for simple xml file loading)
-// so, if not php 5, just don't display any summary results
-// This was found to be required, since some mirror our whole site (e.g. IBM)
-// and not all mirrors use PHP 5
-$displayTestSummary=false;
-if (phpversion() >= 5) {
-
-	$code_totalBundles=0;
-	$code_totalErrors=0;
-	$code_totalWarnings=0;
-	$code_totalforbiddenAccessWarningCount=0;
-	$code_totaldiscouragedAccessWarningCount=0;
-
-	$test_totalBundles=0;
-	$test_totalErrors=0;
-	$test_totalWarnings=0;
-	$test_totalforbiddenAccessWarningCount=0;
-	$test_totaldiscouragedAccessWarningCount=0;
-
-
-	$displayTestSummary=true;
-	// expecting grandTotalErrors and grandTotalTests
-	$filename = "unitTestsSummary.xml";
-	if (file_exists($filename)) {
-		$prefix = "unitTests_";
-		$unitTestsSummary = simplexml_load_file($filename);
-		foreach ($unitTestsSummary->summaryItem as $summaryItem) {
-			$name = $summaryItem->name;
-			$value = $summaryItem->value;
-			$code= "\$" . $prefix . $name . " = " . $value . ";";
-			//echo "<br />code: " . $code;
-			eval($code);
-		}
-	}
-
-	$filename = "compilelogsSummary.xml";
-	if (file_exists($filename)) {
-		$prefix = "code_";
-		$compileSummary = simplexml_load_file($filename);
-		foreach ($compileSummary->summaryItem as $summaryItem) {
-			$name = $summaryItem->name;
-			$value = $summaryItem->value;
-			$code= "\$" . $prefix . $name . " = " . $value . ";";
-			//echo "<br />code: " . $code;
-			eval($code);
-		}
-	}
-
-	$filename = "testcompilelogsSummary.xml";
-	if (file_exists($filename)) {
-		$prefix = "test_";
-		$compileSummary = simplexml_load_file($filename);
-		foreach ($compileSummary->summaryItem as $summaryItem) {
-			$name = $summaryItem->name;
-			$value = $summaryItem->value;
-			$code= "\$" . $prefix . $name . " = " . $value . ";";
-			//echo "<br />code: " . $code;
-			eval($code);
-		}
-	}
-}
-
-$incubating="@incubating@";
-
-
-
-if ($incubating) {
-	echo '<title>WTP Incubator Downloads</title>';
-}
-else {
-	echo '<title>WTP Downloads</title>';
-}
-
-
-?>
-
-
-</head>
-
-<body>
-
-
-<?php
-
-// tiny banner to remind when looking at "local" machine results
-$serverName = $_SERVER["SERVER_NAME"];
-
-if (!stristr($serverName, "eclipse.org") && !stristr($serverName,"you.are.at.eclipsecon.org")) {
-	echo '<center>
-          <p>
-          Reminder: this is <font color="#FF0000">' .
-	$serverName .
-        '</font>
-          See also
-          <a href="http://download.eclipse.org/webtools/downloads" target="_top">the live public Eclipse site</a>.
-          </p>
-          <hr />
-          </center>';
-
-}
-?>
-
-<?php if ("true" === $incubating) {
-	echo "<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH=\"100%\">";
-	echo "	<tr>";
-	echo "		<td ALIGN=left><font face=\"'Bitstream Vera',Helvetica,Arial\" size=\"+2\"><b><?php echo \"$type\";?>";
-	echo "        Build: $build</b></font></td>";
-	echo "		<td align=\"right\" rowspan=\"3\"><a";
-	echo "			href=\"http://www.eclipse.org/projects/what-is-incubation.php\"><img";
-	echo "			src=\"http://www.eclipse.org/images/egg-incubation.png\"";
-	echo "			alt=\"Incubation\" align=\"middle\" border=\"0\"></a></td>";
-
-
-	echo "	<tr valign=\"top\">";
-	echo "		<td><font size=\"-1\">" . $builddate . "</font></td>";
-	echo "	</tr>";
-	echo "	<tr valign=\"top\">";
-	echo "		<td>";
-	echo "		<p>The Eclipse Web Tools Platform (WTP) Incubator Project provides";
-	echo "		tools for development that are just getting started, or are";
-	echo "		experimental in some fashion.</p>";
-	echo "		</td>";
-	echo "	</tr>";
-	echo "</table>";
-
-} else {
-
-	echo "<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH=\"100%\">";
-	echo "	<tr>";
-	echo "		<td ALIGN=left><font face=\"'Bitstream Vera',Helvetica,Arial\" size=\"+2\"><b>$type";
-	echo "		Build: " . $build . "</b></font></td>";
-
-	echo "	<tr valign=\"top\">";
-	echo "		<td><font size=\"-1\">" . $builddate . "</font></td>";
-	echo "	</tr>";
-	echo "	<tr valign=\"top\">";
-	echo "		<td>";
-	echo "		<p>Component build from the Eclipse Web Tools Platform (WTP) Project.</p>";
-	echo "		</td>";
-	echo "	</tr>";
-	echo "</table>";
-
-} ?>
-
-<!-- ***********  Prerequisites **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-	<tr>
-		<td align="left" valign="top" bgcolor="#0080C0"><font
-			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Prerequisites
-		and Handy Extras</font></td>
-	</tr>
-	<tr>
-		<td>
-		<p>These are the prerequisites to build or run these packages. All are
-		not necessarily required, but instead some subset. Also listed are
-		some frequently needed links for committer-required packages when
-		creating new development environments, or targets to run against.</p>
-		<p>Note that WTP requires Java 5 or higher (and, for some things,
-		actually requires a JDK rather than only a JRE) even though many other
-		<a href="http://www.eclipse.org/downloads/">Eclipse Projects</a> can
-		run with <a href="http://www.eclipse.org/downloads/moreinfo/jre.php">other
-		JRE levels</a>.</p>
-		<p></p>
-		</td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=1 cellpadding=1 width="90%" align="center">
-
-		<?php
-		if ("true" === $prereq_eclipseplatform) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td width=\"40%\">Eclipse Platform</td>";
-
-
-			//customize page depending on user's browser/platform, if we can detect it
-			$usersPlatform = getPlatform();
-			// assume windows by default, since likely most frequent, even for cases where
-			// platform is "unknown". I've noticed Opera reports 'unknown' :(
-			$recommendedFile=$eclipseplatformfilewindows;
-			if (strcmp($usersPlatform,"linux")== 0) {
-				$recommendedFile=$eclipseplatformfilelinux;
-			} else if (strcmp($usersPlatform,"mac") == 0) {
-				$recommendedFile=$eclipseplatformfilemacosx;
-			}
-
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $eclipseplatformBuildURL . "\">appropriate platform</a>";
-			echo " or <a href=\"" . $eclipseplatformBuildHome . "\">equivalent</a></td>";
-
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_eclipse) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td width=\"40%\">Eclipse SDK (Platform, JDT)</td>";
-
-
-			//customize page depending on user's browser/platform, if we can detect it
-			$usersPlatform = getPlatform();
-			// assume windows by default, since likely most frequent, even for cases where
-			// platform is "unknown". I've noticed Opera reports 'unknown' :(
-			$recommendedFile=$eclipsefilewindows;
-			if (strcmp($usersPlatform,"linux")== 0) {
-				$recommendedFile=$eclipsefilelinux;
-			} else if (strcmp($usersPlatform,"mac") == 0) {
-				$recommendedFile=$eclipsefilemacosx;
-			}
-
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $eclipseBuildURL . "\">appropriate platform</a>";
-			echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_emf) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $emfName . "&nbsp;" . $emfDescription ;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $emfMirrorPrefixuri, $emfURL, $emfFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $emfBuildHome . "\">equivalent</a></td>";
-			echo " </tr>";
-		}
-		?>
-
-
-		<?php
-		if ("true" === $prereq_emfxsd) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $emfxsdName . "&nbsp;" . $emfxsdDescription ;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdMirrorPrefixuri, $emfxsdURL, $emfxsdFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $emfxsdBuildHome . "\">equivalent</a></td>";
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_emfvalidation) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $emfvalidationName  . "&nbsp;" . $emfvalidationDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $emfvalidationMirrorPrefixuri, $emfvalidationURL, $emfvalidationFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $emfvalidationBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_gef) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $gefName  . "&nbsp;" . $gefDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $gefMirrorPrefixuri, $gefURL, $gefFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $gefBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_dtp) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $dtpName . "&nbsp;" . $dtpDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $dtpMirrorPrefixuri, $dtpURL, $dtpFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $dtpBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_wst) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $wstName . "&nbsp;" . $wstDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $wstMirrorPrefixuri, $wstURL, $wstFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $wstBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_jst) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $jstName . "&nbsp;" . $jstDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $jstMirrorPrefixuri, $jstURL, $jstFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $jstBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-		<?php
-		if ("true" === $prereq_wtp) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $wtpName . "&nbsp;" . $wtpDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $wtpMirrorPrefixuri, $wtpURL, $wtpFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $wtpBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-			<tr valign="middle">
-				<td width="10%"></td>
-				<td colspan="2">
-				<hr />
-				</td>
-			</tr>
-
-
-
-			<?php
-			if ("true" === $prereq_emf) {
-				echo "<tr valign=\"top\">";
-				echo "<td width=\"10%\"></td>";
-				echo "<td>";
-				echo $emfsourceName . "&nbsp;" . $emfsourceDescription;
-				echo "</td> ";
-				echo "<td align=\"right\">";
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfsourceMirrorPrefixuri, $emfsourceURL, $emfsourceFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $emfsourceBuildHome . "\">equivalent</a></td>";
-				echo "</tr>";
-			}
-			?>
-			<?php
-			if ("true" === $prereq_emfxsd) {
-				echo "<tr valign=\"top\">";
-				echo "<td width=\"10%\"></td>";
-				echo "<td>";
-				echo $emfxsdsourceName . "&nbsp;" . $emfxsdsourceDescription;
-				echo "</td> ";
-				echo "<td align=\"right\">";
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdsourceMirrorPrefixuri, $emfxsdsourceURL, $emfxsdsourceFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $emfxsdsourceBuildHome . "\">equivalent</a></td>";
-				echo "</tr>";
-			}
-			?>
-
-			<?php
-			if ("true" === $prereq_emfvalidation) {
-				echo "<tr valign=\"top\">";
-				echo "<td width=\"10%\"></td>";
-				echo "<td>";
-				echo $emfvalidationsourceName . "&nbsp;" . $emfvalidationsourceDescription;
-				echo "</td> ";
-				echo "<td align=\"right\">";
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfvalidationsourceMirrorPrefixuri, $emfvalidationsourceURL, $emfvalidationsourceFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $emfvalidationsourceBuildHome . "\">equivalent</a></td>";
-				echo "</tr>";
-			}
-			?>
-
-			<?php
-			if (true) {
-				echo "<tr valign=\"top\">";
-				echo "<td width=\"10%\"></td>";
-				echo "<td>";
-				echo "Eclipse Test Framework (required only for Automated JUnit tests)";
-				echo "</td> ";
-				echo "<td align=\"right\">";
-
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $testURL, $testFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-				echo "</tr>";
-			}
-			?>
-
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>Eclipse releng tool (required only for committers to more easily
-				"release" code to a build)</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipserelengURL, $eclipserelengFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>Third Party code from Orbit. Not required and is currently much
-				more than needed for WTP, but some committers like using to create a
-				PDE target.</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $orbitthirdpartyzipMirrorPrefixuri, $orbitthirdpartyzipURL, $orbitthirdpartyzipFile,$eclipseFSpathPrefix);
-				echo " or <a href=\"" . $orbitthirdpartyzipBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-		</table>
-		</td>
-	</tr>
-</table>
-
-<!-- ***********  WTP **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-	<tr>
-		<td align=left valign=top colspan="5" bgcolor="#0080C0"><font
-			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF"> Web Tools
-		Platform</font></td>
-	</tr>
-
-	<tr>
-		<td align="left" valign="top" colspan="5">
-		<p>@longdescription@</p>
-		</td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
-
-
-			<tr>
-				<td align="left" valign="top" width="10%"><b>Minimal</b></td>
-				<td align="left" valign="top">
-				<p>Executable code only.</p>
-				</td>
-				<?php
-				$zipfilename="@zipprefix@-${build}";
-				$filename=$zipfilename.".zip";
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription="@shortname@";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-				?>
-			</tr>
-
-			<tr>
-				<td align="left" valign="top" width="10%"><b>SDK</b></td>
-				<td align="left" valign="top">
-				<p>Executable code and source code.</p>
-				</td>
-				<?php
-				$zipfilename="@zipprefix@-sdk-${build}";
-				$filename=$zipfilename.".zip";
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription="@shortname@ sdk";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-				?>
-			</tr>
-			<tr>
-				<td align="left" valign="top" width="10%"><b>Tests</b></td>
-				<td align="left" valign="top">
-				<p>Unit tests.</p>
-				</td>
-				<?php
-				$zipfilename="@zipprefix@-tests-${build}";
-				$filename=$zipfilename.".zip";
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription="@shortname@ tests";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-				?>
-			</tr>
-		</table>
-		</td>
-	
-	
-	<tr>
-
-</table>
-
-
-
-
-
-
-
-<!-- ***********  Build Status **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-	<tr>
-		<td align=left valign=top bgcolor="#0080C0"><font
-			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Status, tests
-		and other interesting details</font></td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
-
-			<tr>
-				<td><!-- 
-				Its silly to always display 'Build notes', but hard to 
-				compute if required or not. 
-				<a href="buildNotes.php">Build notes</a> <br /> 
-				--> <a href="directory.txt">map files</a> <br />
-				<?php
-
-				if ($displayTestSummary) {
-
-
-					if (isset($unitTests_grandTotalErrors)) {
-						$errorColor="green";
-						if ($unitTests_grandTotalErrors > 0) {
-							$errorColor="red";
-						}
-						echo "<a href=\"testResults.php\">Unit test results</a>&nbsp;";
-						echo "<img src=\"junit_err.gif\"/><font color=\"" . $errorColor . "\">" . $unitTests_grandTotalErrors . "</font>&nbsp;&nbsp;Total: " . $unitTests_grandTotalTests;
-					}
-					else {
-						// we hardly ever "pend" anymore ... abscense usually signifies no tests or a build error.
-						echo "<br /><font color=\"orange\">Unit tests don't exists, are pending, or there's a build error.</font>";
-						//&nbsp;&nbsp;<img src=\"pending.gif\"/>";
-					}
-
-					echo "<br />";
-					echo "<a href=\"compileResults.php\">Compile logs: Code Bundles</a>";
-
-					echo "&nbsp;&nbsp;($code_totalBundles)&nbsp;&nbsp;";
-					echo "<img src=\"compile_err.gif\"/><font color=red>$code_totalErrors</font>&nbsp;";
-					echo "<img src=\"compile_warn.gif\"/><font color=orange>$code_totalWarnings</font>&nbsp;";
-					echo "<img src=\"access_err.gif\"/><font color=red>$code_totalforbiddenAccessWarningCount</font>&nbsp;";
-					echo "<img src=\"access_warn.gif\"/><font color=orange>$code_totaldiscouragedAccessWarningCount</font>&nbsp;";
-
-					echo "<br />";
-					echo "<a href=\"testCompileResults.php\">Compile logs: Test Bundles</a>";
-
-					echo "&nbsp;&nbsp;($test_totalBundles)&nbsp;&nbsp;";
-					echo "<img src=\"compile_err.gif\"/><font color=red>$test_totalErrors</font>&nbsp;";
-					echo "<img src=\"compile_warn.gif\"/><font color=orange>$test_totalWarnings</font>&nbsp;";
-					echo "<img src=\"access_err.gif\"/><font color=red>$test_totalforbiddenAccessWarningCount</font>&nbsp;";
-					echo "<img src=\"access_warn.gif\"/><font color=orange>$test_totaldiscouragedAccessWarningCount</font>&nbsp;";
-				}
-
-				?> <br />
-
-				<?php
-				if (file_exists("versioningReportName.php")) {
-					include "versioningReportName.php";
-					$fname="${versionReportFilename}.html";
-					if (file_exists($fname)) {
-						echo "<br /> <a href='$fname'>Versioning Information</a>";
-					}
-}
-?> <?php
-echo "<br />";
-if (file_exists("./apiresults/api-progress.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-progress.html\">API Progress Report</a>";
-}
-if (file_exists("./apiresults/api-info-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-info-summary.html\">APIs Defined by Each Component</a>";
-}
-if (file_exists("./apiresults/api-ref-compatibility.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-ref-compatibility.html\">Adopter Breakage Report</a>";
-}
-if (file_exists("./apiresults/api-violation-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-violation-summary.html\">API Violations</a>";
-}
-if (file_exists("./apiresults/component-api-violation-all.html"))
-{
-	echo "<br /> <a href=\"apiresults/component-api-violation-all.html\">Non-API dependencies</a>";
-}
-if (file_exists("./apiresults/api-tc-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-tc-summary.html\">API Test Coverage</a>";
-}
-if (file_exists("./apiresults/api-javadoc-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-javadoc-summary.html\">API Javadoc Coverage</a>";
-}
-if (file_exists("./apiresults/api-tc-summary.html"))
-{
-	echo "<br /><br /> <a href=\"apiresults/full_test_coverage/api-tc-summary.html\">Test Coverage for All Classes and Methods</a>";
-}
-?> <?php
-if (file_exists("./perfresults/graph/performance.php"))
-{
-	echo "<br />";
-	echo "<br /> <a href=\"perfresults/graph/performance.php\">Performance Results</a>";
-	echo "<br />";
-}
-?></td>
-			</tr>
-
-
-		</table>
-		</td>
-	</tr>
-</table>
-
-
-
-<!-- footer -->
-<center>
-<hr>
-<p>All downloads are provided under the terms and conditions of the <a
-	href="http://www.eclipse.org/legal/notice.html">Eclipse.org Software
-User Agreement</a> unless otherwise specified.</p>
-
-<p>If you have problems downloading the drops, contact the <font
-	face="'Bitstream Vera',Helvetica,Arial" size="-1"><a
-	href="mailto:webmaster@eclipse.org">webmaster</a></font>.</p>
-
-</center>
-<!-- end footer -->
-
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.site/templateFiles/siteEnablingFeatures.xml b/releng.wtpbuilder/buildtemplates/distribution/template.site/templateFiles/siteEnablingFeatures.xml
deleted file mode 100644
index cc3ed81..0000000
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/templateFiles/siteEnablingFeatures.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-    <description> The update site contains the enabling features. </description>
-    <category-def
-        name="Enabling Features"
-        label="Enabling Features">
-        <description> This category contains features used by several
-            projects that enable some functionality, but which by
-            themselves are not very interesting. </description>
-    </category-def>
-</site>
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.site/templateFiles/siteWTP.xml b/releng.wtpbuilder/buildtemplates/distribution/template.site/templateFiles/siteWTP.xml
deleted file mode 100644
index f94e83f..0000000
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/templateFiles/siteWTP.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site
-    pack200="true"
-    mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/webtools/testUpdates/site.xml&amp;format=xml"
-    digestURL="http://download.eclipse.org/webtools/testUpdates/">
-    <description
-        url="http://download.eclipse.org/webtools/declaredUpdates/index.html"> The update site contains the features of the of Eclipse Web
-        Tools Project (WTP) </description>
-    <feature
-        url="features/org.eclipse.wst_@org.eclipse.wst@.jar"
-        id="org.eclipse.wst"
-        version="@org.eclipse.wst@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.wst.sdk_@org.eclipse.wst.sdk@.jar"
-        id="org.eclipse.wst.sdk"
-        version="@org.eclipse.wst.sdk@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jst_@org.eclipse.jst@.jar"
-        id="org.eclipse.jst"
-        version="@org.eclipse.jst@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jst.sdk_@org.eclipse.jst.sdk@.jar"
-        id="org.eclipse.jst.sdk"
-        version="@org.eclipse.jst.sdk@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jpt.feature_@org.eclipse.jpt.feature@.jar"
-        id="org.eclipse.jpt.feature"
-        version="@org.eclipse.jpt.feature@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jpt_sdk.feature_@org.eclipse.jpt_sdk.feature@.jar"
-        id="org.eclipse.jpt_sdk.feature"
-        version="@org.eclipse.jpt_sdk.feature@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <category-def
-        name="Web Tools Platform (WTP)"
-        label="Web Tools Platform (WTP)">
-        <description> This category contains the features of the Eclipse
-            Web Tools Project (WTP). </description>
-    </category-def>
-</site>
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.site/templateFiles/testCompileResults.php.template b/releng.wtpbuilder/buildtemplates/distribution/template.site/templateFiles/testCompileResults.php.template
deleted file mode 100644
index 42d6f65..0000000
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/templateFiles/testCompileResults.php.template
+++ /dev/null
@@ -1,76 +0,0 @@
-<html>
-<head>
-
-<?php
-        $parts = explode("/", getcwd());
-        $parts2 = explode("-", $parts[count($parts) - 1]);
-        $buildName = $parts2[1];
-
-        echo "<title>Compile Logs: Test Bundles for $buildName</title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2em;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:Bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-}
-</style>
-</head>
-<body>
-
-<?php
-        echo "<h1>Compile Logs: Test Bundles for $buildName</h1>";
-?>
-
-
-<table id=tabledata align = "center" width="75%" border="1">
-  <tr>
-    <td class="bold" align="center">Compile Logs</td>
-    <td class="bold" align="center">Compile Errors</td>
-    <td class="bold" align="center">Compiler Warnings</td>
-    <td class="bold" align="center">Access Violations</td>
-    <td class="bold" align="center">Access Warnings</td>
-  </tr>
-
-  %compilelogs%
-
-</table>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.site/templateFiles/testResults.php.template b/releng.wtpbuilder/buildtemplates/distribution/template.site/templateFiles/testResults.php.template
deleted file mode 100644
index ddad0b7..0000000
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/templateFiles/testResults.php.template
+++ /dev/null
@@ -1,119 +0,0 @@
-<html>
-<head>
-
-<?php
-	$parts = explode("/", getcwd());
-	$parts2 = explode("-", $parts[count($parts) - 1]);
-	$buildName = $parts2[1];
-	
-	echo "<title>Test Results for $buildName </title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2em;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:Bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-
-}
-</style>
-
-
-</head>
-<body>
-<p><b><font face="Verdana" size="+3">Test Results</font></b> </p>
-
-<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">
-    Unit Test Results for <?php echo "$buildName"; ?> on Various Platforms and JRE</font></b></td>
-  </tr>
-</table>
-
-<?php
-if (file_exists("testResults"))
-{
-$dir = dir("testResults");
-while ($anEntry = $dir->read())
-{
-  if ($anEntry != "." && $anEntry != ".." && $anEntry != "consolelogs" && $anEntry != "html" && $anEntry != "xml")
-  {
-    $link = "testResults/".$anEntry."/results/index.php";
-    echo "<p><a href=\"$link\">$anEntry</a></p>";
-  }
-}
-}
-?>
-
-<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">Unit 
-      Test Results for <?php echo "$buildName"; ?> </font></b></td>
-  </tr>
-</table>
-
-<table id=tableunittestdata align = "center" width="75%" border="1">
-  <tr> 
-    <td class="bold" align="center" width="70%">Test Suite</td>
-    <td class="bold" align="center" width="10%">Errors &amp; Failures</td>
-    <td class="bold" align="center" width="10%">Total Tests</td>
-    <td class="bold" align="center" width="10%">Total Time (s)</td>
-  </tr>
-  
-  
-  %testresults%
-  
-</table>
-<p></p>
-<br>
-<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"> 
-      Console output logs 
-      <?php echo "$buildName"; ?>
-      </font></b></td>
-  </tr>
-</table>
-<br>
-These <a href="consoleLogs.php">logs</a> contain the console output captured while 
-running the JUnit automated tests. <br>
-<br>
-
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.site/transformReportToHTML.xml b/releng.wtpbuilder/buildtemplates/distribution/template.site/transformReportToHTML.xml
deleted file mode 100644
index b72f6cd..0000000
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/transformReportToHTML.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-    name="xsl-conversion"
-    default="main"
-    basedir=".">
-    <target
-        name="main"
-        description="example.@dot.xml to produce example.@dot.html">
-        <xslt
-            destdir="${resultDir}/compilelogs"
-            scanincludeddirectories="true"
-            style="compilerXMLOutputToHTML.xsl"
-            force="true">
-            <fileset
-                dir="${resultDir}/compilelogs"
-                includes="**/*.xml"/>
-        </xslt>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml b/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml
deleted file mode 100644
index b851f0d..0000000
--- a/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml
+++ /dev/null
@@ -1,330 +0,0 @@
-<project
-    name="Build specific targets and properties"
-    default="runTest">
-    <!--
-        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"/>
-    <fail
-        message="testRoot must be set for this task"
-        unless="testRoot"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-
-
-    <!-- 
-        typcially already set, but in case of standalone tests, may not
-        be
-    -->
-    <property
-        name="buildLabel"
-        value="${buildType}-${buildId}-${timestamp}"/>
-
-
-    <!-- 
-	   Steps to do after the build is done. 
-	 -->
-    <target
-        name="test">
-        <dirname
-            file="${ant.file}"
-            property="currentDirectory"/>
-        <ant
-            antfile="${ant.file}"
-            target="runTest"
-            dir="${currentDirectory}"/>
-    </target>
-
-    <!-- 
-	  Steps to do to test the build results
-   -->
-    <target
-        name="runTest">
-        <dirname
-            file="${ant.file}"
-            property="test.component.dir"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-        <property
-            file="${buildDirectory}/label.properties"/>
-        <property
-            file="${wtp.builder.home}/build.properties"/>
-        <fail
-            message="testRoot must be set for this task"
-            unless="testRoot"/>
-        <mkdir
-            dir="${testRoot}"/>
-
-        <!-- if results already exist, delete them -->
-        <delete
-            dir="${testRoot}/results"
-            failOnError="false"/>
-        <mkdir
-            dir="${testRoot}/results"/>
-        <mkdir
-            dir="${testRoot}/results/consolelogs"/>
-        <copy
-            todir="${testRoot}"
-            overwrite="true">
-            <fileset
-                dir="${test.component.dir}/testScripts"/>
-        </copy>
-        <echo
-            message="BASEOS: ${env.BASEOS}   BASEWS: ${env.BASEWS}   BASEARCH: ${env.BASEARCH} "/>
-        <ant
-            antfile="${test.component.dir}/testdependency.xml"
-            target="get">
-            <property
-                name="dependency.properties"
-                value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-            <property
-                name="base.install.dir"
-                value="${testRoot}"/>
-        </ant>
-        <antcall
-            target="unzipTests"/>
-        <antcall
-            target="runTestEclipse">
-            <param
-                name="testTarget"
-                value="all"/>
-        </antcall>
-        <antcall
-            target="postRunTestEclipse">
-            <param
-                name="testTarget"
-                value="all"/>
-        </antcall>
-    </target>
-    <target
-        name="unzipTests">
-        <!--
-            unzip the builds and junit tests we use 'unzip' here, so we
-            can continue on error, if desired. (such as if zip was not
-            created, due to other failures or options).
-        -->
-        <echo
-            message="installing sdk"/>
-        <exec
-            dir="${buildDirectory}/${buildLabel}"
-            executable="unzip"
-            failonerror="true">
-            <arg
-                line="-o -qq  @zipprefix@-sdk-${buildLabel}.zip -d ${testRoot}${dropinsFolder}"/>
-        </exec>
-        <echo
-            message="installing tests"/>
-        <exec
-            dir="${buildDirectory}/${buildLabel}"
-            executable="unzip"
-            failonerror="false">
-            <arg
-                line="-o -qq @zipprefix@-tests-${buildLabel}.zip -d ${testRoot}${dropinsFolder}"/>
-        </exec>
-    </target>
-    <!--
-        time out may need to be set/adjust for api or performance tests?
-        This testTimeLimit is the whole, overall limit on tests. There's
-        a shorter one for individual suites. some common values, of
-        milliseconds to more recognizable units: 7200000: 2 hours
-        3600000: 1 hour 1800000: 30 minutes 600000: 10 minutes
-    -->
-    <property
-        name="testTimeLimit"
-        value="7200000"/>
-    <property
-        name="testFailOnError"
-        value="false"/>
-    <target
-        name="runTestEclipse"
-        description="Run our JUnit's within an instance of antRunner">
-        <property
-            name="test-vm"
-            value="${env.JAVA_6_HOME}/bin/java"/>
-
-        <property
-            name="vmargs"
-            value="-Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm}  -Dperf.buildId=${buildType}${date}-${time}"/>
-        <!--
-            set path to eclipse folder. If local folder, use '.';
-            otherwise, use c:\path\to\eclipse or /path/to/eclipse/
-        -->
-        <property
-            name="eclipse.home"
-            value="${testRoot}"/>
-        <echo
-            message="Running junits"/>
-        <!--
-            Remember: using -debug for org.eclipse.ant.core.antRunner
-            produces ant debug info to be output ... which is a TON of
-            stuff
-        -->
-        <echo
-            message="eclipse.launcher: ${eclipse.launcher}"/>
-        <java
-            taskname="unit-test-masterprocess"
-            fork="true"
-            resultProperty="wtpmasterjunitresult"
-            failonerror="false"
-            timeout="${testTimeLimit}"
-            dir="${testRoot}/eclipse"
-            jvm="${env.JAVA_6_HOME}/bin/java"
-            classname="org.eclipse.equinox.launcher.Main">
-            <classpath>
-                <fileset
-                    dir="${testRoot}/eclipse/plugins">
-                    <include
-                        name="org.eclipse.equinox.launcher_*.jar"/>
-                </fileset>
-            </classpath>
-            <jvmarg
-                value="-Xmx512m"/>
-            <jvmarg
-                value="-Dosgi.ws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dosgi.os=${env.BASEOS}"/>
-            <jvmarg
-                value="-Dosgi.arch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-Dws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dos=${env.BASEOS}"/>
-            <jvmarg
-                value="-Darch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-Dnoclean=true"/>
-            <jvmarg
-                value="-DbuildBranch=${buildBranch}"/>
-            <jvmarg
-                value="-DbuildType=${buildType}"/>
-            <jvmarg
-                value="-DbuildId=${buildId}"/>
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <jvmarg
-                value="-Dprojectname=${projectname}"/>
-            <arg
-                value="-nosplash"/>
-            <arg
-                value="-consolelog"/>
-            <arg
-                value="-data"/>
-            <arg
-                value="${testRoot}/overallTestWorkspace"/>
-            <arg
-                value="-application"/>
-            <arg
-                value="org.eclipse.ant.core.antRunner"/>
-            <arg
-                value="-file"/>
-            <arg
-                value="${testRoot}/test.xml"/>
-            <arg
-                value="-logger"/>
-            <arg
-                value="org.apache.tools.ant.DefaultLogger"/>
-            <env
-                key="DISPLAY"
-                value="${env.DISPLAY}"/>
-            <redirector
-                output="${testRoot}/results/fullOutput.txt"
-                error="${testRoot}/results/fullErrorLog.txt"/>
-            <sysproperty
-                key="build.home"
-                value="${env.BUILD_HOME}"/>
-            <sysproperty
-                key="buildDirectory"
-                value="${buildDirectory}"/>
-            <sysproperty
-                key="buildLabel"
-                value="${buildLabel}"/>
-            <sysproperty
-                key="baseLocation"
-                value="${baseLocation}"/>
-            <sysproperty
-                key="testRoot"
-                value="${testRoot}"/>
-            <sysproperty
-                key="testDir"
-                value="${testRoot}"/>
-            <sysproperty
-                key="perf.buildId"
-                value="${buildType}${date}-${time}"/>
-            <sysproperty
-                key="eclipseBuilderDirectory"
-                value="${pde.builder.path}"/>
-            <sysproperty
-                key="buildLabel"
-                value="${buildLabel}"/>
-        </java>
-        <echo
-            message="wtpmasterjunitresult ${wtpmasterjunitresult}"/>
-    </target>
-    <target
-        name="postRunTestEclipse">
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/consolelogs/testLogs"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results">
-                <include
-                    name="*output.txt"/>
-            </fileset>
-        </copy>
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/consolelogs/testSysErrorLogs"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results">
-                <include
-                    name="*error.txt"/>
-            </fileset>
-        </copy>
-        <copy
-            file="${testRoot}/results/fullOutput.txt"
-            toDir="${buildDirectory}/${buildLabel}/testResults/consolelogs/full"
-            overwrite="true"
-            failonerror="false">
-        </copy>
-        <copy
-            file="${testRoot}/results/fullErrorLog.txt"
-            toDir="${buildDirectory}/${buildLabel}/testResults/consolelogs/full"
-            overwrite="true"
-            failonerror="false">
-        </copy>
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/xml"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results/xml">
-                <include
-                    name="*.xml"/>
-            </fileset>
-        </copy>
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/html"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results/html">
-                <include
-                    name="*.html"/>
-            </fileset>
-        </copy>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.tests/templateFiles/index.php b/releng.wtpbuilder/buildtemplates/distribution/template.tests/templateFiles/index.php
deleted file mode 100644
index a42c883..0000000
--- a/releng.wtpbuilder/buildtemplates/distribution/template.tests/templateFiles/index.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<html>
-<head>
-
-<?php
-$parts = explode("/", realpath(".."));
-$label = $parts[count($parts) - 1];
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-</head>
-<body>
-<p><b><font face="Verdana" size="+3">Test Results</font></b></p>
-<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">Unit Test Results for <?php echo "$label"; ?>
-		</font></b></td>
-	</tr>
-</table>
-<p></p>
-<table border="0">
-</table>
-
-<table width="77%" border="1">
-	<tr>
-		<td width="81%"><b>Tests Performed</b></td>
-		<td width="19%"><b>Errors &amp; Failures</b></td>
-	</tr>
-
-	<?
-	$dir = dir("html");
-	while ($anEntry = $dir->read())
-	{
-		if ($anEntry != "." && $anEntry != "..")
-		{
-			$link = "html/".$anEntry;
-			$xml = "xml/".substr($anEntry, 0, strlen($anEntry)-4)."xml";
-			$count = 0;
-			$fileHandle = fopen($xml, "r");
-			while (!feof($fileHandle))
-			{
-				$aLine = fgets($fileHandle, 4096); // Length parameter only optional after 4.2.0
-				$count = $count + substr_count($aLine, '<error');
-			}
-			fclose($fileHandle);
-			if ($count > 0)
-			{
-				echo "<tr><td><a href=\"$link\"><b><font color=\"red\">";
-				echo "$anEntry";
-				echo "</font></b></a></td>";
-				echo "<td><b><font color=\"red\">$count</font></b></td></tr>";
-			}
-			else
-			{
-				echo "<tr><td><a href=\"$link\">";
-				echo "$anEntry";
-				echo "</a></td>";
-				echo "<td>$count</td></tr>";
-			}
-		}
-	}
-	?>
-
-</table>
-<p></p>
-<br>
-<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"> Console output logs <?php echo "$label"; ?>
-		</font></b></td>
-	</tr>
-</table>
-<br>
-These
-<a href="consolelogs/wtptestlog.txt">logs</a>
-contain the console output captured while running the JUnit automated
-tests.
-<br>
-<br>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/JUNIT.XSL b/releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/JUNIT.XSL
deleted file mode 100644
index 9cdd80e..0000000
--- a/releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/JUNIT.XSL
+++ /dev/null
@@ -1,703 +0,0 @@
-<xsl:stylesheet
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="1.0">
-    <xsl:output
-        method="html"
-        indent="yes"/>
-    <xsl:decimal-format
-        decimal-separator="."
-        grouping-separator=","/>
-    <xsl:template
-        match="testsuites">
-        <HTML>
-            <HEAD>
-                <style
-                    type="text/css"> body { font:normal 68%
-                    verdana,arial,helvetica; color:#000000; } table tr
-                    td, table tr th { font-size: 68%; } table.details tr
-                    th{ font-weight: bold; text-align:left;
-                    background:#a6caf0; } table.details tr td{
-                    background:#eeeee0; } p { line-height:1.5em;
-                    margin-top:0.5em; margin-bottom:1.0em; } h1 {
-                    margin: 0px 0px 5px; font: 165%
-                    verdana,arial,helvetica } h2 { margin-top: 1em;
-                    margin-bottom: 0.5em; font: bold 125%
-                    verdana,arial,helvetica } h3 { margin-bottom: 0.5em;
-                    font: bold 115% verdana,arial,helvetica } h4 {
-                    margin-bottom: 0.5em; font: bold 100%
-                    verdana,arial,helvetica } h5 { margin-bottom: 0.5em;
-                    font: bold 100% verdana,arial,helvetica } h6 {
-                    margin-bottom: 0.5em; font: bold 100%
-                    verdana,arial,helvetica } .Error { font-weight:bold;
-                    color:red; } .Failure { font-weight:bold;
-                    color:purple; } .Properties { text-align:right; } </style>
-                <script
-                    language="JavaScript">
-                    var TestCases = new Array(); var cur;
-                    <xsl:for-each
-                        select="./testsuite">
-                        <xsl:apply-templates
-                            select="properties"/>
-                    </xsl:for-each>
-                </script>
-                <script
-                    language="JavaScript"><![CDATA[
-        function displayProperties (name) {
-          var win = window.open('','JUnitSystemProperties','scrollbars=1,resizable=1');
-          var doc = win.document.open();
-          doc.write("<html><head><title>Properties of " + name + "</title>");
-          doc.write("<style>")
-          doc.write("body {font:normal 68% verdana,arial,helvetica;	color:#000000; }");
-          doc.write("table tr td, table tr th { font-size: 68%; }");
-          doc.write("table.properties { border-collapse:collapse; border-left:solid 1 #cccccc; border-top:solid 1 #cccccc; padding:5px; }");
-          doc.write("table.properties th { text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#eeeeee; }");
-          doc.write("table.properties td { font:normal; text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#fffffff; }");
-          doc.write("h3 { margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica }");
-          doc.write("</style>");
-          doc.write("</head><body>");
-          doc.write("<h3>Properties of " + name + "</h3>");
-          doc.write("<div align=\"right\"><a href=\"javascript:window.close();\">Close</a></div>");
-          doc.write("<table class='properties'>");
-          doc.write("<tr><th>Name</th><th>Value</th></tr>");
-          for (prop in TestCases[name]) {
-            doc.write("<tr><th>" + prop + "</th><td>" + TestCases[name][prop] + "</td></tr>");
-          }
-          doc.write("</table>");
-          doc.write("</body></html>");
-          doc.close();
-          win.focus();
-        }
-      ]]>
-                </script>
-            </HEAD>
-            <body>
-                <a
-                    name="top"></a>
-                <xsl:call-template
-                    name="pageHeader"/>
-
-                <!-- Summary part -->
-                <xsl:call-template
-                    name="summary"/>
-                <hr
-                    size="1"
-                    width="95%"
-                    align="left"/>
-
-                <!-- Package List part -->
-                <xsl:call-template
-                    name="packagelist"/>
-                <hr
-                    size="1"
-                    width="95%"
-                    align="left"/>
-
-                <!-- For each package create its part -->
-                <xsl:call-template
-                    name="packages"/>
-                <hr
-                    size="1"
-                    width="95%"
-                    align="left"/>
-
-                <!-- For each class create the  part -->
-                <xsl:call-template
-                    name="classes"/>
-            </body>
-        </HTML>
-    </xsl:template>
-    <!--
-        ==================================================================
-    -->
-    <!--
-        Write a list of all packages with an hyperlink to the anchor of
-    -->
-    <!--
-        of the package name.
-    -->
-    <!--
-        ==================================================================
-    -->
-    <xsl:template
-        name="packagelist">
-        <h2>Packages</h2>
-        Note: package statistics are not computed recursively, they only
-        sum up all of its testsuites numbers.
-        <table
-            class="details"
-            border="0"
-            cellpadding="5"
-            cellspacing="2"
-            width="95%">
-            <xsl:call-template
-                name="testsuite.test.header"/>
-            <!-- list all packages recursively -->
-            <xsl:for-each
-                select="./testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
-                <xsl:sort
-                    select="@package"/>
-                <xsl:variable
-                    name="testsuites-in-package"
-                    select="/testsuites/testsuite[./@package = current()/@package]"/>
-                <xsl:variable
-                    name="testCount"
-                    select="sum($testsuites-in-package/@tests)"/>
-                <xsl:variable
-                    name="errorCount"
-                    select="sum($testsuites-in-package/@errors)"/>
-                <xsl:variable
-                    name="failureCount"
-                    select="sum($testsuites-in-package/@failures)"/>
-                <xsl:variable
-                    name="timeCount"
-                    select="sum($testsuites-in-package/@time)"/>
-
-                <!-- write a summary for the package -->
-                <tr
-                    valign="top">
-                    <!-- set a nice color depending if there is an error/failure -->
-                    <xsl:attribute
-                        name="class">
-						<xsl:choose>
-							<xsl:when
-                        test="$failureCount &gt; 0">Failure</xsl:when>
-							<xsl:when
-                        test="$errorCount &gt; 0">Error</xsl:when>
-						</xsl:choose>
-					</xsl:attribute>
-                    <td>
-                        <a
-                            href="#{@package}">
-                            <xsl:value-of
-                                select="@package"/>
-                        </a>
-                    </td>
-                    <td>
-                        <xsl:value-of
-                            select="$testCount"/>
-                    </td>
-                    <td>
-                        <xsl:value-of
-                            select="$errorCount"/>
-                    </td>
-                    <td>
-                        <xsl:value-of
-                            select="$failureCount"/>
-                    </td>
-                    <td>
-                        <xsl:call-template
-                            name="display-time">
-                            <xsl:with-param
-                                name="value"
-                                select="$timeCount"/>
-                        </xsl:call-template>
-                    </td>
-                </tr>
-            </xsl:for-each>
-        </table>
-    </xsl:template>
-    <!--
-        ==================================================================
-    -->
-    <!--
-        Write a package level report
-    -->
-    <!--
-        It creates a table with values from the document:
-    -->
-    <!--
-        Name | Tests | Errors | Failures | Time
-    -->
-    <!--
-        ==================================================================
-    -->
-    <xsl:template
-        name="packages">
-        <!-- create an anchor to this package name -->
-        <xsl:for-each
-            select="/testsuites/testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
-            <xsl:sort
-                select="@package"/>
-            <a
-                name="{@package}"></a>
-            <h3>
-                Package
-                <xsl:value-of
-                    select="@package"/>
-            </h3>
-            <table
-                class="details"
-                border="0"
-                cellpadding="5"
-                cellspacing="2"
-                width="95%">
-                <xsl:call-template
-                    name="testsuite.test.header"/>
-
-                <!-- match the testsuites of this package -->
-                <xsl:apply-templates
-                    select="/testsuites/testsuite[./@package = current()/@package]"
-                    mode="print.test"/>
-            </table>
-            <a
-                href="#top">Back to top</a>
-            <p/>
-            <p/>
-        </xsl:for-each>
-    </xsl:template>
-    <xsl:template
-        name="classes">
-        <xsl:for-each
-            select="testsuite">
-            <xsl:sort
-                select="@name"/>
-            <!-- create an anchor to this class name -->
-            <a
-                name="{@name}"></a>
-            <h3>
-                TestCase
-                <xsl:value-of
-                    select="@name"/>
-            </h3>
-            <table
-                class="details"
-                border="0"
-                cellpadding="5"
-                cellspacing="2"
-                width="95%">
-                <xsl:call-template
-                    name="testcase.test.header"/>
-                <!--
-                    test can even not be started at all (failure to load
-                    the class) so report the error directly
-                -->
-                <xsl:if
-                    test="./error">
-                    <tr
-                        class="Error">
-                        <td
-                            colspan="4">
-                            <xsl:apply-templates
-                                select="./error"/>
-                        </td>
-                    </tr>
-                </xsl:if>
-                <xsl:apply-templates
-                    select="./testcase"
-                    mode="print.test"/>
-            </table>
-            <div
-                class="Properties">
-                <a>
-                    <xsl:attribute
-                        name="href">javascript:displayProperties('<xsl:value-of
-                        select="@package"/>.<xsl:value-of
-                        select="@name"/>');</xsl:attribute>
-                    Properties &gt;&gt;
-                </a>
-            </div>
-            <p/>
-            <a
-                href="#top">Back to top</a>
-        </xsl:for-each>
-    </xsl:template>
-    <xsl:template
-        name="summary">
-        <h2>Summary</h2>
-        <xsl:variable
-            name="testCount"
-            select="sum(testsuite/@tests)"/>
-        <xsl:variable
-            name="errorCount"
-            select="sum(testsuite/@errors)"/>
-        <xsl:variable
-            name="failureCount"
-            select="sum(testsuite/@failures)"/>
-        <xsl:variable
-            name="timeCount"
-            select="sum(testsuite/@time)"/>
-        <xsl:variable
-            name="successRate"
-            select="($testCount - $failureCount - $errorCount) div $testCount"/>
-        <table
-            class="details"
-            border="0"
-            cellpadding="5"
-            cellspacing="2"
-            width="95%">
-            <tr
-                valign="top">
-                <th>Tests</th>
-                <th>Failures</th>
-                <th>Errors</th>
-                <th>Success rate</th>
-                <th>Time</th>
-            </tr>
-            <tr
-                valign="top">
-                <xsl:attribute
-                    name="class">
-				<xsl:choose>
-					<xsl:when
-                    test="$failureCount &gt; 0">Failure</xsl:when>
-					<xsl:when
-                    test="$errorCount &gt; 0">Error</xsl:when>
-				</xsl:choose>
-			</xsl:attribute>
-                <td>
-                    <xsl:value-of
-                        select="$testCount"/>
-                </td>
-                <td>
-                    <xsl:value-of
-                        select="$failureCount"/>
-                </td>
-                <td>
-                    <xsl:value-of
-                        select="$errorCount"/>
-                </td>
-                <td>
-                    <xsl:call-template
-                        name="display-percent">
-                        <xsl:with-param
-                            name="value"
-                            select="$successRate"/>
-                    </xsl:call-template>
-                </td>
-                <td>
-                    <xsl:call-template
-                        name="display-time">
-                        <xsl:with-param
-                            name="value"
-                            select="$timeCount"/>
-                    </xsl:call-template>
-                </td>
-            </tr>
-        </table>
-        <table
-            border="0"
-            width="95%">
-            <tr>
-                <td
-                    style="text-align: justify;">
-                    Note:
-                    <i>failures</i>
-                    are anticipated and checked for with assertions
-                    while
-                    <i>errors</i>
-                    are unanticipated.
-                </td>
-            </tr>
-        </table>
-    </xsl:template>
-    <!--
-        Write properties into a JavaScript data structure. This is based
-        on the original idea by Erik Hatcher (erik@hatcher.net)
-    -->
-    <xsl:template
-        match="properties">
-        cur = TestCases['
-        <xsl:value-of
-            select="../@package"/>
-        .
-        <xsl:value-of
-            select="../@name"/>
-        '] = new Array();
-        <xsl:for-each
-            select="property">
-            <xsl:sort
-                select="@name"/>
-            cur['
-            <xsl:value-of
-                select="@name"/>
-            '] = '
-            <xsl:call-template
-                name="JS-escape">
-                <xsl:with-param
-                    name="string"
-                    select="@value"/>
-            </xsl:call-template>
-            ';
-        </xsl:for-each>
-    </xsl:template>
-
-    <!-- Page HEADER -->
-    <xsl:template
-        name="pageHeader">
-        <h1>Unit Test Results</h1>
-        <table
-            width="100%">
-            <tr>
-                <td
-                    align="left"></td>
-                <td
-                    align="right">
-                    Designed for use with
-                    <a
-                        href='http://www.junit.org'>JUnit</a>
-                    and
-                    <a
-                        href='http://jakarta.apache.org/ant'>Ant</a>
-                    .
-                </td>
-            </tr>
-        </table>
-        <hr
-            size="1"/>
-    </xsl:template>
-    <xsl:template
-        match="testsuite"
-        mode="header">
-        <tr
-            valign="top">
-            <th
-                width="80%">Name</th>
-            <th>Tests</th>
-            <th>Errors</th>
-            <th>Failures</th>
-            <th
-                nowrap="nowrap">Time(s)</th>
-        </tr>
-    </xsl:template>
-
-    <!-- class header -->
-    <xsl:template
-        name="testsuite.test.header">
-        <tr
-            valign="top">
-            <th
-                width="80%">Name</th>
-            <th>Tests</th>
-            <th>Errors</th>
-            <th>Failures</th>
-            <th
-                nowrap="nowrap">Time(s)</th>
-        </tr>
-    </xsl:template>
-
-    <!-- method header -->
-    <xsl:template
-        name="testcase.test.header">
-        <tr
-            valign="top">
-            <th>Name</th>
-            <th>Status</th>
-            <th
-                width="80%">Type</th>
-            <th
-                nowrap="nowrap">Time(s)</th>
-        </tr>
-    </xsl:template>
-
-
-    <!-- class information -->
-    <xsl:template
-        match="testsuite"
-        mode="print.test">
-        <tr
-            valign="top">
-            <!-- set a nice color depending if there is an error/failure -->
-            <xsl:attribute
-                name="class">
-			<xsl:choose>
-				<xsl:when
-                test="@failures[.&gt; 0]">Failure</xsl:when>
-				<xsl:when
-                test="@errors[.&gt; 0]">Error</xsl:when>
-			</xsl:choose>
-		</xsl:attribute>
-
-            <!-- print testsuite information -->
-            <td>
-                <a
-                    href="#{@name}">
-                    <xsl:value-of
-                        select="@name"/>
-                </a>
-            </td>
-            <td>
-                <xsl:value-of
-                    select="@tests"/>
-            </td>
-            <td>
-                <xsl:value-of
-                    select="@errors"/>
-            </td>
-            <td>
-                <xsl:value-of
-                    select="@failures"/>
-            </td>
-            <td>
-                <xsl:call-template
-                    name="display-time">
-                    <xsl:with-param
-                        name="value"
-                        select="@time"/>
-                </xsl:call-template>
-            </td>
-        </tr>
-    </xsl:template>
-    <xsl:template
-        match="testcase"
-        mode="print.test">
-        <tr
-            valign="top">
-            <xsl:attribute
-                name="class">
-			<xsl:choose>
-				<xsl:when
-                test="failure | error">Error</xsl:when>
-			</xsl:choose>
-		</xsl:attribute>
-            <td>
-                <xsl:value-of
-                    select="@name"/>
-            </td>
-            <xsl:choose>
-                <xsl:when
-                    test="failure">
-                    <td>Failure</td>
-                    <td>
-                        <xsl:apply-templates
-                            select="failure"/>
-                    </td>
-                </xsl:when>
-                <xsl:when
-                    test="error">
-                    <td>Error</td>
-                    <td>
-                        <xsl:apply-templates
-                            select="error"/>
-                    </td>
-                </xsl:when>
-                <xsl:otherwise>
-                    <td>Success</td>
-                    <td></td>
-                </xsl:otherwise>
-            </xsl:choose>
-            <td>
-                <xsl:call-template
-                    name="display-time">
-                    <xsl:with-param
-                        name="value"
-                        select="@time"/>
-                </xsl:call-template>
-            </td>
-        </tr>
-    </xsl:template>
-    <xsl:template
-        match="failure">
-        <xsl:call-template
-            name="display-failures"/>
-    </xsl:template>
-    <xsl:template
-        match="error">
-        <xsl:call-template
-            name="display-failures"/>
-    </xsl:template>
-
-    <!-- Style for the error and failure in the tescase template -->
-    <xsl:template
-        name="display-failures">
-        <xsl:choose>
-            <xsl:when
-                test="not(@message)">
-                N/A
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of
-                    select="@message"/>
-            </xsl:otherwise>
-        </xsl:choose>
-        <!-- display the stacktrace -->
-        <code>
-            <p/>
-            <xsl:call-template
-                name="br-replace">
-                <xsl:with-param
-                    name="word"
-                    select="."/>
-            </xsl:call-template>
-        </code>
-        <!--
-            the later is better but might be problematic for non-21"
-            monitors...
-        -->
-        <!--pre><xsl:value-of select="."/></pre-->
-    </xsl:template>
-    <xsl:template
-        name="JS-escape">
-        <xsl:param
-            name="string"/>
-        <xsl:choose>
-            <!--
-                something isn't right here, basically all single quotes
-                need to be replaced with backslash-single-quote
-                <xsl:when test="contains($string,'&apos;')">
-                <xsl:value-of
-                select="substring-before($string,'&apos;')"/> \&apos;
-                <xsl:call-template name="JS-escape"> <xsl:with-param
-                name="string"
-                select="substring-after($string,'&apos;')"/>
-                </xsl:call-template> </xsl:when>
-            -->
-            <xsl:when
-                test="contains($string,'\')">
-                <xsl:value-of
-                    select="substring-before($string,'\')"/>
-                \\
-                <xsl:call-template
-                    name="JS-escape">
-                    <xsl:with-param
-                        name="string"
-                        select="substring-after($string,'\')"/>
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of
-                    select="$string"/>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-    <!--
-        template that will convert a carriage return into a br tag
-        @param word the text from which to convert CR to BR tag
-    -->
-    <xsl:template
-        name="br-replace">
-        <xsl:param
-            name="word"/>
-        <xsl:choose>
-            <xsl:when
-                test="contains($word,'&#xA;')">
-                <xsl:value-of
-                    select="substring-before($word,'&#xA;')"/>
-                <br/>
-                <xsl:call-template
-                    name="br-replace">
-                    <xsl:with-param
-                        name="word"
-                        select="substring-after($word,'&#xA;')"/>
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of
-                    select="$word"/>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-    <xsl:template
-        name="display-time">
-        <xsl:param
-            name="value"/>
-        <xsl:value-of
-            select="format-number($value,'0.000')"/>
-    </xsl:template>
-    <xsl:template
-        name="display-percent">
-        <xsl:param
-            name="value"/>
-        <xsl:value-of
-            select="format-number($value,'0.00%')"/>
-    </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/test.xml b/releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/test.xml
deleted file mode 100644
index 96c6ddc..0000000
--- a/releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/test.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<project
-    name="Automated Eclipse Testing"
-    default="all"
-    basedir=".">
-    <property
-        environment="env"/>
-
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-    <echo
-        level="info"
-        message="starting Automated Eclipse Testing"/>
-    <echo
-        level="debug"
-        message="basedir: ${basedir}"/>
-    <echo
-        level="debug"
-        message="testRoot: ${testRoot}"/>
-    <fail
-        message="testRoot must be set"
-        unless="testRoot"/>
-
-    <!--properties file containing the build information-->
-    <property
-        file="${buildDirectory}/label.properties"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-    <!--default directory where test-eclipse will be installed-->
-    <property
-        name="install"
-        value="${testRoot}"/>
-    <!--
-        name that can be added to report name to identify which platform
-        tests results come from
-    -->
-    <property
-        name="platform"
-        value=""/>
-
-    <!-- The root of the eclipse installation -->
-    <property
-        name="eclipse-home"
-        value="${testRoot}${dropinsFolder}/eclipse/"/>
-    <!--
-        The directory that will contain the xml and html results from
-        the tests that are run
-    -->
-    <property
-        name="results"
-        value="${testRoot}/results"/>
-    <property
-        name="library-file"
-        value="${testRoot}/wtp-junit-tests.xml"/>
-    <target
-        name="init">
-    </target>
-    <target
-        name="all"
-        depends="init">
-        <echo
-            level="info"
-            message="Starting Unit Tests"/>
-        <!--
-            unlike other ant tasks, subant defaults to false for
-            inheritall!
-        -->
-        <subant
-            target=""
-            inheritall="true">
-            <fileset
-                dir="${eclipse-home}/plugins/">
-                <exclude
-                    name="**/*performance*/test.xml"/>
-                <include
-                    name="**/test.xml"/>
-            </fileset>
-        </subant>
-        <echo
-            level="info"
-            message="Ended Unit Tests"/>
-        <antcall
-            target="genHtml"/>
-    </target>
-    <target
-        name="genHtml"
-        description="Generates HTML results with provided JUNIT.XSL provided"
-        unless="genHtml.disable">
-        <xslt
-            style="JUNIT.XSL"
-            basedir="${results}/xml"
-            destdir="${results}/html"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/wtp-junit-tests.xml
deleted file mode 100644
index 62f4501..0000000
--- a/releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/wtp-junit-tests.xml
+++ /dev/null
@@ -1,317 +0,0 @@
-<?xml version="1.0"?>
-<project
-    name="JUnit tests"
-    basedir=".">
-    <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-    <target
-        name="init">
-        <property
-            name="junit-report-output"
-            value="${testRoot}/results"/>
-        <mkdir
-            dir="${junit-report-output}/raw"/>
-        <!--
-            if not otherwise set, be sure extraVMargs is at least some
-            string, even if unused string. 
-            
-            Remember, though, extraVMArgs can contain more than one extra arg, 
-            so much be passed to VM as a "line", not "value". 
-        -->
-        <property
-            name="extraVMargs"
-            value="-DextraVMargsunused=notused"/>
-
-        <!-- if not otherwise set, use a unique workspace name -->
-        <property
-            name="data-dir"
-            value="${testRoot}/junitworkspaces/workspace-${classname}"/>
-        <property
-            name="testRoot"
-            value="${testRoot}"/>
-        <!--
-            Some common values, of milliseconds to more recognizable
-            units: 14400000: 4 hours 7200000: 2 hours 3600000: 1 hour
-            1800000: 30 minutes 600000: 10 minutes
-        -->
-        <property
-            name="timeout"
-            value="1800000"/>
-        <property
-            name="junit-report-output"
-            value="${junit-report-output}"/>
-        <property
-            name="formatter"
-            value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter"/>
-        <property
-            name="test-output"
-            value="${junit-report-output}/raw/${classname}.xml"/>
-        <property
-            name="jvm"
-            value="${env.JAVA_6_HOME}/bin/java"/>
-        <dirname
-            file="${ant.file}"
-            property="currentDir"/>
-        <echo
-            level="debug"
-            message="data-dir: ${data-dir}"/>
-        <echo
-            level="debug"
-            message="plugin-name: ${plugin-name}"/>
-        <echo
-            level="debug"
-            message="classname: ${classname}"/>
-        <echo
-            level="info"
-            message="extraVMargs: ${extraVMargs}"/>
-        <echo
-            level="debug"
-            message="timeout: ${timeout}"/>
-        <echo
-            level="debug"
-            message="testRoot: ${testRoot}"/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="debug"
-            message="eclipse-home: ${eclipse-home}"/>
-        <echo
-            level="debug"
-            message="junit-report-output: ${junit-report-output}"/>
-        <echo
-            level="debug"
-            message="test-output: ${test-output}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="buildLabel: ${buildLabel}"/>
-        <echo
-            level="debug"
-            message="jvm: ${jvm}"/>
-    </target>
-    <target
-        name="core-test"
-        depends="init">
-        <echo
-            level="info"
-            message="test-type: core-test"/>
-        <ant
-            antfile="${ant.file}"
-            dir="${currentDir}"
-            target="eclipse-test">
-            <property
-                name="application"
-                value="org.eclipse.test.coretestapplication"/>
-        </ant>
-    </target>
-    <target
-        name="ui-test"
-        depends="init">
-        <echo
-            level="info"
-            message="test-type: ui-test"/>
-        <ant
-            antfile="${ant.file}"
-            dir="${currentDir}"
-            target="eclipse-test">
-            <property
-                name="application"
-                value="org.eclipse.test.uitestapplication"/>
-        </ant>
-    </target>
-    <target
-        name="eclipse-test"
-        description="Runs the specified classname as a plug-in test.">
-        <echo
-            level="info"
-            message="Running ${classname}"/>
-        <echo
-            level="debug"
-            message="Result file: ${junit-report-output}/${classname}.xml."/>
-        <echo
-            level="debug"
-            message="DISPLAY: ${env.DISPLAY}"/>
-        <mkdir
-            dir="${buildDirectory}/${buildLabel}/httplogstest"/>
-        <echo
-            message="http log messages to: ${buildDirectory}/${buildLabel}/httplogstest"/>
-    	
-       <condition
-           property="xulRunnerParam"
-           value="org.eclipse.swt.browser.XULRunnerPath"
-           else="XULRunnerPathNotSpecified">
-           <isset
-               property="env.WTP_XULRUNNER"/>
-       </condition>
-        <echo
-            message="xulRunnerParam: ${xulRunnerParam}"/>
-        <echo
-            message="WTP_XULRUNNER: ${env.WTP_XULRUNNER}"/>
-        <!--
-            If there is not exactly one launcher in the stack, we'd best
-            fail fast, since we are not expecting that, and may indicate
-            an installation that would produce unpredictable results
-        -->
-        <!--
-            requires ant 1.7, and at this point, we're running 1.6 from
-            eclipse ... <condition property="expectedNumberOfLaunchers">
-            <resourcecount when="equal" count="1" > <fileset
-            dir="${testRoot}/eclipse/plugins"> <include
-            name="org.eclipse.equinox.launcher_*.jar" /> </fileset>
-            </resourcecount> </condition> <fail message="Did not find
-            expected number of launcher jars. Check installation."
-            unless="expectedNumberOfLaunchers" />
-        -->
-        <java
-            taskname="suiteUnitTest"
-            fork="true"
-            resultProperty="suitejunitresult"
-            failonerror="false"
-            timeout="${timeout}"
-            dir="${testRoot}/eclipse"
-            jvm="${jvm}"
-            classname="org.eclipse.equinox.launcher.Main">
-            <classpath>
-                <fileset
-                    dir="${testRoot}/eclipse/plugins">
-                    <include
-                        name="org.eclipse.equinox.launcher_*.jar"/>
-                </fileset>
-            </classpath>
-            <jvmarg
-                value="-Xmx512m"/>
-            <jvmarg
-                value="-Dosgi.ws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dosgi.os=${env.BASEOS}"/>
-            <jvmarg
-                value="-Dosgi.arch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-DbuildLabel=${buildLabel}"/>
-            <jvmarg
-                value="-DbuildDirectory=${buildDirectory}"/>
-            <jvmarg
-                value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
-            <jvmarg
-                value="-DurlLogLocation=${buildDirectory}/${buildLabel}/httplogstest/outgoinghttplog-${plugin-name}.log"/>
-            <jvmarg
-                value="-Dwtp.autotest.noninteractive=true"/>
-            <jvmarg
-                line="${extraVMargs}"/>
-            <jvmarg
-                value="-Declipse.consolelog=true"/>
-            <jvmarg
-                value="-Dosgi.debug"/>
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <jvmarg
-                value="-Dprojectname=${projectname}"/>
-        	
-              <jvmarg
-                  value="-D${xulRunnerParam}=${env.WTP_XULRUNNER}"/> 	
-        	
-        	
-            <arg
-                value="-nosplash"/>
-            <arg
-                value="-data"/>
-            <arg
-                value="${data-dir}"/>
-            <arg
-                value="-application"/>
-            <arg
-                value="${application}"/>
-            <arg
-                value="formatter=${formatter},${test-output}"/>
-            <arg
-                value="-testPluginName"/>
-            <arg
-                value="${plugin-name}"/>
-            <arg
-                value="-className"/>
-            <arg
-                value="${classname}"/>
-            <env
-                key="DISPLAY"
-                value="${env.DISPLAY}"/>
-            <redirector
-                output="${junit-report-output}/${classname}.output.txt"
-                error="${junit-report-output}/${classname}.error.txt"/>
-        </java>
-        <echo
-            level="info"
-            message="suitejunitresult: ${suitejunitresult}"/>
-        <antcall
-            target="summarizeFailure"/>
-        <antcall
-            target="collect-results"/>
-    </target>
-    <target
-        name="collect-results">
-        <dirname
-            property="output-dir"
-            file="${test-output}"/>
-        <basename
-            property="output-file-name"
-            file="${test-output}"/>
-        <mkdir
-            dir="${junit-report-output}/xml"/>
-        <junitreport
-            todir="${junit-report-output}/xml"
-            tofile="${classname}.xml">
-            <fileset
-                dir="${output-dir}">
-                <include
-                    name="${output-file-name}"/>
-            </fileset>
-        </junitreport>
-        <mkdir
-            dir="${junit-report-output}/html"/>
-        <xslt
-            style="${testRoot}/JUNIT.XSL"
-            basedir="${junit-report-output}"
-            includes="${classname}.xml"
-            destdir="${junit-report-output}/html"/>
-    </target>
-    <target
-        name="collect">
-        <!--
-            deprecated, each test.xml uses it, and we should remove,
-            eventually
-        -->
-        <echo
-            message="Deprecated. There is no need to call the collect task. It no longer does anything. Please remove from your test.xml file"/>
-    </target>
-    <target
-        name="summarizeFailure"
-        depends="checkFailure"
-        if="doFailure">
-        <echo
-            append="true"
-            file="${buildDirectory}/junitFailureList.log">${plugin-name}${line.separator}</echo>
-    </target>
-    <target
-        name="checkFailure">
-        <condition
-            property="doFailure">
-            <not>
-                <equals
-                    arg1="${suitejunitresult}"
-                    arg2="0"
-                    trim="true"/>
-            </not>
-        </condition>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.tests/testdependency.xml b/releng.wtpbuilder/buildtemplates/distribution/template.tests/testdependency.xml
deleted file mode 100644
index 80c5293..0000000
--- a/releng.wtpbuilder/buildtemplates/distribution/template.tests/testdependency.xml
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-    <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <fail
-        message="Required property file does not exist: ${keyCfgFile}">
-        <condition>
-            <not>
-                <available
-                    file="${keyCfgFile}"/>
-            </not>
-        </condition>
-    </fail>
-    <property
-        file="${keyCfgFile}"/>
-    <condition
-        property="getprereq.eclipse">
-        <istrue
-            value="@prereq.eclipse@"/>
-    </condition>
-    <condition
-        property="getprereq.eclipseplatform">
-        <istrue
-            value="@prereq.eclipseplatform@"/>
-    </condition>
-    <condition
-        property="getprereq.emf">
-        <istrue
-            value="@prereq.emf@"/>
-    </condition>
-    <condition
-        property="getprereq.emfxsd">
-        <istrue
-            value="@prereq.emfxsd@"/>
-    </condition>
-    <condition
-        property="getprereq.emfvalidation">
-        <istrue
-            value="@prereq.emfvalidation@"/>
-    </condition>
-    <condition
-        property="getprereq.gef">
-        <istrue
-            value="@prereq.gef@"/>
-    </condition>
-    <condition
-        property="getprereq.dtp">
-        <istrue
-            value="@prereq.dtp@"/>
-    </condition>
-    <condition
-        property="getprereq.wst">
-        <istrue
-            value="@prereq.wst@"/>
-    </condition>
-    <condition
-        property="getprereq.jst">
-        <istrue
-            value="@prereq.jst@"/>
-    </condition>
-    <condition
-        property="getprereq.wtp">
-        <istrue
-            value="@prereq.wtp@"/>
-    </condition>
-    <target
-        name="get">
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined, which we do later with
-            statements such if="${groupId}.url"
-        -->
-        <property
-            file="${dependency.properties}"/>
-        <antcall
-            target="prereq.emf"/>
-        <antcall
-            target="prereq.emfxsd"/>
-        <antcall
-            target="prereq.emfvalidation"/>
-        <antcall
-            target="prereq.gef"/>
-        <antcall
-            target="prereq.dtp"/>
-        <antcall
-            target="prereq.wst"/>
-        <antcall
-            target="prereq.jst"/>
-        <antcall
-            target="prereq.wtp"/>
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="eclipseTestFramework"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.eclipse"
-        if="getprereq.eclipse">
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.eclipseplatform"
-        if="getprereq.eclipseplatform">
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="eclipseplatform"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emf"
-        if="getprereq.emf">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfxsd"
-        if="getprereq.emfxsd">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfvalidation"
-        if="getprereq.emfvalidation">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="emfvalidation"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.gef"
-        if="getprereq.gef">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.dtp"
-        if="getprereq.dtp">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="dtp"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wst"
-        if="getprereq.wst">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="wst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.jst"
-        if="getprereq.jst">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="jst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wtp"
-        if="getprereq.wtp">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="wtp"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstallBase"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-    <target
-        name="getAndInstallDropins"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}${dropinsFolder}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/jaxws.properties b/releng.wtpbuilder/buildtemplates/jaxws.properties
deleted file mode 100644
index bd5e430..0000000
--- a/releng.wtpbuilder/buildtemplates/jaxws.properties
+++ /dev/null
@@ -1,38 +0,0 @@
-# 'shortname' effects all foldernames too, plus some content, in distribution section
-# should be same name as this property file (for future use). 
-shortname=jaxws
-
-
-# These first three properties are mainly for component templates
-
-#  'featurename' assumes group of three features
-#  a) featurename.feature
-#  b) featurename_sdk.feature
-#  c) featurename_tests.feature
-
-featurename=org.eclipse.jst.ws.jaxws.assembly
-
-#  'zipprefix' is prefixed to -[type]-${buildlabel},
-#  where type is empty, 'sdk' or 'tests',
-#  usually of the form [top-level project]-[project]-[component]
-#  for example, wtp-incubator-xmlsecurity
-zipprefix=wtp-incubator-jaxws
-
-#  'relengmapseng' must match the environment variable set in
-#  commonComputedVariables, such as RELENGXMLSEC
-relengmapsenv=RELENGJAXWS
-
-#  prereq is the basic prereq on top of platform, jdt, emf, gef
-#  (only realistic options for right now are wst, jst). 
-prereq.eclipse=true
-prereq.emf=true
-prereq.emfxsd=true
-prereq.emfvalidation=true
-prereq.gef=true
-prereq.wtp=true
-
-# These next properties are mainly for distribution template files
-
-# longdescription appears on the download webpage
-longdescription=The Zip files includes the features and plugins for the WTP Incubator JAX WS Component.
-
diff --git a/releng.wtpbuilder/buildtemplates/jsdt.properties b/releng.wtpbuilder/buildtemplates/jsdt.properties
deleted file mode 100644
index 44130fd..0000000
--- a/releng.wtpbuilder/buildtemplates/jsdt.properties
+++ /dev/null
@@ -1,36 +0,0 @@
-# 'shortname' effects all foldernames too, plus some content, in distribution section
-# should be same name as this property file (for future use). 
-shortname=jsdt
-
-
-# These first three properties are mainly for component templates
-
-#  'featurename' assumes group of three features
-#  a) featurename.feature
-#  b) featurename_sdk.feature
-#  c) featurename_tests.feature
-
-featurename=org.eclipse.wst.jsdt
-
-#  'zipprefix' is prefixed to -[type]-${buildlabel},
-#  where type is empty, 'sdk' or 'tests',
-#  usually of the form [top-level project]-[project]-[component]
-#  for example, wtp-incubator-xmlsecurity
-zipprefix=wtp-jsdt
-
-#  'relengmapseng' must match the environment variable set in
-#  commonComputedVariables, such as RELENGXMLSEC
-relengmapsenv=RELENGJSDT
-
-#  list of prereqs to control what is installed for compile and tests
-prereq.eclipseplatform=true
-        
-
-# These next properties are mainly for distribution template files
-
-# longdescription appears on the download webpage
-longdescription=The Zip files includes the features and plugins for the JavaScript Development Tools (JSDT).
-
-
-# omit (or set to true) for incubating projects for proper webpage
-incubating=false
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/pave.properties b/releng.wtpbuilder/buildtemplates/pave.properties
deleted file mode 100644
index 2346e0b..0000000
--- a/releng.wtpbuilder/buildtemplates/pave.properties
+++ /dev/null
@@ -1,39 +0,0 @@
-# 'shortname' effects all foldernames too, plus some content, in distribution section
-# should be same name as this property file (for future use). 
-shortname=pave
-
-
-# These first three properties are mainly for component templates
-
-#  'featurename' assumes group of three features
-#  a) featurename.feature
-#  b) featurename_sdk.feature
-#  c) featurename_tests.feature
-
-featurename=org.eclipse.pave
-
-#  'zipprefix' is prefixed to -[type]-${buildlabel},
-#  where type is empty, 'sdk' or 'tests',
-#  usually of the form [top-level project]-[project]-[component]
-#  for example, wtp-incubator-xmlsecurity
-zipprefix=wtp-incubator-pave
-
-#  'relengmapseng' must match the environment variable set in
-#  commonComputedVariables, such as RELENGXMLSEC
-relengmapsenv=RELENGPAVE
-
-#  prereq is the basic prereq on top of platform, jdt, emf, gef
-#  (only realistic options for right now are wst, jst). 
-prereq.eclipse=true
-prereq.emf=true
-prereq.emfxsd=true
-prereq.emfvalidation=true
-prereq.gef=true
-prereq.dtp=true
-prereq.wtp=true
-
-# These next properties are mainly for distribution template files
-
-# longdescription appears on the download webpage
-longdescription=The Zip files includes the features and plugins for the WTP Incubator Pave Framework and reference implementation for Java EE patterns: CRUD, and CRUD Application.
-
diff --git a/releng.wtpbuilder/buildtemplates/servadapt.properties b/releng.wtpbuilder/buildtemplates/servadapt.properties
deleted file mode 100644
index daa287c..0000000
--- a/releng.wtpbuilder/buildtemplates/servadapt.properties
+++ /dev/null
@@ -1,39 +0,0 @@
-# 'shortname' effects all foldernames too, plus some content, in distribution section
-# should be same name as this property file (for future use). 
-shortname=servadapt
-
-# These first three properties are mainly for component templates
-
-#  'featurename' assumes group of three features
-#  a) featurename.feature
-#  b) featurename_sdk.feature
-#  c) featurename_tests.feature
-
-featurename=org.eclipse.jst.server_adapters.ext
-
-#  'zipprefix' is prefixed to -[type]-${buildlabel},
-#  where type is empty, 'sdk' or 'tests',
-#  usually of the form [top-level project]-[project]-[component]
-#  for example, wtp-incubator-xmlsecurity
-zipprefix=wtp-server-adapters
-
-#  'relengmapseng' must match the environment variable set in
-#  commonComputedVariables, such as RELENGXMLSEC
-# Note: for server tools, this will get more maps than required
-relengmapsenv=RELENGSERVERTOOLS
-
-#  prereq is the basic prereq on top of platform, jdt, emf, gef
-#  (only realistic options for right now are wst, jst). 
-basicprereq=wtp
-
-# These next properties are mainly for distribution template files
-
-# longdescription appears on the download webpage
-longdescription=The Zip files includes the features and plugins for some Server Adapters. 
-
-
-# special case
-sdksuffix=.sdk.feature
-
-# omit (or set to true) for incubating projects for proper webpage
-incubating=false
diff --git a/releng.wtpbuilder/buildtemplates/vex.properties b/releng.wtpbuilder/buildtemplates/vex.properties
deleted file mode 100644
index 2b2eafe..0000000
--- a/releng.wtpbuilder/buildtemplates/vex.properties
+++ /dev/null
@@ -1,35 +0,0 @@
-# 'shortname' effects all foldernames too, plus some content, in distribution section
-# should be same name as this property file (for future use). 
-shortname=vex
-
-# These first three properties are mainly for component templates
-
-#  'featurename' assumes group of three features
-#  a) featurename.feature
-#  b) featurename_sdk.feature
-#  c) featurename_tests.feature
-
-featurename=org.eclipse.wst.xml.vex
-
-#  'zipprefix' is prefixed to -[type]-${buildlabel},
-#  where type is empty, 'sdk' or 'tests',
-#  usually of the form [top-level project]-[project]-[component]
-#  for example, wtp-incubator-xmlsecurity
-zipprefix=wtp-incubator-xml.vex
-
-#  'relengmapseng' must match the environment variable set in
-#  commonComputedVariables, such as RELENGXMLSEC
-relengmapsenv=RELENGINCUBATORVEX
-
-#  prereq is the basic prereq on top of platform, jdt, emf, gef
-#  (only realistic options for right now are wst, jst). 
-prereq.eclipse=true
-prereq.emf=true
-prereq.emfxsd=true
-prereq.gef=true
-prereq.wst=true
-
-# These next properties are mainly for distribution template files
-
-# longdescription appears on the download webpage
-longdescription=The Zip files includes the features and plugins for the WTP Incubator VEX Component.
diff --git a/releng.wtpbuilder/buildtemplates/wstfproj.properties b/releng.wtpbuilder/buildtemplates/wstfproj.properties
deleted file mode 100644
index 411e488..0000000
--- a/releng.wtpbuilder/buildtemplates/wstfproj.properties
+++ /dev/null
@@ -1,41 +0,0 @@
-# 'shortname' effects all foldernames too, plus some content, in distribution section
-# should be same name as this property file (for future use). 
-shortname=wstfproj
-
-# These first three properties are mainly for component templates
-
-#  'featurename' assumes group of three features
-#  a) featurename.feature
-#  b) featurename_sdk.feature
-#  c) featurename_tests.feature
-
-featurename=org.eclipse.wst.common.fproj
-
-#  'zipprefix' is prefixed to -[type]-${buildlabel},
-#  where type is empty, 'sdk' or 'tests',
-#  usually of the form [top-level project]-[project]-[component]
-#  for example, wtp-incubator-xmlsecurity
-zipprefix=wst-common-fproj
-
-#  'relengmapseng' must match the environment variable set in
-#  commonComputedVariables, such as RELENGXMLSEC
-# Note: for server tools, this will get more maps than required
-relengmapsenv=RELENGCOMMON
-
-#  prereq is the basic prereq on top of platform, jdt, emf, gef
-#  (only realistic options for right now are wst, jst). 
-basicprereq=
-
-# These next properties are mainly for distribution template files
-
-# longdescription appears on the download webpage
-longdescription=The Zip files includes the features and plugins for non-java Faceted Projects 
-
-# normally is '.feature', but if not, leave empty
-featuresuffix=
-
-# special case
-sdksuffix=.sdk
-
-# omit (or set to true) for incubating projects for proper webpage
-incubating=false
diff --git a/releng.wtpbuilder/buildtemplates/wtpcap.properties b/releng.wtpbuilder/buildtemplates/wtpcap.properties
deleted file mode 100644
index 7adbbfe..0000000
--- a/releng.wtpbuilder/buildtemplates/wtpcap.properties
+++ /dev/null
@@ -1,39 +0,0 @@
-# 'shortname' effects all foldernames too, plus some content, in distribution section
-# should be same name as this property file (for future use). 
-shortname=wtpcap
-
-
-# These first three properties are mainly for component templates
-
-#  'featurename' assumes group of three features
-#  a) featurename.feature
-#  b) featurename_sdk.feature
-#  c) featurename_tests.feature
-
-featurename=org.eclipse.wtp.capabilities
-
-#  'zipprefix' is prefixed to -[type]-${buildlabel},
-#  where type is empty, 'sdk' or 'tests',
-#  usually of the form [top-level project]-[project]-[component]
-#  for example, wtp-incubator-xmlsecurity
-zipprefix=wtpcap
-
-#  'relengmapseng' must match the environment variable set in
-#  commonComputedVariables, such as RELENGXMLSEC
-relengmapsenv=RELENG
-
-#  prereq is the basic prereq on top of platform, jdt, emf, gef
-#  (only realistic options for right now are wst, jst).
-# we don't really need wst ... but, not sure what will work here 
-basicprereq=wst
-
-# These next properties are mainly for distribution template files
-
-# longdescription appears on the download webpage
-longdescription=The Zip file contains example capability definitions 
-
-# normally is '.feature', but if not, leave empty
-featuresuffix=
-
-# omit (or set to true) for incubating projects for proper webpage
-incubating=false
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/wtpjee.properties b/releng.wtpbuilder/buildtemplates/wtpjee.properties
deleted file mode 100644
index e60f1a0..0000000
--- a/releng.wtpbuilder/buildtemplates/wtpjee.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-# 'shortname' effects all foldernames too, plus some content, in distribution section
-# should be same name as this property file (for future use). 
-shortname=wtpjee
-
-
-# These first three properties are mainly for component templates
-
-#  'featurename' assumes group of three features
-#  a) featurename.feature
-#  b) featurename_sdk.feature
-#  c) featurename_tests.feature
-
-featurename=org.eclipse.wtp.jee
-
-#  'zipprefix' is prefixed to -[type]-${buildlabel},
-#  where type is empty, 'sdk' or 'tests',
-#  usually of the form [top-level project]-[project]-[component]
-#  for example, wtp-incubator-xmlsecurity
-zipprefix=wtpjee
-
-#  'relengmapseng' must match the environment variable set in
-#  commonComputedVariables, such as RELENGXMLSEC
-relengmapsenv=RELENG
-
-#  prereq is the basic prereq on top of platform, jdt, emf, gef
-#  (only realistic options for right now are wst, jst).
-# we don't really need wst ... but, not sure what will work here 
-basicprereq=
-
-# These next properties are mainly for distribution template files
-
-# longdescription appears on the download webpage
-longdescription=The Zip file contains productized Java EE Developer Tools
-
-
-# omit (or set to true) for incubating projects for proper webpage
-incubating=false
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/xml.properties b/releng.wtpbuilder/buildtemplates/xml.properties
deleted file mode 100644
index 5542b24..0000000
--- a/releng.wtpbuilder/buildtemplates/xml.properties
+++ /dev/null
@@ -1,41 +0,0 @@
-# 'shortname' effects all foldernames too, plus some content, in distribution section
-# should be same name as this property file (for future use). 
-shortname=xml
-    
-
-# These first three properties are mainly for component templates
-
-#  'featurename' assumes group of three features
-#  a) featurename.feature
-#  b) featurename_sdk.feature
-#  c) featurename_tests.feature
-
-featurename=org.eclipse.wst.xml
-
-#  'zipprefix' is prefixed to -[type]-${buildlabel},
-#  where type is empty, 'sdk' or 'tests',
-#  usually of the form [top-level project]-[project]-[component]
-#  for example, wtp-incubator-xmlsecurity
-zipprefix=wtp-xml
-
-#  'relengmapseng' must match the environment variable set in
-#  commonComputedVariables, such as RELENGXMLSEC
-relengmapsenv=RELENGSOURCEEDITING
-
-#  list of prereqs to control what is installed for compile and tests
-prereq.eclipse=true
-prereq.emf=true
-prereq.emfxsd=true
-prereq.gef=true
-
-
-# These next properties are mainly for distribution template files
-
-# longdescription appears on the download webpage
-longdescription=The Zip files includes the features and plugins for XML Development Tools.
-
-
-# omit (or set to true) for incubating projects for proper webpage
-incubating=false
-
-featuresuffix=_ui.feature
diff --git a/releng.wtpbuilder/buildtemplates/xmlsec.properties b/releng.wtpbuilder/buildtemplates/xmlsec.properties
deleted file mode 100644
index 24ec42c..0000000
--- a/releng.wtpbuilder/buildtemplates/xmlsec.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-# 'shortname' effects all foldernames too, plus some content, in distribution section
-# should be same name as this property file (for future use). 
-shortname=xmlsec
-
-
-# These first three properties are mainly for component templates
-
-#  'featurename' assumes group of three features
-#  a) featurename.feature
-#  b) featurename_sdk.feature
-#  c) featurename_tests.feature
-
-featurename=org.eclipse.wst.xml.security
-
-#  'zipprefix' is prefixed to -[type]-${buildlabel},
-#  where type is empty, 'sdk' or 'tests',
-#  usually of the form [top-level project]-[project]-[component]
-#  for example, wtp-incubator-xmlsecurity
-zipprefix=wtp-incubator-xmlsecurity
-
-#  'relengmapseng' must match the environment variable set in
-#  commonComputedVariables, such as RELENGXMLSEC
-relengmapsenv=RELENGXMLSEC
-
-#  prereq is the basic prereq on top of platform, jdt, emf, gef
-#  (only realistic options for right now are wst, jst). 
-prereq.eclipse=true
-prereq.emf=true
-prereq.emfxsd=true
-prereq.gef=true
-prereq.wst=true
-
-# These next properties are mainly for distribution template files
-
-# longdescription appears on the download webpage
-longdescription=The Zip files includes the features and plugins for the WTP Incubator XML Security Component.
-
diff --git a/releng.wtpbuilder/components/common-sdk/build.properties b/releng.wtpbuilder/components/common-sdk/build.properties
deleted file mode 100644
index 9b2e603..0000000
--- a/releng.wtpbuilder/components/common-sdk/build.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# This is a subdirectory of $buildDirectory
-# Set collectingFolder and archivePrefix to . if you want to create archives without
-# trailing eclipse in the paths of the included files
-collectingFolder=eclipse
-
-# The prefix that will be used in the generated archive.
-# Does not make sense to use a different archivePrefix than collectingFolder, 
-# because zip wouldn't find any files to include into the target zip otherwise
-archivePrefix=eclipse
-logExtension=.xml
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-##################################################
-# Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
-javacVerbose=true
-
-sign=true
diff --git a/releng.wtpbuilder/components/common-sdk/customTargets.xml b/releng.wtpbuilder/components/common-sdk/customTargets.xml
deleted file mode 100644
index fdb160e..0000000
--- a/releng.wtpbuilder/components/common-sdk/customTargets.xml
+++ /dev/null
@@ -1,278 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-
-  <!-- = = = standard properties pattern = = = 
-
-      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" />
-
-  <!-- 
-      Let users override standard properties, if desired.
-      If directory, file, or some properties do not exist,  
-      then standard properties will be used.
-  -->
-  <property
-      file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties" />
-
-  <!-- let this project specify properties, if not already set -->
-  <property file="build.properties" />
-
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set" />
-    <echo message="buildDirectory: ${buildDirectory}" />
-
-    <!-- 
-        Run a given ${target} on all elements being built
-        Add on <ant> task for each top level element being built.
-    -->
-    <target name="allElements">
-        <echo
-            level="info"
-            message="Target:${target} " />
-        <echo
-            level="debug"
-            message="basedir: ${basedir}" />
-        <echo
-            level="info"
-            message="component: ${component}" />
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}" />
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}" />
-        <echo
-            level="debug"
-            message="generic target: ${genericTargets}" />
-      <echo
-          message="compilerArg: ${compilerArg}" />
-      <echo
-          message="individualSourceBundles: ${individualSourceBundles}" />
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature" />
-            <property
-                name="id"
-                value="org.eclipse.wst.common_sdk.feature" />
-        </ant>
-    </target>
-
-    <!-- 
-        Targets to assemble the built elements for particular configurations  
-        These generally call the generated assemble scripts (named in 
-        ${assembleScriptName}) but may also add pre and post processing 
-        Add one target for each root element and each configuration 
-    -->
-
-    <target name="assemble.org.eclipse.wst.common_sdk.feature">
-        <property
-            name="archiveName"
-            value="wtp-common-sdk-${buildLabel}.zip" />
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}" />
-    </target>
-
-    <target name="prePackage" />
-
-    <target name="postPackage">
-
-        <property
-            name="archiveName"
-            value="wtp-common-sdk-${buildLabel}.zip" />
-
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}" />
-            <property
-                name="buildLabel"
-                value="${buildLabel}" />
-            <property
-                name="archiveName"
-                value="${archiveName}" />
-        </ant>
-
-    </target>
-
-        <!--
-        Check out map files from repository
-        -->
-    <target name="getMapFiles">
-
-        <!-- for now, get all, at once. May componetize later. -->
-
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="fetchAllMaps" />
-
-    </target>
-
-
-    <!-- 
-        Steps to do before setup
-    -->
-    <target name="preSetup"></target>
-
-    <!--
-      Steps to do after setup but before starting the build proper
-    -->
-    <target name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir" />
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}" />
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}" />
-
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-            <property
-                name="dependency.properties"
-                value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties" />
-            <property
-                name="base.install.dir"
-                value="${buildRoot}" />
-        </ant>
-    </target>
-
-    <!--
-      Steps to do before fetching the build elements
-    -->
-    <target name="preFetch"></target>
-
-    <!-- ===================================================================== -->
-    <!-- Steps to do after fetching the build elements -->
-    <!-- ===================================================================== -->
-    <target name="postFetch"></target>
-
-    <!--
-      Steps to do before generating the build scripts.
-    -->
-   <target name="preGenerate"></target>
-   
-    <!--
-      Steps to do after generating the build scripts.
-    -->
-    <target name="postGenerate">
-        <echo message="buildDirectory: ${buildDirectory}" />
-        <customizeAccessRules
-            bundleDirectory="${buildDirectory}/plugins"
-            defaultRules="+org/eclipse/wst/**/*, +org/eclipse/jst/**/*" />
-    </target>
-
-
-
-    <!-- 
-      Steps to do before running the build.xmls for the elements being built.
-    -->
-    <target name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include name="**/about.mappings" />
-        </replace>
-    </target>
-
-    <!--
-      Steps to do after running the build.xmls for the elements being built.
-    -->
-    <target name="postProcess">
-        <condition property="logsAvailable">
-            <istrue value="${javacVerbose}" />
-        </condition>
-        <antcall target="gatherLogs" />
-    </target>
-
-
-        <!--
-    	Steps to do before running assemble. 
-        -->
-    <target name="preAssemble"></target>
-
-    <!--
-      Steps to do after  running assemble.
-    -->
-    <target name="postAssemble"></target>
-
-    <!--
-      Steps to do after the build is done.
-    -->
-    <target name="postBuild"></target>
-
-    <!--
-      Steps to do to test the build results
-    -->    
-    <target name="test"></target>
-
-    <!--
-      Steps to do to publish the build results
-    -->
-    <target name="publish"></target>
-
-    <!--
-      Helper targets
-    -->
-    <target
-        name="gatherLogs"
-        if="logsAvailable">
-        <mkdir dir="${buildDirectory}/${buildLabel}/compilelogs" />
-        <echo
-            level="debug"
-            message="logExtension: ${logExtension}" />
-        <antcall target="allElements">
-            <param
-                name="target"
-                value="gatherLogs" />
-            <param
-                name="logExtension"
-                value="${logExtension}" />
-        </antcall>
-        <unzip
-            dest="${buildDirectory}/${buildLabel}/compilelogs"
-            overwrite="true">
-            <fileset
-                dir="${buildDirectory}/features/org.eclipse.wst.common_sdk.feature">
-                <include name="**/*.log.zip" />
-            </fileset>
-        </unzip>
-
-
-    </target>
-
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall target="allElements">
-            <param
-                name="target"
-                value="cleanElement" />
-        </antcall>
-    </target>
-
-    <!--
-      Default target 
-    -->
-    <target name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file" />
-    </target>
-
-</project>
diff --git a/releng.wtpbuilder/components/common-sdk/dependency.xml b/releng.wtpbuilder/components/common-sdk/dependency.xml
deleted file mode 100644
index 6866693..0000000
--- a/releng.wtpbuilder/components/common-sdk/dependency.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0"?>
-<!-- ====================================================================== 
-    Properties that must be passed to this script:
-    base.install.dir
-    dependencyTargets
-    local.cache.dir
-    dependency.properties
-    
-    
-    ====================================================================== -->
-<project
-    name="test"
-    default="get">
-
-    <target name="get">
-
-        <mkdir dir="${buildDirectory}/maps/${env.RELENG}/maps" />
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="orbitthirdpartymap" />
-            <param
-                name="base.install.dir"
-                value="${buildDirectory}/maps/${env.RELENG}/maps/" />
-        </antcall>
-
-
-        <property
-            name="pde.builder.path"
-            value="${env.BASE_BUILDERS}/${eclipse.builder.version}/${eclipse.builder}" />
-        <echo
-            level="info"
-            message="pde.builder.path: ${pde.builder.path}" />
-        <echo
-            level="info"
-            message="eclipse.builder.version: ${eclipse.builder.version}" />
-        <echo
-            level="info"
-            message="eclipse.builder: ${eclipse.builder}" />
-
-
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf" />
-        </antcall>
-          <antcall target="getAndInstall">
-              <param
-                  name="groupId"
-                  value="emfxsd" />
-          </antcall>        	
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="gef" />
-        </antcall>
-
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipse" />
-        </antcall>
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipseTestFramework" />
-        </antcall>
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="dita" />
-        </antcall>
-
-
-    </target>
-
-
-    <target name="getAndInstall">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}" />
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}" />
-            <property
-                name="install.destination"
-                value="${base.install.dir}" />
-        </ant>
-    </target>
-
-</project>
-
diff --git a/releng.wtpbuilder/components/common.tests/build.properties b/releng.wtpbuilder/components/common.tests/build.properties
deleted file mode 100644
index 42b1c42..0000000
--- a/releng.wtpbuilder/components/common.tests/build.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# This is a subdirectory of $buildDirectory
-# Set collectingFolder and archivePrefix to . if you want to create archives without
-# trailing eclipse in the paths of the included files
-collectingFolder=eclipse
-logExtension=.xml
-# The prefix that will be used in the generated archive.
-# Does not make sense to use a different archivePrefix than collectingFolder, 
-# because zip wouldn't find any files to include into the target zip otherwise
-archivePrefix=eclipse
-
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-##################################################
-# Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
-javacVerbose=true
-
-sign=false
diff --git a/releng.wtpbuilder/components/common.tests/customTargets.xml b/releng.wtpbuilder/components/common.tests/customTargets.xml
deleted file mode 100644
index f349598..0000000
--- a/releng.wtpbuilder/components/common.tests/customTargets.xml
+++ /dev/null
@@ -1,282 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-
-  <!-- = = = standard properties pattern = = = 
-
-      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" />
-
-  <!-- 
-      Let users override standard properties, if desired.
-      If directory, file, or some properties do not exist,  
-      then standard properties will be used.
-  -->
-  <property
-      file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties" />
-
-  <!-- let this project specify properties, if not already set -->
-  <property file="build.properties" />
-
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set" />
-    <echo message="buildDirectory: ${buildDirectory}" />
-
-    <!-- 
-        Run a given ${target} on all elements being built
-        Add on <ant> task for each top level element being built.
-    -->
-    <target name="allElements">
-        <echo
-            level="info"
-            message="Target:${target} " />
-        <echo
-            level="debug"
-            message="basedir: ${basedir}" />
-        <echo
-            level="info"
-            message="component: ${component}" />
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}" />
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}" />
-        <echo
-            level="debug"
-            message="generic target: ${genericTargets}" />
-      <echo
-          message="compilerArg: ${compilerArg}" />
-      <echo
-          message="individualSourceBundles: ${individualSourceBundles}" />
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature" />
-            <property
-                name="id"
-                value="org.eclipse.wst.common.tests" />
-        </ant>
-    </target>
-
-    <!-- 
-        Targets to assemble the built elements for particular configurations  
-        These generally call the generated assemble scripts (named in 
-        ${assembleScriptName}) but may also add pre and post processing 
-        Add one target for each root element and each configuration 
-    -->
-
-    <target name="assemble.org.eclipse.wst.common.tests">
-        <property
-            name="archiveName"
-            value="wtp-common-Automated-Tests-${buildLabel}.zip" />
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}" />
-
-    </target>
-
-    <target name="prePackage" />
-
-
-    <target name="postPackage">
-
-        <property
-            name="archiveName"
-            value="wtp-common-Automated-Tests-${buildLabel}.zip" />
-
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}" />
-            <property
-                name="buildLabel"
-                value="${buildLabel}" />
-            <property
-                name="archiveName"
-                value="${archiveName}" />
-        </ant>
-
-    </target>
-
-        <!--
-        Check out map files from repository
-        -->
-    <target name="getMapFiles">
-
-        <!-- for now, get all, at once. May componetize later. -->
-
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="fetchAllMaps" />
-
-    </target>
-
-
-    <!-- 
-        Steps to do before setup
-    -->
-    <target name="preSetup"></target>
-
-    <!--
-      Steps to do after setup but before starting the build proper
-    -->
-    <target name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir" />
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}" />
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}" />
-
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-            <property
-                name="dependency.properties"
-                value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties" />
-            <property
-                name="base.install.dir"
-                value="${buildRoot}" />
-        </ant>
-
-    </target>
-
-    <!--
-      Steps to do before fetching the build elements
-    -->
-    <target name="preFetch"></target>
-
-    <!-- ===================================================================== -->
-    <!-- Steps to do after fetching the build elements -->
-    <!-- ===================================================================== -->
-    <target name="postFetch"></target>
-
-    <!--
-      Steps to do before generating the build scripts.
-    -->
-   <target name="preGenerate"></target>
-   
-    <!--
-      Steps to do after generating the build scripts.
-    -->
-    <target name="postGenerate">
-        <echo message="buildDirectory: ${buildDirectory}" />
-        <customizeAccessRules
-            bundleDirectory="${buildDirectory}/plugins"
-            defaultRules="+org/eclipse/wst/**/*, +org/eclipse/jst/**/*" />
-    </target>
-
-
-
-    <!-- 
-      Steps to do before running the build.xmls for the elements being built.
-    -->
-    <target name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include name="**/about.mappings" />
-        </replace>
-    </target>
-
-    <!--
-      Steps to do after running the build.xmls for the elements being built.
-    -->
-    <target name="postProcess">
-        <condition property="logsAvailable">
-            <istrue value="${javacVerbose}" />
-        </condition>
-        <antcall target="gatherLogs" />
-    </target>
-
-
-        <!--
-    	Steps to do before running assemble. 
-        -->
-    <target name="preAssemble"></target>
-
-    <!--
-      Steps to do after  running assemble.
-    -->
-    <target name="postAssemble"></target>
-
-    <!--
-      Steps to do after the build is done.
-    -->
-    <target name="postBuild"></target>
-
-    <!--
-      Steps to do to test the build results
-    -->    
-    <target name="test"></target>
-
-    <!--
-      Steps to do to publish the build results
-    -->
-    <target name="publish"></target>
-
-    <!--
-      Helper targets
-    -->
-    <target
-        name="gatherLogs"
-        if="logsAvailable">
-        <mkdir dir="${buildDirectory}/${buildLabel}/testcompilelogs" />
-        <echo
-            level="debug"
-            message="logExtension: ${logExtension}" />
-        <antcall target="allElements">
-            <param
-                name="target"
-                value="gatherLogs" />
-            <param
-                name="logExtension"
-                value="${logExtension}" />
-        </antcall>
-        <unzip
-            dest="${buildDirectory}/${buildLabel}/testcompilelogs"
-            overwrite="true">
-            <fileset
-                dir="${buildDirectory}/features/org.eclipse.wst.common.tests">
-                <include name="**/*.log.zip" />
-            </fileset>
-        </unzip>
-
-
-
-    </target>
-
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall target="allElements">
-            <param
-                name="target"
-                value="cleanElement" />
-        </antcall>
-    </target>
-
-    <!--
-      Default target 
-    -->
-    <target name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file" />
-    </target>
-
-</project>
diff --git a/releng.wtpbuilder/components/common.tests/dependency.xml b/releng.wtpbuilder/components/common.tests/dependency.xml
deleted file mode 100644
index b851249..0000000
--- a/releng.wtpbuilder/components/common.tests/dependency.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0"?>
-<!-- ====================================================================== 
-    Properties that must be passed to this script:
-    base.install.dir
-    dependencyTargets
-    local.cache.dir
-    dependency.properties
-    
-    
-    ====================================================================== -->
-<project
-    name="test"
-    default="get">
-
-    <target name="get">
-
-
-        <mkdir dir="${buildDirectory}/maps/${env.RELENG}/maps" />
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="orbitthirdpartymap" />
-            <param
-                name="base.install.dir"
-                value="${buildDirectory}/maps/${env.RELENG}/maps/" />
-        </antcall>
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf" />
-        </antcall>
-                  <antcall target="getAndInstall">
-                      <param
-                          name="groupId"
-                          value="emfxsd" />
-                  </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="eclipse" />
-        </antcall>
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipseTestFramework" />
-        </antcall>
-
-    </target>
-
-
-    <target name="getAndInstall">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}" />
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}" />
-            <property
-                name="install.destination"
-                value="${base.install.dir}" />
-        </ant>
-    </target>
-
-
-
-
-</project>
-
diff --git a/releng.wtpbuilder/components/common/build.properties b/releng.wtpbuilder/components/common/build.properties
deleted file mode 100644
index 99b50ed..0000000
--- a/releng.wtpbuilder/components/common/build.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# This is a subdirectory of $buildDirectory
-# Set collectingFolder and archivePrefix to . if you want to create archives without
-# trailing eclipse in the paths of the included files
-collectingFolder=eclipse
-logExtension=.xml
-# The prefix that will be used in the generated archive.
-# Does not make sense to use a different archivePrefix than collectingFolder, 
-# because zip wouldn't find any files to include into the target zip otherwise
-archivePrefix=eclipse
-
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-##################################################
-# Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
-javacVerbose=true
-
-sign=true
diff --git a/releng.wtpbuilder/components/common/customTargets.xml b/releng.wtpbuilder/components/common/customTargets.xml
deleted file mode 100644
index edf82cd..0000000
--- a/releng.wtpbuilder/components/common/customTargets.xml
+++ /dev/null
@@ -1,278 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-
-  <!-- = = = standard properties pattern = = = 
-
-      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" />
-
-  <!-- 
-      Let users override standard properties, if desired.
-      If directory, file, or some properties do not exist,  
-      then standard properties will be used.
-  -->
-  <property
-      file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties" />
-
-  <!-- let this project specify properties, if not already set -->
-  <property file="build.properties" />
-
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set" />
-    <echo message="buildDirectory: ${buildDirectory}" />
-
-    <!-- 
-        Run a given ${target} on all elements being built
-        Add on <ant> task for each top level element being built.
-    -->
-    <target name="allElements">
-        <echo
-            level="info"
-            message="Target:${target} " />
-        <echo
-            level="debug"
-            message="basedir: ${basedir}" />
-        <echo
-            level="info"
-            message="component: ${component}" />
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}" />
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}" />
-        <echo
-            level="debug"
-            message="generic target: ${genericTargets}" />
-      <echo
-          message="compilerArg: ${compilerArg}" />
-      <echo
-          message="individualSourceBundles: ${individualSourceBundles}" />
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature" />
-            <property
-                name="id"
-                value="org.eclipse.wst.common_ui.feature" />
-        </ant>
-    </target>
-
-    <!-- 
-        Targets to assemble the built elements for particular configurations  
-        These generally call the generated assemble scripts (named in 
-        ${assembleScriptName}) but may also add pre and post processing 
-        Add one target for each root element and each configuration 
-    -->
-
-    <target name="assemble.org.eclipse.wst.common_ui.feature">
-        <property
-            name="archiveName"
-            value="wtp-common-${buildLabel}.zip" />
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}" />
-
-    </target>
-
-    <target name="prePackage" />
-
-    <target name="postPackage">
-
-        <property
-            name="archiveName"
-            value="wtp-common-${buildLabel}.zip" />
-
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}" />
-            <property
-                name="buildLabel"
-                value="${buildLabel}" />
-            <property
-                name="archiveName"
-                value="${archiveName}" />
-        </ant>
-
-    </target>
-
-    <!-- 
-        Check out map files from repository
-    -->
-    <target name="getMapFiles">
-
-        <!-- for now, get all, at once. May componetize later. -->
-
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="fetchAllMaps" />
-
-    </target>
-
-
-    <!-- 
-        Steps to do before setup
-    -->
-    <target name="preSetup"></target>
-
-    <!--
-      Steps to do after setup but before starting the build proper
-    -->
-    <target name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir" />
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}" />
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}" />
-
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-            <property
-                name="dependency.properties"
-                value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties" />
-            <property
-                name="base.install.dir"
-                value="${buildRoot}" />
-        </ant>
-    </target>
-
-    <!--
-      Steps to do before fetching the build elements
-    -->
-    <target name="preFetch"></target>
-
-    <!-- 
-      Steps to do after fetching the build elements
-    -->
-    <target name="postFetch"></target>
-
-    <!--
-      Steps to do before generating the build scripts.
-    -->
-   <target name="preGenerate"></target>
-   
-    <!--
-      Steps to do after generating the build scripts.
-    -->
-    <target name="postGenerate">
-        <echo message="buildDirectory: ${buildDirectory}" />
-        <customizeAccessRules
-            bundleDirectory="${buildDirectory}/plugins"
-            defaultRules="+org/eclipse/wst/**/*, +org/eclipse/jst/**/*" />
-    </target>
-
-
-
-    <!-- 
-      Steps to do before running the build.xmls for the elements being built.
-    -->
-    <target name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include name="**/about.mappings" />
-        </replace>
-    </target>
-
-    <!--
-      Steps to do after running the build.xmls for the elements being built.
-    -->
-    <target name="postProcess">
-        <condition property="logsAvailable">
-            <istrue value="${javacVerbose}" />
-        </condition>
-        <antcall target="gatherLogs" />
-    </target>
-
-
-    <!--
-    	Steps to do before running assemble. 
-    -->
-    <target name="preAssemble"></target>
-
-    <!--
-      Steps to do after  running assemble.
-    -->
-    <target name="postAssemble"></target>
-
-    <!--
-      Steps to do after the build is done.
-    -->
-    <target name="postBuild"></target>
-
-    <!--
-      Steps to do to test the build results
-    -->    
-    <target name="test"></target>
-
-    <!--
-      Steps to do to publish the build results
-    -->
-    <target name="publish"></target>
-
-    <!--
-      Helper targets
-    -->
-    <target
-        name="gatherLogs"
-        if="logsAvailable">
-        <mkdir dir="${buildDirectory}/${buildLabel}/compilelogs" />
-        <echo
-            level="debug"
-            message="logExtension: ${logExtension}" />
-        <antcall target="allElements">
-            <param
-                name="target"
-                value="gatherLogs" />
-            <param
-                name="logExtension"
-                value="${logExtension}" />
-        </antcall>
-        <unzip
-            dest="${buildDirectory}/${buildLabel}/compilelogs"
-            overwrite="true">
-            <fileset 
-                dir="${buildDirectory}/features/org.eclipse.wst.common_ui.feature">
-                <include name="**/*.log.zip" />
-            </fileset>
-        </unzip>
-
-    </target>
-
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall target="allElements">
-            <param
-                name="target"
-                value="cleanElement" />
-        </antcall>
-    </target>
-
-    <!--
-      Default target 
-    -->
-    <target name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file" />
-    </target>
-
-</project>
diff --git a/releng.wtpbuilder/components/common/dependency.xml b/releng.wtpbuilder/components/common/dependency.xml
deleted file mode 100644
index 6866693..0000000
--- a/releng.wtpbuilder/components/common/dependency.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0"?>
-<!-- ====================================================================== 
-    Properties that must be passed to this script:
-    base.install.dir
-    dependencyTargets
-    local.cache.dir
-    dependency.properties
-    
-    
-    ====================================================================== -->
-<project
-    name="test"
-    default="get">
-
-    <target name="get">
-
-        <mkdir dir="${buildDirectory}/maps/${env.RELENG}/maps" />
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="orbitthirdpartymap" />
-            <param
-                name="base.install.dir"
-                value="${buildDirectory}/maps/${env.RELENG}/maps/" />
-        </antcall>
-
-
-        <property
-            name="pde.builder.path"
-            value="${env.BASE_BUILDERS}/${eclipse.builder.version}/${eclipse.builder}" />
-        <echo
-            level="info"
-            message="pde.builder.path: ${pde.builder.path}" />
-        <echo
-            level="info"
-            message="eclipse.builder.version: ${eclipse.builder.version}" />
-        <echo
-            level="info"
-            message="eclipse.builder: ${eclipse.builder}" />
-
-
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf" />
-        </antcall>
-          <antcall target="getAndInstall">
-              <param
-                  name="groupId"
-                  value="emfxsd" />
-          </antcall>        	
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="gef" />
-        </antcall>
-
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipse" />
-        </antcall>
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipseTestFramework" />
-        </antcall>
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="dita" />
-        </antcall>
-
-
-    </target>
-
-
-    <target name="getAndInstall">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}" />
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}" />
-            <property
-                name="install.destination"
-                value="${base.install.dir}" />
-        </ant>
-    </target>
-
-</project>
-
diff --git a/releng.wtpbuilder/components/dali-sdk/build.properties b/releng.wtpbuilder/components/dali-sdk/build.properties
deleted file mode 100644
index 2020236..0000000
--- a/releng.wtpbuilder/components/dali-sdk/build.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 Oracle.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     Oracle - initial API and implementation
-###############################################################################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# This is a subdirectory of $buildDirectory
-# Set collectingFolder and archivePrefix to . if you want to create archives without
-# trailing eclipse in the paths of the included files
-collectingFolder=eclipse
-
-# The prefix that will be used in the generated archive. 
-# Does not make sense to use a different archivePrefix than collectingFolder, 
-# because zip wouldn't find any files to include into the target zip otherwise
-archivePrefix=eclipse
-
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-logExtension=.xml
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-##################################################
-# Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
-javacVerbose=true
-
-sign=true
diff --git a/releng.wtpbuilder/components/dali-sdk/customTargets.xml b/releng.wtpbuilder/components/dali-sdk/customTargets.xml
deleted file mode 100644
index fb7cc0b..0000000
--- a/releng.wtpbuilder/components/dali-sdk/customTargets.xml
+++ /dev/null
@@ -1,355 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-    <!--
-        = = = standard properties pattern = = = 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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- let this project specify properties, if not already set -->
-    <property
-        file="build.properties"/>
-    <fail
-        message="dependency.properties must be specified by distribution script"
-        unless="dependency.properties"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set"/>
-    <echo
-        message="buildDirectory: ${buildDirectory}"/>
-    <!--
-        Run a given ${target} on all elements being built Add on <ant>
-        task for each top level element being built.
-    -->
-    <target
-        name="allElements">
-        <echo
-            level="info"
-            message="Target:${target} "/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="info"
-            message="component: ${component}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}"/>
-        <echo
-            level="debug"
-            message="generic target: ${genericTargets}"/>
-        <echo
-            message="compilerArg: ${compilerArg}"/>
-        <echo
-            message="individualSourceBundles: ${individualSourceBundles}"/>
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature"/>
-            <property
-                name="id"
-                value="org.eclipse.jpt_sdk.assembly.feature"/>
-        </ant>
-    </target>
-    <!--
-        Targets to assemble the built elements for particular
-        configurations These generally call the generated assemble
-        scripts (named in ${assembleScriptName}) but may also add pre
-        and post processing Add one target for each root element and
-        each configuration
-    -->
-    <target
-        name="assemble.org.eclipse.jpt_sdk.assembly.feature">
-        <property
-            name="archiveName"
-            value="wtp-jpt-sdk-${buildLabel}.zip"/>
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}"/>
-    </target>
-    <target
-        name="prePackage"/>
-    <target
-        name="postPackage">
-        <property
-            name="archiveName"
-            value="wtp-jpt-sdk-${buildLabel}.zip"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-            <property
-                name="buildLabel"
-                value="${buildLabel}"/>
-            <property
-                name="archiveName"
-                value="${archiveName}"/>
-        </ant>
-    </target>
-
-    <!-- 
-        Check out map files from repository
-        -->
-    <target
-        name="getMapFiles">
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENG}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENGDALI}"/>
-            <property
-                name="mapTag"
-                value="${releng.dali-mapVersionTag}"/>
-        </ant>
-    </target>
-
-
-    <!-- 
-        Steps to do before setup
-    -->
-    <target
-        name="preSetup"></target>
-    <!--
-        Steps to do after setup but before starting the build proper
-    -->
-    <target
-        name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}"/>
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}"/>
-
-        <!-- Get the dependencies -->
-        <antcall
-            target="getDependencies"/>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Get the dependencies based on releng maps -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="getDependencies">
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-            <property
-                name="base.install.dir"
-                value="${buildRoot}"/>
-        </ant>
-    </target>
-
-    <!--
-      Steps to do before fetching the build elements
-    -->
-    <target
-        name="preFetch"></target>
-
-    <!-- 
-      Steps to do after fetching the build elements
-    -->
-    <target
-        name="postFetch"></target>
-
-    <!--
-      Steps to do before generating the build scripts.
-    -->
-    <target
-        name="preGenerate"></target>
-
-    <!--
-      Steps to do after generating the build scripts.
-    -->
-    <target
-        name="postGenerate">
-        <echo
-            message="buildDirectory: ${buildDirectory}"/>
-        <customizeAccessRules
-            bundleDirectory="${buildDirectory}/plugins"
-            defaultRules="+org/eclipse/wst/**/*, +org/eclipse/jst/**/*"/>
-    </target>
-    <!--
-        Steps to do before running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include
-                name="**/about.mappings"/>
-        </replace>
-    </target>
-    <!--
-        Steps to do after running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="postProcess">
-        <condition
-            property="logsAvailable">
-            <istrue
-                value="${javacVerbose}"/>
-        </condition>
-        <antcall
-            target="gatherLogs"/>
-    </target>
-
-
-    <!--
-    	Steps to do before running assemble. 
-    -->
-    <target
-        name="preAssemble"></target>
-
-    <!--
-      Steps to do after  running assemble.
-    -->
-    <target
-        name="postAssemble"></target>
-
-    <!--
-      Steps to do after the build is done.
-    -->
-    <target
-        name="postBuild"></target>
-
-    <!--
-      Steps to do to test the build results
-    -->
-    <target
-        name="test"></target>
-
-    <!--
-      Steps to do to publish the build results
-    -->
-    <target
-        name="publish"></target>
-
-    <!--
-      Helper targets
-    -->
-    <target
-        name="gatherLogs"
-        if="logsAvailable">
-        <mkdir
-            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
-        <echo
-            level="debug"
-            message="logExtension: ${logExtension}"/>
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="gatherLogs"/>
-            <param
-                name="logExtension"
-                value="${logExtension}"/>
-        </antcall>
-        <unzip
-            dest="${buildDirectory}/${buildLabel}/compilelogs"
-            overwrite="true">
-            <fileset
-                dir="${buildDirectory}/features/org.eclipse.jpt_sdk.assembly.feature">
-                <include
-                    name="**/*.log.zip"/>
-            </fileset>
-        </unzip>
-    	
-       <!--
-           workaround: see
-           https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-           https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-           https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-       -->
-       <copy
-           todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
-           overwrite="true">
-           <!--
-               we want all @dot.xml files, but assumes a certain
-               structure, to include directory for name of plugin
-           -->
-           <fileset
-               dir="${buildDirectory}/features/">
-               <include
-                   name="**/feature.temp.folder/"/>
-               <exclude
-                   name="**/*tests*feature*/feature.temp.folder/" />
-                    
-           </fileset>
-           <compositemapper>
-               <mapper
-                   type="regexp"
-                   from="(.*)/plugins/(.*)/@dot.xml"
-                   to="/\2/@dot.xml"/>
-               <mapper
-                   type="regexp"
-                   from="(.*)/plugins/(.*)/(.*)bin.xml"
-                   to="/\2/\3bin.xml"/>
-           </compositemapper>
-       </copy>
-
-    	
-    </target>
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="cleanElement"/>
-        </antcall>
-    </target>
-
-    <!--
-      Default target 
-    -->
-    <target
-        name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/dali-sdk/dependency.xml b/releng.wtpbuilder/components/dali-sdk/dependency.xml
deleted file mode 100644
index 36efd1c..0000000
--- a/releng.wtpbuilder/components/dali-sdk/dependency.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-
-    <target
-        name="get">
-        
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined
-        -->
-        <property
-            file="${dependency.properties}"/>
-            
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </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="eclipse"/>
-        </antcall>
-       <antcall
-           target="getAndInstall">
-           <param
-               name="groupId"
-               value="wst"/>
-       </antcall>           
-
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="jst"/>
-        </antcall>
-
-
-    </target>
-
-    <target name="getAndInstall" if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-
-</project>
-
diff --git a/releng.wtpbuilder/components/dali.tests/build.properties b/releng.wtpbuilder/components/dali.tests/build.properties
deleted file mode 100644
index e98e7b2..0000000
--- a/releng.wtpbuilder/components/dali.tests/build.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     Oracle Corporation - initial API and implementation
-###############################################################################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# This is a subdirectory of $buildDirectory
-# Set collectingFolder and archivePrefix to . if you want to create archives without
-# trailing eclipse in the paths of the included files
-collectingFolder=eclipse
-
-# The prefix that will be used in the generated archive.
-# Does not make sense to use a different archivePrefix than collectingFolder, 
-# because zip wouldn't find any files to include into the target zip otherwise
-archivePrefix=eclipse
-logExtension=.xml
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-##################################################
-# Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
-javacVerbose=true
-
-sign=false
diff --git a/releng.wtpbuilder/components/dali.tests/customTargets.xml b/releng.wtpbuilder/components/dali.tests/customTargets.xml
deleted file mode 100644
index fc6f5a0..0000000
--- a/releng.wtpbuilder/components/dali.tests/customTargets.xml
+++ /dev/null
@@ -1,359 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-    <!--
-        = = = standard properties pattern = = = 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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- let this project specify properties, if not already set -->
-    <property
-        file="build.properties"/>
-    <fail
-        message="dependency.properties must be specified by distribution script"
-        unless="dependency.properties"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set"/>
-    <echo
-        message="buildDirectory: ${buildDirectory}"/>
-    <!--
-        Run a given ${target} on all elements being built Add on <ant>
-        task for each top level element being built.
-    -->
-    <target
-        name="allElements">
-        <echo
-            level="info"
-            message="Target: ${target} "/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="info"
-            message="component: ${component}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}"/>
-        <echo
-            level="debug"
-            message="generic target: ${genericTargets}"/>
-        <echo
-            message="compilerArg: ${compilerArg}"/>
-        <echo
-            message="individualSourceBundles: ${individualSourceBundles}"/>
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature"/>
-            <property
-                name="id"
-                value="org.eclipse.jpt.tests.assembly.feature"/>
-        </ant>
-    </target>
-    <!--
-        Targets to assemble the built elements for particular
-        configurations These generally call the generated assemble
-        scripts (named in ${assembleScriptName}) but may also add pre
-        and post processing Add one target for each root element and
-        each configuration
-    -->
-    <target
-        name="assemble.org.eclipse.jpt.tests.assembly.feature">
-        <property
-            name="archiveName"
-            value="wtp-jpt-Automated-Tests-${buildLabel}.zip"/>
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}"/>
-    </target>
-    <target
-        name="prePackage"/>
-    <target
-        name="postPackage">
-        <property
-            name="archiveName"
-            value="wtp-jpt-Automated-Tests-${buildLabel}.zip"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-            <property
-                name="buildLabel"
-                value="${buildLabel}"/>
-            <property
-                name="archiveName"
-                value="${archiveName}"/>
-        </ant>
-    </target>
-
-    <!-- 
-        Check out map files from repository
-        -->
-    <target
-        name="getMapFiles">
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENG}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENGDALI}"/>
-            <property
-                name="mapTag"
-                value="${releng.dali-mapVersionTag}"/>
-        </ant>
-    </target>
-
-    <!-- 
-        Steps to do before setup
-    -->
-    <target
-        name="preSetup"></target>
-    <!--
-        Steps to do after setup but before starting the build proper
-    -->
-    <target
-        name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}"/>
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}"/>
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-            <property
-                name="base.install.dir"
-                value="${buildRoot}"/>
-        </ant>
-        <!--fetch the additional pieces to build tests -->
-        <property
-            name="featureOnly"
-            value="false"/>
-        <property
-            name="featureAndPlugins"
-            value="true"/>
-        <property
-            name="featuresRecursively"
-            value="true"/>
-        <ant
-            antfile="${genericTargets}"
-            dir="${pde.build.scripts}"
-            target="fetchElement">
-            <property
-                name="type"
-                value="feature"/>
-            <property
-                name="id"
-                value="org.eclipse.jpt.feature"/>
-        </ant>
-    </target>
-
-    <!--
-      Steps to do before fetching the build elements
-    -->
-    <target
-        name="preFetch"></target>
-
-    <!-- 
-      Steps to do after fetching the build elements
-    -->
-    <target
-        name="postFetch"></target>
-
-    <!--
-      Steps to do before generating the build scripts.
-    -->
-    <target
-        name="preGenerate"></target>
-
-    <!--
-      Steps to do after generating the build scripts.
-    -->
-    <target
-        name="postGenerate">
-        <echo
-            message="buildDirectory: ${buildDirectory}"/>
-        <customizeAccessRules
-            bundleDirectory="${buildDirectory}/plugins"
-            defaultRules="+org/eclipse/wst/**/*, +org/eclipse/jst/**/*"/>
-    </target>
-    <!--
-        Steps to do before running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include
-                name="**/about.mappings"/>
-        </replace>
-    </target>
-    <!--
-        Steps to do after running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="postProcess">
-        <condition
-            property="logsAvailable">
-            <istrue
-                value="${javacVerbose}"/>
-        </condition>
-        <antcall
-            target="gatherLogs"/>
-    </target>
-
-
-    <!--
-    	Steps to do before running assemble. 
-    -->
-    <target
-        name="preAssemble"></target>
-
-    <!--
-      Steps to do after  running assemble.
-    -->
-    <target
-        name="postAssemble"></target>
-
-    <!--
-      Steps to do after the build is done.
-    -->
-    <target
-        name="postBuild"></target>
-
-
-    <!--
-      Steps to do to test the build results
-    -->
-    <target
-        name="test"
-        unless="dontRunTests">
-        <property
-            name="eclipseAutomatedTestHome"
-            value="${buildDirectory}/plugins/org.eclipse.jpt.utility.tests"/>
-        <echo
-            level="info"
-            message="Setting up tests in ${eclipseAutomatedTestHome}"/>
-        <copy
-            file="${buildDirectory}/${buildLabel}/wtp-jpt-${buildLabel}.zip"
-            tofile="${eclipseAutomatedTestHome}/eclipse-SDK-wtp-jpt-${buildLabel}.zip"/>
-        <copy
-            file="${buildDirectory}/${buildLabel}/wtp-jpt-Automated-Tests-${buildLabel}.zip"
-            tofile="${eclipseAutomatedTestHome}/eclipse-junit-tests-wtp-jpt-${buildLabel}.zip"/>
-        <ant
-            antfile="${eclipseAutomatedTestHome}/test.xml"
-            target="run"
-            dir="${eclipseAutomatedTestHome}">
-            <property
-                name="os"
-                value="${baseos}"/>
-            <property
-                name="ws"
-                value="${basews}"/>
-            <property
-                name="arch"
-                value="${basearch}"/>
-            <property
-                name="eclipse-home"
-                value="${baseLocation}"/>
-        </ant>
-    </target>
-
-    <!--
-      Steps to do to publish the build results
-    -->
-    <target
-        name="publish"></target>
-
-
-    <!--
-      Helper targets
-    -->
-    <target
-        name="gatherLogs"
-        if="logsAvailable">
-        <mkdir
-            dir="${buildDirectory}/${buildLabel}/testcompilelogs"/>
-        <echo
-            level="debug"
-            message="logExtension: ${logExtension}"/>
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="gatherLogs"/>
-            <param
-                name="logExtension"
-                value="${logExtension}"/>
-        </antcall>
-        <unzip
-            dest="${buildDirectory}/${buildLabel}/testcompilelogs"
-            overwrite="true">
-            <fileset
-                dir="${buildDirectory}/features/org.eclipse.jpt.tests.assembly.feature">
-                <include
-                    name="**/*.log.zip"/>
-            </fileset>
-        </unzip>
-    </target>
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="cleanElement"/>
-        </antcall>
-    </target>
-
-    <!--
-      Default target 
-    -->
-    <target
-        name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/dali.tests/dependency.xml b/releng.wtpbuilder/components/dali.tests/dependency.xml
deleted file mode 100644
index adcdfb5..0000000
--- a/releng.wtpbuilder/components/dali.tests/dependency.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-
-
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-
-    <target
-        name="get">
-
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined
-        -->
-        <property
-            file="${dependency.properties}"/>
-
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </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="eclipse"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipseTestFramework"/>
-        </antcall>
-
-    </target>
-
-
-    <target
-        name="getAndInstall"
-        unless="skipGetAndInstall"
-        if="${groupId}.url">
-
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-
-    </target>
-
-</project>
diff --git a/releng.wtpbuilder/components/dali/build.properties b/releng.wtpbuilder/components/dali/build.properties
deleted file mode 100644
index 2020236..0000000
--- a/releng.wtpbuilder/components/dali/build.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 Oracle.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     Oracle - initial API and implementation
-###############################################################################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# This is a subdirectory of $buildDirectory
-# Set collectingFolder and archivePrefix to . if you want to create archives without
-# trailing eclipse in the paths of the included files
-collectingFolder=eclipse
-
-# The prefix that will be used in the generated archive. 
-# Does not make sense to use a different archivePrefix than collectingFolder, 
-# because zip wouldn't find any files to include into the target zip otherwise
-archivePrefix=eclipse
-
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-logExtension=.xml
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-##################################################
-# Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
-javacVerbose=true
-
-sign=true
diff --git a/releng.wtpbuilder/components/dali/customTargets.xml b/releng.wtpbuilder/components/dali/customTargets.xml
deleted file mode 100644
index e0fa488..0000000
--- a/releng.wtpbuilder/components/dali/customTargets.xml
+++ /dev/null
@@ -1,320 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-    <!--
-        = = = standard properties pattern = = = 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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- let this project specify properties, if not already set -->
-    <property
-        file="build.properties"/>
-    <fail
-        message="dependency.properties must be specified by distribution script"
-        unless="dependency.properties"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set"/>
-    <echo
-        message="buildDirectory: ${buildDirectory}"/>
-    <!--
-        Run a given ${target} on all elements being built Add on <ant>
-        task for each top level element being built.
-    -->
-    <target
-        name="allElements">
-        <echo
-            level="info"
-            message="Target: ${target} "/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="info"
-            message="component: ${component}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}"/>
-        <echo
-            level="debug"
-            message="generic target: ${genericTargets}"/>
-        <echo
-            message="compilerArg: ${compilerArg}"/>
-        <echo
-            message="individualSourceBundles: ${individualSourceBundles}"/>
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature"/>
-            <property
-                name="id"
-                value="org.eclipse.jpt.assembly.feature"/>
-        </ant>
-    </target>
-    <!--
-        Targets to assemble the built elements for particular
-        configurations These generally call the generated assemble
-        scripts (named in ${assembleScriptName}) but may also add pre
-        and post processing Add one target for each root element and
-        each configuration
-    -->
-    <target
-        name="assemble.org.eclipse.jpt.assembly.feature">
-        <property
-            name="archiveName"
-            value="wtp-jpt-${buildLabel}.zip"/>
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}"/>
-    </target>
-    <target
-        name="prePackage"/>
-    <target
-        name="postPackage">
-        <property
-            name="archiveName"
-            value="wtp-jpt-${buildLabel}.zip"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-            <property
-                name="buildLabel"
-                value="${buildLabel}"/>
-            <property
-                name="archiveName"
-                value="${archiveName}"/>
-        </ant>
-    </target>
-
-    <!-- 
-        Check out map files from repository
-    -->
-    <target
-        name="getMapFiles">
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENG}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENGDALI}"/>
-            <property
-                name="mapTag"
-                value="${releng.dali-mapVersionTag}"/>
-        </ant>
-    </target>
-
-
-    <!-- 
-        Steps to do before setup
-    -->
-    <target
-        name="preSetup"></target>
-    <!--
-        Steps to do after setup but before starting the build proper
-    -->
-    <target
-        name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}"/>
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}"/>
-
-        <!-- Get the dependencies -->
-        <antcall
-            target="getDependencies"/>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Get the dependencies based on releng maps -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="getDependencies">
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-            <property
-                name="base.install.dir"
-                value="${buildRoot}"/>
-        </ant>
-    </target>
-
-    <!--
-      Steps to do before fetching the build elements
-    -->
-    <target
-        name="preFetch"></target>
-
-    <!-- 
-      Steps to do after fetching the build elements
-    -->
-    <target
-        name="postFetch"></target>
-
-    <!--
-      Steps to do before generating the build scripts.
-    -->
-    <target
-        name="preGenerate"></target>
-
-    <!--
-      Steps to do after generating the build scripts.
-    -->
-    <target
-        name="postGenerate">
-        <echo
-            message="buildDirectory: ${buildDirectory}"/>
-        <customizeAccessRules
-            bundleDirectory="${buildDirectory}/plugins"
-            defaultRules="+org/eclipse/wst/**/*, +org/eclipse/jst/**/*"/>
-    </target>
-    <!--
-        Steps to do before running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include
-                name="**/about.mappings"/>
-        </replace>
-    </target>
-    <!--
-        Steps to do after running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="postProcess">
-        <condition
-            property="logsAvailable">
-            <istrue
-                value="${javacVerbose}"/>
-        </condition>
-        <antcall
-            target="gatherLogs"/>
-    </target>
-
-
-    <!--
-    	Steps to do before running assemble. 
-    -->
-    <target
-        name="preAssemble"></target>
-
-    <!--
-      Steps to do after  running assemble.
-    -->
-    <target
-        name="postAssemble"></target>
-
-    <!--
-      Steps to do after the build is done.
-    -->
-    <target
-        name="postBuild"></target>
-
-    <!--
-      Steps to do to test the build results
-    -->
-    <target
-        name="test"></target>
-
-    <!--
-      Steps to do to publish the build results
-    -->
-    <target
-        name="publish"></target>
-
-    <!--
-      Helper targets
-    -->
-    <target
-        name="gatherLogs"
-        if="logsAvailable">
-        <mkdir
-            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
-        <echo
-            level="debug"
-            message="logExtension: ${logExtension}"/>
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="gatherLogs"/>
-            <param
-                name="logExtension"
-                value="${logExtension}"/>
-        </antcall>
-        <unzip
-            dest="${buildDirectory}/${buildLabel}/compilelogs"
-            overwrite="true">
-            <fileset
-                dir="${buildDirectory}/features/org.eclipse.jpt.assembly.feature">
-                <include
-                    name="**/*.log.zip"/>
-            </fileset>
-        </unzip>
-    </target>
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="cleanElement"/>
-        </antcall>
-    </target>
-
-    <!--
-      Default target 
-    -->
-    <target
-        name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/dali/dependency.xml b/releng.wtpbuilder/components/dali/dependency.xml
deleted file mode 100644
index a7b970a..0000000
--- a/releng.wtpbuilder/components/dali/dependency.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-
-    <target
-        name="get">
-
-        <!-- read in this properties, just so we can make sure our requested pre-reqs are defined -->
-        <property 
-            file="${dependency.properties}"/>
-
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </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="eclipse"/>
-        </antcall>
-       <antcall
-           target="getAndInstall">
-           <param
-               name="groupId"
-               value="wst"/>
-       </antcall>    	
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="jst"/>
-        </antcall>
-    </target>
-
-    <target name="getAndInstall" if="${groupId}.url">
-
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-
-</project>
-
diff --git a/releng.wtpbuilder/components/jaxws/build.properties b/releng.wtpbuilder/components/jaxws/build.properties
deleted file mode 100644
index 5bed879..0000000
--- a/releng.wtpbuilder/components/jaxws/build.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# This is a subdirectory of $buildDirectory
-# Set collectingFolder and archivePrefix to . if you want to create archives without
-# trailing eclipse in the paths of the included files
-collectingFolder=eclipse
-logExtension=.xml
-# The prefix that will be used in the generated archive.
-# Does not make sense to use a different archivePrefix than collectingFolder, 
-# because zip wouldn't find any files to include into the target zip otherwise
-archivePrefix=eclipse
-
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-##################################################
-# Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
-javacVerbose=true
-
-sign=true
-
-#############################################################
-
-# Properties introduced in 3.5 M3 (PDE base builder R35_M2). See
-# http://aniefer.blogspot.com/2008/10/sorting-bundles-and-parallel.html
-
-flattenDependencies=true
-parallelCompilation=true
-
-
diff --git a/releng.wtpbuilder/components/jaxws/customTargets.xml b/releng.wtpbuilder/components/jaxws/customTargets.xml
deleted file mode 100644
index fa2fd36..0000000
--- a/releng.wtpbuilder/components/jaxws/customTargets.xml
+++ /dev/null
@@ -1,356 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-    <!--
-        = = = standard properties pattern = = = 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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- let this project specify properties, if not already set -->
-    <property
-        file="build.properties"/>
-    <fail
-        message="dependency.properties must be specified by distribution script"
-        unless="dependency.properties"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set"/>
-    <echo
-        message="buildDirectory: ${buildDirectory}"/>
-    <!--
-        Run a given ${target} on all elements being built Add on <ant>
-        task for each top level element being built.
-    -->
-    <target
-        name="allElements">
-        <echo
-            level="info"
-            message="Target:${target} "/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="info"
-            message="component: ${component}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}"/>
-        <echo
-            level="debug"
-            message="generic target: ${genericTargets}"/>
-        <echo
-            message="compilerArg: ${compilerArg}"/>
-        <echo
-            message="individualSourceBundles: ${individualSourceBundles}"/>
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature"/>
-            <property
-                name="id"
-                value="org.eclipse.jst.ws.jaxws.assembly.feature"/>
-        </ant>
-    </target>
-    <!--
-        Targets to assemble the built elements for particular
-        configurations These generally call the generated assemble
-        scripts (named in ${assembleScriptName}) but may also add pre
-        and post processing Add one target for each root element and
-        each configuration
-    -->
-    <target
-        name="assemble.org.eclipse.jst.ws.jaxws.assembly.feature">
-        <property
-            name="archiveName"
-            value="wtp-incubator-jaxws-${buildLabel}.zip"/>
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}"/>
-    </target>
-    <target
-        name="prePackage"/>
-    <target
-        name="postPackage">
-        <property
-            name="archiveName"
-            value="wtp-incubator-jaxws-${buildLabel}.zip"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-            <property
-                name="buildLabel"
-                value="${buildLabel}"/>
-            <property
-                name="archiveName"
-                value="${archiveName}"/>
-        </ant>
-    </target>
-
-    <!-- 
-        Check out map files from repository
-    -->
-    <target
-        name="getMapFiles">
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENG}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENGJAXWS}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-    </target>
-
-
-    <!-- 
-        Steps to do before setup
-    -->
-    <target
-        name="preSetup"></target>
-    <!--
-        Steps to do after setup but before starting the build proper
-    -->
-    <target
-        name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}"/>
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}"/>
-
-        <!-- Get the dependencies -->
-        <antcall
-            target="getDependencies"/>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Get the dependencies based on releng maps -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="getDependencies">
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-            <property
-                name="base.install.dir"
-                value="${buildRoot}"/>
-        </ant>
-    </target>
-
-    <!--
-      Steps to do before fetching the build elements
-    -->
-    <target
-        name="preFetch"></target>
-
-    <!-- 
-      Steps to do after fetching the build elements
-    -->
-    <target
-        name="postFetch"></target>
-
-    <!--
-      Steps to do before generating the build scripts.
-    -->
-    <target
-        name="preGenerate"></target>
-
-    <!--
-      Steps to do after generating the build scripts.
-    -->
-    <target
-        name="postGenerate">
-        <echo
-            message="buildDirectory: ${buildDirectory}"/>
-        <customizeAccessRules
-            bundleDirectory="${buildDirectory}/plugins"/>
-    </target>
-    <!--
-        Steps to do before running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include
-                name="**/about.mappings"/>
-        </replace>
-    </target>
-    <!--
-        Steps to do after running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="postProcess">
-        <condition
-            property="logsAvailable">
-            <istrue
-                value="${javacVerbose}"/>
-        </condition>
-        <antcall
-            target="gatherLogs"/>
-    </target>
-
-
-    <!--
-      Steps to do before running assemble. 
-    -->
-    <target
-        name="preAssemble"></target>
-
-    <!--
-      Steps to do after  running assemble.
-    -->
-    <target
-        name="postAssemble"></target>
-
-    <!--
-      Steps to do after the build is done.
-    -->
-    <target
-        name="postBuild"></target>
-
-    <!--
-      Steps to do to test the build results
-    -->
-    <target
-        name="test"></target>
-
-    <!--
-      Steps to do to publish the build results
-    -->
-    <target
-        name="publish"></target>
-
-    <!--
-      Helper targets
-    -->
-	    <target
-	        name="gatherLogs"
-	        if="logsAvailable">
-	        <mkdir
-	            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
-	        <echo
-	            level="debug"
-	            message="logExtension: ${logExtension}"/>
-	        <antcall
-	            target="allElements">
-	            <param
-	                name="target"
-	                value="gatherLogs"/>
-	            <param
-	                name="logExtension"
-	                value="${logExtension}"/>
-	        </antcall>
-	        <unzip
-	            dest="${buildDirectory}/${buildLabel}/compilelogs"
-	            overwrite="true">
-	            <fileset
-                dir="${buildDirectory}/features/org.eclipse.jst.ws.jaxws.assembly.feature">
-	                <include
-	                    name="**/*.log.zip"/>
-	            </fileset>
-	        </unzip>
-	        <!--
-	            TODO: it is unclear if the above "gather" and unzip do
-	            anything constructive. I think not and should be removed
-	            (after experimental run, of course.
-	        -->
-	        <!--
-	            workaround: see
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-	        -->
-	        <copy
-	            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
-	            overwrite="true">
-	            <!--
-	                we want all @dot.xml files, but assumes a certain
-	                structure, to include directory for name of plugin
-	            -->
-	            <fileset
-	                dir="${buildDirectory}/features/">
-	                <include
-	                    name="**/feature.temp.folder/"/>
-	                <exclude
-	                    name="**/*tests*feature*/feature.temp.folder/" />
-	                     
-	            </fileset>
-	            <compositemapper>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/@dot.xml"
-	                    to="/\2/@dot.xml"/>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-	                    to="/\2/\3bin.xml"/>
-	            </compositemapper>
-	        </copy>
-	    </target>
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="cleanElement"/>
-        </antcall>
-    </target>
-
-    <!--
-      Default target 
-    -->
-    <target
-        name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/jaxws/dependency.xml b/releng.wtpbuilder/components/jaxws/dependency.xml
deleted file mode 100644
index 352febe..0000000
--- a/releng.wtpbuilder/components/jaxws/dependency.xml
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-        <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-        
-    <condition
-        property="getprereq.eclipse">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.eclipseplatform">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.emf">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.emfxsd">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.emfvalidation">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.gef">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.dtp">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.wst">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.jst">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.wtp">
-        <istrue
-            value="true"/>
-    </condition>
-    <target
-        name="get">
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined, which we do later with
-            statements such if="${groupId}.url"
-        -->
-        <property
-            file="${dependency.properties}"/>
-        <antcall
-            target="prereq.eclipse"/>
-        <antcall
-            target="prereq.eclipseplatform"/>
-        <antcall
-            target="prereq.emf"/>
-        <antcall
-            target="prereq.emfxsd"/>
-        <antcall
-            target="prereq.emfvalidation"/>
-        <antcall
-            target="prereq.gef"/>
-        <antcall
-            target="prereq.dtp"/>
-        <antcall
-            target="prereq.wst"/>
-        <antcall
-            target="prereq.jst"/>
-        <antcall
-            target="prereq.wtp"/>
-    </target>
-    <target
-        name="prereq.eclipse"
-        if="getprereq.eclipse">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.eclipseplatform"
-        if="getprereq.eclipseplatform">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipseplatform"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emf"
-        if="getprereq.emf">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfxsd"
-        if="getprereq.emfxsd">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfvalidation"
-        if="getprereq.emfvalidation">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfvalidation"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.gef"
-        if="getprereq.gef">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.dtp"
-        if="getprereq.dtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="dtp"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wst"
-        if="getprereq.wst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.jst"
-        if="getprereq.jst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="jst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wtp"
-        if="getprereq.wtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstall"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/jaxws_sdk/build.properties b/releng.wtpbuilder/components/jaxws_sdk/build.properties
deleted file mode 100644
index 5bed879..0000000
--- a/releng.wtpbuilder/components/jaxws_sdk/build.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# This is a subdirectory of $buildDirectory
-# Set collectingFolder and archivePrefix to . if you want to create archives without
-# trailing eclipse in the paths of the included files
-collectingFolder=eclipse
-logExtension=.xml
-# The prefix that will be used in the generated archive.
-# Does not make sense to use a different archivePrefix than collectingFolder, 
-# because zip wouldn't find any files to include into the target zip otherwise
-archivePrefix=eclipse
-
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-##################################################
-# Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
-javacVerbose=true
-
-sign=true
-
-#############################################################
-
-# Properties introduced in 3.5 M3 (PDE base builder R35_M2). See
-# http://aniefer.blogspot.com/2008/10/sorting-bundles-and-parallel.html
-
-flattenDependencies=true
-parallelCompilation=true
-
-
diff --git a/releng.wtpbuilder/components/jaxws_sdk/customTargets.xml b/releng.wtpbuilder/components/jaxws_sdk/customTargets.xml
deleted file mode 100644
index 0cca52c..0000000
--- a/releng.wtpbuilder/components/jaxws_sdk/customTargets.xml
+++ /dev/null
@@ -1,356 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-    <!--
-        = = = standard properties pattern = = = 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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- let this project specify properties, if not already set -->
-    <property
-        file="build.properties"/>
-    <fail
-        message="dependency.properties must be specified by distribution script"
-        unless="dependency.properties"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set"/>
-    <echo
-        message="buildDirectory: ${buildDirectory}"/>
-    <!--
-        Run a given ${target} on all elements being built Add on <ant>
-        task for each top level element being built.
-    -->
-    <target
-        name="allElements">
-        <echo
-            level="info"
-            message="Target:${target} "/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="info"
-            message="component: ${component}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}"/>
-        <echo
-            level="debug"
-            message="generic target: ${genericTargets}"/>
-        <echo
-            message="compilerArg: ${compilerArg}"/>
-        <echo
-            message="individualSourceBundles: ${individualSourceBundles}"/>
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature"/>
-            <property
-                name="id"
-                value="org.eclipse.jst.ws.jaxws.assembly_sdk.feature"/>
-        </ant>
-    </target>
-    <!--
-        Targets to assemble the built elements for particular
-        configurations These generally call the generated assemble
-        scripts (named in ${assembleScriptName}) but may also add pre
-        and post processing Add one target for each root element and
-        each configuration
-    -->
-    <target
-        name="assemble.org.eclipse.jst.ws.jaxws.assembly_sdk.feature">
-        <property
-            name="archiveName"
-            value="wtp-incubator-jaxws-sdk-${buildLabel}.zip"/>
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}"/>
-    </target>
-    <target
-        name="prePackage"/>
-    <target
-        name="postPackage">
-        <property
-            name="archiveName"
-            value="wtp-incubator-jaxws-sdk-${buildLabel}.zip"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-            <property
-                name="buildLabel"
-                value="${buildLabel}"/>
-            <property
-                name="archiveName"
-                value="${archiveName}"/>
-        </ant>
-    </target>
-
-    <!--
-        Check out map files from repository
-        -->
-    <target
-        name="getMapFiles">
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENG}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENGJAXWS}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-    </target>
-
-
-    <!-- 
-        Steps to do before setup
-    -->
-    <target
-        name="preSetup"></target>
-    <!--
-        Steps to do after setup but before starting the build proper
-    -->
-    <target
-        name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}"/>
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}"/>
-
-        <!-- Get the dependencies -->
-        <antcall
-            target="getDependencies"/>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Get the dependencies based on releng maps -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="getDependencies">
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-            <property
-                name="base.install.dir"
-                value="${buildRoot}"/>
-        </ant>
-    </target>
-
-    <!--
-      Steps to do before fetching the build elements
-    -->
-    <target
-        name="preFetch"></target>
-
-    <!-- 
-      Steps to do after fetching the build elements
-    -->
-    <target
-        name="postFetch"></target>
-
-    <!--
-      Steps to do before generating the build scripts.
-    -->
-    <target
-        name="preGenerate"></target>
-
-    <!--
-      Steps to do after generating the build scripts.
-    -->
-    <target
-        name="postGenerate">
-        <echo
-            message="buildDirectory: ${buildDirectory}"/>
-        <customizeAccessRules
-            bundleDirectory="${buildDirectory}/plugins"/>
-    </target>
-    <!--
-        Steps to do before running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include
-                name="**/about.mappings"/>
-        </replace>
-    </target>
-    <!--
-        Steps to do after running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="postProcess">
-        <condition
-            property="logsAvailable">
-            <istrue
-                value="${javacVerbose}"/>
-        </condition>
-        <antcall
-            target="gatherLogs"/>
-    </target>
-
-
-    <!--
-      Steps to do before running assemble. 
-        -->
-    <target
-        name="preAssemble"></target>
-
-    <!--
-      Steps to do after  running assemble.
-    -->
-    <target
-        name="postAssemble"></target>
-
-    <!--
-      Steps to do after the build is done.
-    -->
-    <target
-        name="postBuild"></target>
-
-    <!--
-      Steps to do to test the build results
-    -->
-    <target
-        name="test"></target>
-
-    <!--
-      Steps to do to publish the build results
-    -->
-    <target
-        name="publish"></target>
-
-    <!--
-      Helper targets
-    -->
-	    <target
-	        name="gatherLogs"
-	        if="logsAvailable">
-	        <mkdir
-	            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
-	        <echo
-	            level="debug"
-	            message="logExtension: ${logExtension}"/>
-	        <antcall
-	            target="allElements">
-	            <param
-	                name="target"
-	                value="gatherLogs"/>
-	            <param
-	                name="logExtension"
-	                value="${logExtension}"/>
-	        </antcall>
-	        <unzip
-	            dest="${buildDirectory}/${buildLabel}/compilelogs"
-	            overwrite="true">
-	            <fileset
-                dir="${buildDirectory}/features/org.eclipse.jst.ws.jaxws.assembly_sdk.feature">
-	                <include
-	                    name="**/*.log.zip"/>
-	            </fileset>
-	        </unzip>
-	        <!--
-	            TODO: it is unclear if the above "gather" and unzip do
-	            anything constructive. I think not and should be removed
-	            (after experimental run, of course.
-	        -->
-	        <!--
-	            workaround: see
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-	        -->
-	        <copy
-	            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
-	            overwrite="true">
-	            <!--
-	                we want all @dot.xml files, but assumes a certain
-	                structure, to include directory for name of plugin
-	            -->
-	            <fileset
-	                dir="${buildDirectory}/features/">
-	                <include
-	                    name="**/feature.temp.folder/"/>
-	                <exclude
-	                    name="**/*tests*feature*/feature.temp.folder/" />
-	                     
-	            </fileset>
-	            <compositemapper>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/@dot.xml"
-	                    to="/\2/@dot.xml"/>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-	                    to="/\2/\3bin.xml"/>
-	            </compositemapper>
-	        </copy>
-	    </target>
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="cleanElement"/>
-        </antcall>
-    </target>
-
-    <!--
-      Default target 
-    -->
-    <target
-        name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/jaxws_sdk/dependency.xml b/releng.wtpbuilder/components/jaxws_sdk/dependency.xml
deleted file mode 100644
index fc244c0..0000000
--- a/releng.wtpbuilder/components/jaxws_sdk/dependency.xml
+++ /dev/null
@@ -1,225 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-        <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-        
-	    <condition
-	        property="getprereq.eclipse">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.eclipseplatform">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emf">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfxsd">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfvalidation">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.gef">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.dtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.jst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wtp">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	            	
-    <target
-        name="get">
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined, which we do later with
-            statements such if="${groupId}.url"
-        -->
-        <property
-            file="${dependency.properties}"/>
-        <antcall
-            target="prereq.eclipse"/>
-        <antcall
-            target="prereq.eclipseplatform"/>
-        <antcall
-            target="prereq.emf"/>
-        <antcall
-            target="prereq.emfxsd"/>
-        <antcall
-            target="prereq.emfvalidation"/>
-        <antcall
-            target="prereq.gef"/>
-        <antcall
-            target="prereq.dtp"/>
-        <antcall
-            target="prereq.wst"/>
-        <antcall
-            target="prereq.jst"/>
-        <antcall
-            target="prereq.wtp"/>
-    </target>
-    <target
-        name="prereq.eclipse"
-        if="getprereq.eclipse">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.eclipseplatform"
-        if="getprereq.eclipseplatform">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipseplatform"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emf"
-        if="getprereq.emf">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfxsd"
-        if="getprereq.emfxsd">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfvalidation"
-        if="getprereq.emfvalidation">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfvalidation"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.gef"
-        if="getprereq.gef">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.dtp"
-        if="getprereq.dtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="dtp"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wst"
-        if="getprereq.wst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.jst"
-        if="getprereq.jst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="jst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wtp"
-        if="getprereq.wtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstall"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/jaxws_tests/build.properties b/releng.wtpbuilder/components/jaxws_tests/build.properties
deleted file mode 100644
index 4d26330..0000000
--- a/releng.wtpbuilder/components/jaxws_tests/build.properties
+++ /dev/null
@@ -1,46 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# This is a subdirectory of $buildDirectory
-# Set collectingFolder and archivePrefix to . if you want to create archives without
-# trailing eclipse in the paths of the included files
-collectingFolder=eclipse
-logExtension=.xml
-# The prefix that will be used in the generated archive.
-# Does not make sense to use a different archivePrefix than collectingFolder, 
-# because zip wouldn't find any files to include into the target zip otherwise
-archivePrefix=eclipse
-
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-##################################################
-# Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
-javacVerbose=true
-
-sign=false
-
-#############################################################
-
-# Properties introduced in 3.5 M3 (PDE base builder R35_M2). See
-# http://aniefer.blogspot.com/2008/10/sorting-bundles-and-parallel.html
-
-flattenDependencies=true
-parallelCompilation=true
-
diff --git a/releng.wtpbuilder/components/jaxws_tests/customTargets.xml b/releng.wtpbuilder/components/jaxws_tests/customTargets.xml
deleted file mode 100644
index fc01e32..0000000
--- a/releng.wtpbuilder/components/jaxws_tests/customTargets.xml
+++ /dev/null
@@ -1,356 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-    <!--
-        = = = standard properties pattern = = = 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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- let this project specify properties, if not already set -->
-    <property
-        file="build.properties"/>
-    <fail
-        message="dependency.properties must be specified by distribution script"
-        unless="dependency.properties"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set"/>
-    <echo
-        message="buildDirectory: ${buildDirectory}"/>
-    <!--
-        Run a given ${target} on all elements being built Add on <ant>
-        task for each top level element being built.
-    -->
-    <target
-        name="allElements">
-        <echo
-            level="info"
-            message="Target:${target} "/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="info"
-            message="component: ${component}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}"/>
-        <echo
-            level="debug"
-            message="generic target: ${genericTargets}"/>
-        <echo
-            message="compilerArg: ${compilerArg}"/>
-        <echo
-            message="individualSourceBundles: ${individualSourceBundles}"/>
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature"/>
-            <property
-                name="id"
-                value="org.eclipse.jst.ws.jaxws.assembly_tests.feature"/>
-        </ant>
-    </target>
-    <!--
-        Targets to assemble the built elements for particular
-        configurations These generally call the generated assemble
-        scripts (named in ${assembleScriptName}) but may also add pre
-        and post processing Add one target for each root element and
-        each configuration
-    -->
-    <target
-        name="assemble.org.eclipse.jst.ws.jaxws.assembly_tests.feature">
-        <property
-            name="archiveName"
-            value="wtp-incubator-jaxws-tests-${buildLabel}.zip"/>
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}"/>
-    </target>
-    <target
-        name="prePackage"/>
-    <target
-        name="postPackage">
-        <property
-            name="archiveName"
-            value="wtp-incubator-jaxws-tests-${buildLabel}.zip"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-            <property
-                name="buildLabel"
-                value="${buildLabel}"/>
-            <property
-                name="archiveName"
-                value="${archiveName}"/>
-        </ant>
-    </target>
-
-    <!-- 
-        Check out map files from repository
-    -->
-    <target
-        name="getMapFiles">
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENG}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENGJAXWS}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-    </target>
-
-
-    <!-- 
-        Steps to do before setup
-    -->
-    <target
-        name="preSetup"></target>
-    <!--
-        Steps to do after setup but before starting the build proper
-    -->
-    <target
-        name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}"/>
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}"/>
-
-        <!-- Get the dependencies -->
-        <antcall
-            target="getDependencies"/>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Get the dependencies based on releng maps -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="getDependencies">
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-            <property
-                name="base.install.dir"
-                value="${buildRoot}"/>
-        </ant>
-    </target>
-
-    <!--
-      Steps to do before fetching the build elements
-    -->
-    <target
-        name="preFetch"></target>
-
-    <!-- 
-      Steps to do after fetching the build elements
-    -->
-    <target
-        name="postFetch"></target>
-
-    <!--
-      Steps to do before generating the build scripts.
-    -->
-    <target
-        name="preGenerate"></target>
-
-    <!--
-      Steps to do after generating the build scripts.
-    -->
-    <target
-        name="postGenerate">
-        <echo
-            message="buildDirectory: ${buildDirectory}"/>
-        <customizeAccessRules
-            bundleDirectory="${buildDirectory}/plugins"/>
-    </target>
-    <!--
-        Steps to do before running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include
-                name="**/about.mappings"/>
-        </replace>
-    </target>
-    <!--
-        Steps to do after running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="postProcess">
-        <condition
-            property="logsAvailable">
-            <istrue
-                value="${javacVerbose}"/>
-        </condition>
-        <antcall
-            target="gatherLogs"/>
-    </target>
-
-
-    <!--
-      Steps to do before running assemble. 
-        -->
-    <target
-        name="preAssemble"></target>
-
-    <!--
-      Steps to do after  running assemble.
-    -->
-    <target
-        name="postAssemble"></target>
-
-    <!--
-      Steps to do after the build is done.
-    -->
-    <target
-        name="postBuild"></target>
-
-    <!--
-      Steps to do to test the build results
-    -->
-    <target
-        name="test"></target>
-
-    <!--
-      Steps to do to publish the build results
-    -->
-    <target
-        name="publish"></target>
-
-    <!--
-      Helper targets
-    -->
-	    <target
-	        name="gatherLogs"
-	        if="logsAvailable">
-	        <mkdir
-            dir="${buildDirectory}/${buildLabel}/testcompilelogs"/>
-	        <echo
-	            level="debug"
-	            message="logExtension: ${logExtension}"/>
-	        <antcall
-	            target="allElements">
-	            <param
-	                name="target"
-	                value="gatherLogs"/>
-	            <param
-	                name="logExtension"
-	                value="${logExtension}"/>
-	        </antcall>
-	        <unzip
-            dest="${buildDirectory}/${buildLabel}/testcompilelogs"
-            overwrite="true">
-	            <fileset
-                dir="${buildDirectory}/features/org.eclipse.jst.ws.jaxws.assembly_tests.feature">
-	                <include
-	                    name="**/*.log.zip"/>
-	            </fileset>
-	        </unzip>
-	        <!--
-	            TODO: it is unclear if the above "gather" and unzip do
-	            anything constructive. I think not and should be removed
-	            (after experimental run, of course.
-	        -->
-	        <!--
-	            workaround: see
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-	        -->
-	        <copy
-	            todir="${buildDirectory}/${buildLabel}/testcompilelogs/plugins"
-	            overwrite="true">
-	            <!--
-	                we want all @dot.xml files, but assumes a certain
-	                structure, to include directory for name of plugin
-	            -->
-	            <fileset
-	                dir="${buildDirectory}/features/">
-	                <include
-	                    name="**/feature.temp.folder/"/>
-	                <exclude
-	                    name="**/*tests*feature*/feature.temp.folder/" />
-	                     
-	            </fileset>
-	            <compositemapper>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/@dot.xml"
-	                    to="/\2/@dot.xml"/>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-	                    to="/\2/\3bin.xml"/>
-	            </compositemapper>
-	        </copy>
-	    </target>
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="cleanElement"/>
-        </antcall>
-    </target>
-
-    <!--
-      Default target 
-    -->
-    <target
-        name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/jaxws_tests/dependency.xml b/releng.wtpbuilder/components/jaxws_tests/dependency.xml
deleted file mode 100644
index 1e02cb5..0000000
--- a/releng.wtpbuilder/components/jaxws_tests/dependency.xml
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-        <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-        
-	    <condition
-	        property="getprereq.eclipse">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.eclipseplatform">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emf">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfxsd">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfvalidation">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.gef">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.dtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.jst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wtp">
-	        <istrue
-	            value="true"/>
-	    </condition>
-    <target
-        name="get">
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined, which we do later with
-            statements such if="${groupId}.url"
-        -->
-        <property
-            file="${dependency.properties}"/>
-        <antcall
-            target="prereq.eclipse"/>
-        <antcall
-            target="prereq.eclipseplatform"/>
-        <antcall
-            target="prereq.emf"/>
-        <antcall
-            target="prereq.emfxsd"/>
-        <antcall
-            target="prereq.emfvalidation"/>
-        <antcall
-            target="prereq.gef"/>
-        <antcall
-            target="prereq.dtp"/>
-        <antcall
-            target="prereq.wst"/>
-        <antcall
-            target="prereq.jst"/>
-        <antcall
-            target="prereq.wtp"/>
-       <antcall
-           target="getAndInstall">
-           <param
-               name="groupId"
-               value="eclipseTestFramework"/>    
-       	</antcall>
-    </target>
-    <target
-        name="prereq.eclipse"
-        if="getprereq.eclipse">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.eclipseplatform"
-        if="getprereq.eclipseplatform">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipseplatform"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emf"
-        if="getprereq.emf">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfxsd"
-        if="getprereq.emfxsd">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfvalidation"
-        if="getprereq.emfvalidation">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfvalidation"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.gef"
-        if="getprereq.gef">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.dtp"
-        if="getprereq.dtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="dtp"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wst"
-        if="getprereq.wst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.jst"
-        if="getprereq.jst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="jst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wtp"
-        if="getprereq.wtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstall"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/jsdt/build.properties b/releng.wtpbuilder/components/jsdt/build.properties
deleted file mode 100644
index 5bed879..0000000
--- a/releng.wtpbuilder/components/jsdt/build.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# This is a subdirectory of $buildDirectory
-# Set collectingFolder and archivePrefix to . if you want to create archives without
-# trailing eclipse in the paths of the included files
-collectingFolder=eclipse
-logExtension=.xml
-# The prefix that will be used in the generated archive.
-# Does not make sense to use a different archivePrefix than collectingFolder, 
-# because zip wouldn't find any files to include into the target zip otherwise
-archivePrefix=eclipse
-
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-##################################################
-# Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
-javacVerbose=true
-
-sign=true
-
-#############################################################
-
-# Properties introduced in 3.5 M3 (PDE base builder R35_M2). See
-# http://aniefer.blogspot.com/2008/10/sorting-bundles-and-parallel.html
-
-flattenDependencies=true
-parallelCompilation=true
-
-
diff --git a/releng.wtpbuilder/components/jsdt/customTargets.xml b/releng.wtpbuilder/components/jsdt/customTargets.xml
deleted file mode 100644
index b9f1b92..0000000
--- a/releng.wtpbuilder/components/jsdt/customTargets.xml
+++ /dev/null
@@ -1,356 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-    <!--
-        = = = standard properties pattern = = = 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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- let this project specify properties, if not already set -->
-    <property
-        file="build.properties"/>
-    <fail
-        message="dependency.properties must be specified by distribution script"
-        unless="dependency.properties"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set"/>
-    <echo
-        message="buildDirectory: ${buildDirectory}"/>
-    <!--
-        Run a given ${target} on all elements being built Add on <ant>
-        task for each top level element being built.
-    -->
-    <target
-        name="allElements">
-        <echo
-            level="info"
-            message="Target:${target} "/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="info"
-            message="component: ${component}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}"/>
-        <echo
-            level="debug"
-            message="generic target: ${genericTargets}"/>
-        <echo
-            message="compilerArg: ${compilerArg}"/>
-        <echo
-            message="individualSourceBundles: ${individualSourceBundles}"/>
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature"/>
-            <property
-                name="id"
-                value="org.eclipse.wst.jsdt.feature"/>
-        </ant>
-    </target>
-    <!--
-        Targets to assemble the built elements for particular
-        configurations These generally call the generated assemble
-        scripts (named in ${assembleScriptName}) but may also add pre
-        and post processing Add one target for each root element and
-        each configuration
-    -->
-    <target
-        name="assemble.org.eclipse.wst.jsdt.feature">
-        <property
-            name="archiveName"
-            value="wtp-jsdt-${buildLabel}.zip"/>
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}"/>
-    </target>
-    <target
-        name="prePackage"/>
-    <target
-        name="postPackage">
-        <property
-            name="archiveName"
-            value="wtp-jsdt-${buildLabel}.zip"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-            <property
-                name="buildLabel"
-                value="${buildLabel}"/>
-            <property
-                name="archiveName"
-                value="${archiveName}"/>
-        </ant>
-    </target>
-
-    <!-- 
-        Check out map files from repository
-    -->
-    <target
-        name="getMapFiles">
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENG}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENGJSDT}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-    </target>
-
-
-    <!-- 
-        Steps to do before setup
-    -->
-    <target
-        name="preSetup"></target>
-    <!--
-        Steps to do after setup but before starting the build proper
-    -->
-    <target
-        name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}"/>
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}"/>
-
-        <!-- Get the dependencies -->
-        <antcall
-            target="getDependencies"/>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Get the dependencies based on releng maps -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="getDependencies">
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-            <property
-                name="base.install.dir"
-                value="${buildRoot}"/>
-        </ant>
-    </target>
-
-    <!--
-      Steps to do before fetching the build elements
-    -->
-    <target
-        name="preFetch"></target>
-
-    <!-- 
-      Steps to do after fetching the build elements
-    -->
-    <target
-        name="postFetch"></target>
-
-    <!--
-      Steps to do before generating the build scripts.
-    -->
-    <target
-        name="preGenerate"></target>
-
-    <!--
-      Steps to do after generating the build scripts.
-    -->
-    <target
-        name="postGenerate">
-        <echo
-            message="buildDirectory: ${buildDirectory}"/>
-        <customizeAccessRules
-            bundleDirectory="${buildDirectory}/plugins"/>
-    </target>
-    <!--
-        Steps to do before running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include
-                name="**/about.mappings"/>
-        </replace>
-    </target>
-    <!--
-        Steps to do after running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="postProcess">
-        <condition
-            property="logsAvailable">
-            <istrue
-                value="${javacVerbose}"/>
-        </condition>
-        <antcall
-            target="gatherLogs"/>
-    </target>
-
-
-    <!--
-      Steps to do before running assemble. 
-    -->
-    <target
-        name="preAssemble"></target>
-
-    <!--
-      Steps to do after  running assemble.
-    -->
-    <target
-        name="postAssemble"></target>
-
-    <!--
-      Steps to do after the build is done.
-    -->
-    <target
-        name="postBuild"></target>
-
-    <!--
-      Steps to do to test the build results
-    -->
-    <target
-        name="test"></target>
-
-    <!--
-      Steps to do to publish the build results
-    -->
-    <target
-        name="publish"></target>
-
-    <!--
-      Helper targets
-    -->
-	    <target
-	        name="gatherLogs"
-	        if="logsAvailable">
-	        <mkdir
-	            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
-	        <echo
-	            level="debug"
-	            message="logExtension: ${logExtension}"/>
-	        <antcall
-	            target="allElements">
-	            <param
-	                name="target"
-	                value="gatherLogs"/>
-	            <param
-	                name="logExtension"
-	                value="${logExtension}"/>
-	        </antcall>
-	        <unzip
-	            dest="${buildDirectory}/${buildLabel}/compilelogs"
-	            overwrite="true">
-	            <fileset
-                dir="${buildDirectory}/features/org.eclipse.wst.jsdt.feature">
-	                <include
-	                    name="**/*.log.zip"/>
-	            </fileset>
-	        </unzip>
-	        <!--
-	            TODO: it is unclear if the above "gather" and unzip do
-	            anything constructive. I think not and should be removed
-	            (after experimental run, of course.
-	        -->
-	        <!--
-	            workaround: see
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-	        -->
-	        <copy
-	            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
-	            overwrite="true">
-	            <!--
-	                we want all @dot.xml files, but assumes a certain
-	                structure, to include directory for name of plugin
-	            -->
-	            <fileset
-	                dir="${buildDirectory}/features/">
-	                <include
-	                    name="**/feature.temp.folder/"/>
-	                <exclude
-	                    name="**/*tests*feature*/feature.temp.folder/" />
-	                     
-	            </fileset>
-	            <compositemapper>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/@dot.xml"
-	                    to="/\2/@dot.xml"/>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-	                    to="/\2/\3bin.xml"/>
-	            </compositemapper>
-	        </copy>
-	    </target>
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="cleanElement"/>
-        </antcall>
-    </target>
-
-    <!--
-      Default target 
-    -->
-    <target
-        name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/jsdt/dependency.xml b/releng.wtpbuilder/components/jsdt/dependency.xml
deleted file mode 100644
index 53b2560..0000000
--- a/releng.wtpbuilder/components/jsdt/dependency.xml
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-        <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-        
-    <condition
-        property="getprereq.eclipse">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.eclipseplatform">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.emf">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.emfxsd">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.emfvalidation">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.gef">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.dtp">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.wst">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.jst">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.wtp">
-        <istrue
-            value="false"/>
-    </condition>
-    <target
-        name="get">
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined, which we do later with
-            statements such if="${groupId}.url"
-        -->
-        <property
-            file="${dependency.properties}"/>
-        <antcall
-            target="prereq.eclipse"/>
-        <antcall
-            target="prereq.eclipseplatform"/>
-        <antcall
-            target="prereq.emf"/>
-        <antcall
-            target="prereq.emfxsd"/>
-        <antcall
-            target="prereq.emfvalidation"/>
-        <antcall
-            target="prereq.gef"/>
-        <antcall
-            target="prereq.dtp"/>
-        <antcall
-            target="prereq.wst"/>
-        <antcall
-            target="prereq.jst"/>
-        <antcall
-            target="prereq.wtp"/>
-    </target>
-    <target
-        name="prereq.eclipse"
-        if="getprereq.eclipse">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.eclipseplatform"
-        if="getprereq.eclipseplatform">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipseplatform"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emf"
-        if="getprereq.emf">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfxsd"
-        if="getprereq.emfxsd">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfvalidation"
-        if="getprereq.emfvalidation">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfvalidation"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.gef"
-        if="getprereq.gef">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.dtp"
-        if="getprereq.dtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="dtp"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wst"
-        if="getprereq.wst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.jst"
-        if="getprereq.jst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="jst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wtp"
-        if="getprereq.wtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstall"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/jsdt_sdk/build.properties b/releng.wtpbuilder/components/jsdt_sdk/build.properties
deleted file mode 100644
index 5bed879..0000000
--- a/releng.wtpbuilder/components/jsdt_sdk/build.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# This is a subdirectory of $buildDirectory
-# Set collectingFolder and archivePrefix to . if you want to create archives without
-# trailing eclipse in the paths of the included files
-collectingFolder=eclipse
-logExtension=.xml
-# The prefix that will be used in the generated archive.
-# Does not make sense to use a different archivePrefix than collectingFolder, 
-# because zip wouldn't find any files to include into the target zip otherwise
-archivePrefix=eclipse
-
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-##################################################
-# Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
-javacVerbose=true
-
-sign=true
-
-#############################################################
-
-# Properties introduced in 3.5 M3 (PDE base builder R35_M2). See
-# http://aniefer.blogspot.com/2008/10/sorting-bundles-and-parallel.html
-
-flattenDependencies=true
-parallelCompilation=true
-
-
diff --git a/releng.wtpbuilder/components/jsdt_sdk/customTargets.xml b/releng.wtpbuilder/components/jsdt_sdk/customTargets.xml
deleted file mode 100644
index 134e548..0000000
--- a/releng.wtpbuilder/components/jsdt_sdk/customTargets.xml
+++ /dev/null
@@ -1,356 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-    <!--
-        = = = standard properties pattern = = = 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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- let this project specify properties, if not already set -->
-    <property
-        file="build.properties"/>
-    <fail
-        message="dependency.properties must be specified by distribution script"
-        unless="dependency.properties"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set"/>
-    <echo
-        message="buildDirectory: ${buildDirectory}"/>
-    <!--
-        Run a given ${target} on all elements being built Add on <ant>
-        task for each top level element being built.
-    -->
-    <target
-        name="allElements">
-        <echo
-            level="info"
-            message="Target:${target} "/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="info"
-            message="component: ${component}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}"/>
-        <echo
-            level="debug"
-            message="generic target: ${genericTargets}"/>
-        <echo
-            message="compilerArg: ${compilerArg}"/>
-        <echo
-            message="individualSourceBundles: ${individualSourceBundles}"/>
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature"/>
-            <property
-                name="id"
-                value="org.eclipse.wst.jsdt_sdk.feature"/>
-        </ant>
-    </target>
-    <!--
-        Targets to assemble the built elements for particular
-        configurations These generally call the generated assemble
-        scripts (named in ${assembleScriptName}) but may also add pre
-        and post processing Add one target for each root element and
-        each configuration
-    -->
-    <target
-        name="assemble.org.eclipse.wst.jsdt_sdk.feature">
-        <property
-            name="archiveName"
-            value="wtp-jsdt-sdk-${buildLabel}.zip"/>
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}"/>
-    </target>
-    <target
-        name="prePackage"/>
-    <target
-        name="postPackage">
-        <property
-            name="archiveName"
-            value="wtp-jsdt-sdk-${buildLabel}.zip"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-            <property
-                name="buildLabel"
-                value="${buildLabel}"/>
-            <property
-                name="archiveName"
-                value="${archiveName}"/>
-        </ant>
-    </target>
-
-    <!--
-        Check out map files from repository
-        -->
-    <target
-        name="getMapFiles">
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENG}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENGJSDT}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-    </target>
-
-
-    <!-- 
-        Steps to do before setup
-    -->
-    <target
-        name="preSetup"></target>
-    <!--
-        Steps to do after setup but before starting the build proper
-    -->
-    <target
-        name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}"/>
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}"/>
-
-        <!-- Get the dependencies -->
-        <antcall
-            target="getDependencies"/>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Get the dependencies based on releng maps -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="getDependencies">
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-            <property
-                name="base.install.dir"
-                value="${buildRoot}"/>
-        </ant>
-    </target>
-
-    <!--
-      Steps to do before fetching the build elements
-    -->
-    <target
-        name="preFetch"></target>
-
-    <!-- 
-      Steps to do after fetching the build elements
-    -->
-    <target
-        name="postFetch"></target>
-
-    <!--
-      Steps to do before generating the build scripts.
-    -->
-    <target
-        name="preGenerate"></target>
-
-    <!--
-      Steps to do after generating the build scripts.
-    -->
-    <target
-        name="postGenerate">
-        <echo
-            message="buildDirectory: ${buildDirectory}"/>
-        <customizeAccessRules
-            bundleDirectory="${buildDirectory}/plugins"/>
-    </target>
-    <!--
-        Steps to do before running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include
-                name="**/about.mappings"/>
-        </replace>
-    </target>
-    <!--
-        Steps to do after running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="postProcess">
-        <condition
-            property="logsAvailable">
-            <istrue
-                value="${javacVerbose}"/>
-        </condition>
-        <antcall
-            target="gatherLogs"/>
-    </target>
-
-
-    <!--
-      Steps to do before running assemble. 
-        -->
-    <target
-        name="preAssemble"></target>
-
-    <!--
-      Steps to do after  running assemble.
-    -->
-    <target
-        name="postAssemble"></target>
-
-    <!--
-      Steps to do after the build is done.
-    -->
-    <target
-        name="postBuild"></target>
-
-    <!--
-      Steps to do to test the build results
-    -->
-    <target
-        name="test"></target>
-
-    <!--
-      Steps to do to publish the build results
-    -->
-    <target
-        name="publish"></target>
-
-    <!--
-      Helper targets
-    -->
-	    <target
-	        name="gatherLogs"
-	        if="logsAvailable">
-	        <mkdir
-	            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
-	        <echo
-	            level="debug"
-	            message="logExtension: ${logExtension}"/>
-	        <antcall
-	            target="allElements">
-	            <param
-	                name="target"
-	                value="gatherLogs"/>
-	            <param
-	                name="logExtension"
-	                value="${logExtension}"/>
-	        </antcall>
-	        <unzip
-	            dest="${buildDirectory}/${buildLabel}/compilelogs"
-	            overwrite="true">
-	            <fileset
-                dir="${buildDirectory}/features/org.eclipse.wst.jsdt_sdk.feature">
-	                <include
-	                    name="**/*.log.zip"/>
-	            </fileset>
-	        </unzip>
-	        <!--
-	            TODO: it is unclear if the above "gather" and unzip do
-	            anything constructive. I think not and should be removed
-	            (after experimental run, of course.
-	        -->
-	        <!--
-	            workaround: see
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-	        -->
-	        <copy
-	            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
-	            overwrite="true">
-	            <!--
-	                we want all @dot.xml files, but assumes a certain
-	                structure, to include directory for name of plugin
-	            -->
-	            <fileset
-	                dir="${buildDirectory}/features/">
-	                <include
-	                    name="**/feature.temp.folder/"/>
-	                <exclude
-	                    name="**/*tests*feature*/feature.temp.folder/" />
-	                     
-	            </fileset>
-	            <compositemapper>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/@dot.xml"
-	                    to="/\2/@dot.xml"/>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-	                    to="/\2/\3bin.xml"/>
-	            </compositemapper>
-	        </copy>
-	    </target>
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="cleanElement"/>
-        </antcall>
-    </target>
-
-    <!--
-      Default target 
-    -->
-    <target
-        name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/jsdt_sdk/dependency.xml b/releng.wtpbuilder/components/jsdt_sdk/dependency.xml
deleted file mode 100644
index c3f0161..0000000
--- a/releng.wtpbuilder/components/jsdt_sdk/dependency.xml
+++ /dev/null
@@ -1,225 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-        <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-        
-	    <condition
-	        property="getprereq.eclipse">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.eclipseplatform">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emf">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfxsd">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfvalidation">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.gef">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.dtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.jst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	            	
-    <target
-        name="get">
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined, which we do later with
-            statements such if="${groupId}.url"
-        -->
-        <property
-            file="${dependency.properties}"/>
-        <antcall
-            target="prereq.eclipse"/>
-        <antcall
-            target="prereq.eclipseplatform"/>
-        <antcall
-            target="prereq.emf"/>
-        <antcall
-            target="prereq.emfxsd"/>
-        <antcall
-            target="prereq.emfvalidation"/>
-        <antcall
-            target="prereq.gef"/>
-        <antcall
-            target="prereq.dtp"/>
-        <antcall
-            target="prereq.wst"/>
-        <antcall
-            target="prereq.jst"/>
-        <antcall
-            target="prereq.wtp"/>
-    </target>
-    <target
-        name="prereq.eclipse"
-        if="getprereq.eclipse">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.eclipseplatform"
-        if="getprereq.eclipseplatform">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipseplatform"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emf"
-        if="getprereq.emf">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfxsd"
-        if="getprereq.emfxsd">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfvalidation"
-        if="getprereq.emfvalidation">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfvalidation"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.gef"
-        if="getprereq.gef">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.dtp"
-        if="getprereq.dtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="dtp"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wst"
-        if="getprereq.wst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.jst"
-        if="getprereq.jst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="jst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wtp"
-        if="getprereq.wtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstall"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/jsdt_tests/build.properties b/releng.wtpbuilder/components/jsdt_tests/build.properties
deleted file mode 100644
index 4d26330..0000000
--- a/releng.wtpbuilder/components/jsdt_tests/build.properties
+++ /dev/null
@@ -1,46 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# This is a subdirectory of $buildDirectory
-# Set collectingFolder and archivePrefix to . if you want to create archives without
-# trailing eclipse in the paths of the included files
-collectingFolder=eclipse
-logExtension=.xml
-# The prefix that will be used in the generated archive.
-# Does not make sense to use a different archivePrefix than collectingFolder, 
-# because zip wouldn't find any files to include into the target zip otherwise
-archivePrefix=eclipse
-
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-##################################################
-# Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
-javacVerbose=true
-
-sign=false
-
-#############################################################
-
-# Properties introduced in 3.5 M3 (PDE base builder R35_M2). See
-# http://aniefer.blogspot.com/2008/10/sorting-bundles-and-parallel.html
-
-flattenDependencies=true
-parallelCompilation=true
-
diff --git a/releng.wtpbuilder/components/jsdt_tests/customTargets.xml b/releng.wtpbuilder/components/jsdt_tests/customTargets.xml
deleted file mode 100644
index 9d6651f..0000000
--- a/releng.wtpbuilder/components/jsdt_tests/customTargets.xml
+++ /dev/null
@@ -1,356 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-    <!--
-        = = = standard properties pattern = = = 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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- let this project specify properties, if not already set -->
-    <property
-        file="build.properties"/>
-    <fail
-        message="dependency.properties must be specified by distribution script"
-        unless="dependency.properties"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set"/>
-    <echo
-        message="buildDirectory: ${buildDirectory}"/>
-    <!--
-        Run a given ${target} on all elements being built Add on <ant>
-        task for each top level element being built.
-    -->
-    <target
-        name="allElements">
-        <echo
-            level="info"
-            message="Target:${target} "/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="info"
-            message="component: ${component}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}"/>
-        <echo
-            level="debug"
-            message="generic target: ${genericTargets}"/>
-        <echo
-            message="compilerArg: ${compilerArg}"/>
-        <echo
-            message="individualSourceBundles: ${individualSourceBundles}"/>
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature"/>
-            <property
-                name="id"
-                value="org.eclipse.wst.jsdt_tests.feature"/>
-        </ant>
-    </target>
-    <!--
-        Targets to assemble the built elements for particular
-        configurations These generally call the generated assemble
-        scripts (named in ${assembleScriptName}) but may also add pre
-        and post processing Add one target for each root element and
-        each configuration
-    -->
-    <target
-        name="assemble.org.eclipse.wst.jsdt_tests.feature">
-        <property
-            name="archiveName"
-            value="wtp-jsdt-tests-${buildLabel}.zip"/>
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}"/>
-    </target>
-    <target
-        name="prePackage"/>
-    <target
-        name="postPackage">
-        <property
-            name="archiveName"
-            value="wtp-jsdt-tests-${buildLabel}.zip"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-            <property
-                name="buildLabel"
-                value="${buildLabel}"/>
-            <property
-                name="archiveName"
-                value="${archiveName}"/>
-        </ant>
-    </target>
-
-    <!-- 
-        Check out map files from repository
-    -->
-    <target
-        name="getMapFiles">
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENG}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENGJSDT}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-    </target>
-
-
-    <!-- 
-        Steps to do before setup
-    -->
-    <target
-        name="preSetup"></target>
-    <!--
-        Steps to do after setup but before starting the build proper
-    -->
-    <target
-        name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}"/>
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}"/>
-
-        <!-- Get the dependencies -->
-        <antcall
-            target="getDependencies"/>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Get the dependencies based on releng maps -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="getDependencies">
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-            <property
-                name="base.install.dir"
-                value="${buildRoot}"/>
-        </ant>
-    </target>
-
-    <!--
-      Steps to do before fetching the build elements
-    -->
-    <target
-        name="preFetch"></target>
-
-    <!-- 
-      Steps to do after fetching the build elements
-    -->
-    <target
-        name="postFetch"></target>
-
-    <!--
-      Steps to do before generating the build scripts.
-    -->
-    <target
-        name="preGenerate"></target>
-
-    <!--
-      Steps to do after generating the build scripts.
-    -->
-    <target
-        name="postGenerate">
-        <echo
-            message="buildDirectory: ${buildDirectory}"/>
-        <customizeAccessRules
-            bundleDirectory="${buildDirectory}/plugins"/>
-    </target>
-    <!--
-        Steps to do before running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include
-                name="**/about.mappings"/>
-        </replace>
-    </target>
-    <!--
-        Steps to do after running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="postProcess">
-        <condition
-            property="logsAvailable">
-            <istrue
-                value="${javacVerbose}"/>
-        </condition>
-        <antcall
-            target="gatherLogs"/>
-    </target>
-
-
-    <!--
-      Steps to do before running assemble. 
-        -->
-    <target
-        name="preAssemble"></target>
-
-    <!--
-      Steps to do after  running assemble.
-    -->
-    <target
-        name="postAssemble"></target>
-
-    <!--
-      Steps to do after the build is done.
-    -->
-    <target
-        name="postBuild"></target>
-
-    <!--
-      Steps to do to test the build results
-    -->
-    <target
-        name="test"></target>
-
-    <!--
-      Steps to do to publish the build results
-    -->
-    <target
-        name="publish"></target>
-
-    <!--
-      Helper targets
-    -->
-	    <target
-	        name="gatherLogs"
-	        if="logsAvailable">
-	        <mkdir
-            dir="${buildDirectory}/${buildLabel}/testcompilelogs"/>
-	        <echo
-	            level="debug"
-	            message="logExtension: ${logExtension}"/>
-	        <antcall
-	            target="allElements">
-	            <param
-	                name="target"
-	                value="gatherLogs"/>
-	            <param
-	                name="logExtension"
-	                value="${logExtension}"/>
-	        </antcall>
-	        <unzip
-            dest="${buildDirectory}/${buildLabel}/testcompilelogs"
-            overwrite="true">
-	            <fileset
-                dir="${buildDirectory}/features/org.eclipse.wst.jsdt_tests.feature">
-	                <include
-	                    name="**/*.log.zip"/>
-	            </fileset>
-	        </unzip>
-	        <!--
-	            TODO: it is unclear if the above "gather" and unzip do
-	            anything constructive. I think not and should be removed
-	            (after experimental run, of course.
-	        -->
-	        <!--
-	            workaround: see
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-	        -->
-	        <copy
-	            todir="${buildDirectory}/${buildLabel}/testcompilelogs/plugins"
-	            overwrite="true">
-	            <!--
-	                we want all @dot.xml files, but assumes a certain
-	                structure, to include directory for name of plugin
-	            -->
-	            <fileset
-	                dir="${buildDirectory}/features/">
-	                <include
-	                    name="**/feature.temp.folder/"/>
-	                <exclude
-	                    name="**/*tests*feature*/feature.temp.folder/" />
-	                     
-	            </fileset>
-	            <compositemapper>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/@dot.xml"
-	                    to="/\2/@dot.xml"/>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-	                    to="/\2/\3bin.xml"/>
-	            </compositemapper>
-	        </copy>
-	    </target>
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="cleanElement"/>
-        </antcall>
-    </target>
-
-    <!--
-      Default target 
-    -->
-    <target
-        name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/jsdt_tests/dependency.xml b/releng.wtpbuilder/components/jsdt_tests/dependency.xml
deleted file mode 100644
index 73f8a7e..0000000
--- a/releng.wtpbuilder/components/jsdt_tests/dependency.xml
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-        <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-        
-	    <condition
-	        property="getprereq.eclipse">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.eclipseplatform">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emf">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfxsd">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfvalidation">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.gef">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.dtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.jst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
-    <target
-        name="get">
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined, which we do later with
-            statements such if="${groupId}.url"
-        -->
-        <property
-            file="${dependency.properties}"/>
-        <antcall
-            target="prereq.eclipse"/>
-        <antcall
-            target="prereq.eclipseplatform"/>
-        <antcall
-            target="prereq.emf"/>
-        <antcall
-            target="prereq.emfxsd"/>
-        <antcall
-            target="prereq.emfvalidation"/>
-        <antcall
-            target="prereq.gef"/>
-        <antcall
-            target="prereq.dtp"/>
-        <antcall
-            target="prereq.wst"/>
-        <antcall
-            target="prereq.jst"/>
-        <antcall
-            target="prereq.wtp"/>
-       <antcall
-           target="getAndInstall">
-           <param
-               name="groupId"
-               value="eclipseTestFramework"/>    
-       	</antcall>
-    </target>
-    <target
-        name="prereq.eclipse"
-        if="getprereq.eclipse">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.eclipseplatform"
-        if="getprereq.eclipseplatform">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipseplatform"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emf"
-        if="getprereq.emf">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfxsd"
-        if="getprereq.emfxsd">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfvalidation"
-        if="getprereq.emfvalidation">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfvalidation"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.gef"
-        if="getprereq.gef">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.dtp"
-        if="getprereq.dtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="dtp"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wst"
-        if="getprereq.wst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.jst"
-        if="getprereq.jst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="jst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wtp"
-        if="getprereq.wtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstall"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/jst-sdk/build.properties b/releng.wtpbuilder/components/jst-sdk/build.properties
deleted file mode 100644
index 9b2e603..0000000
--- a/releng.wtpbuilder/components/jst-sdk/build.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# This is a subdirectory of $buildDirectory
-# Set collectingFolder and archivePrefix to . if you want to create archives without
-# trailing eclipse in the paths of the included files
-collectingFolder=eclipse
-
-# The prefix that will be used in the generated archive.
-# Does not make sense to use a different archivePrefix than collectingFolder, 
-# because zip wouldn't find any files to include into the target zip otherwise
-archivePrefix=eclipse
-logExtension=.xml
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-##################################################
-# Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
-javacVerbose=true
-
-sign=true
diff --git a/releng.wtpbuilder/components/jst-sdk/customTargets.xml b/releng.wtpbuilder/components/jst-sdk/customTargets.xml
deleted file mode 100644
index 2831b62..0000000
--- a/releng.wtpbuilder/components/jst-sdk/customTargets.xml
+++ /dev/null
@@ -1,327 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-    <!--
-        = = = standard properties pattern = = = 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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- let this project specify properties, if not already set -->
-    <property
-        file="build.properties"/>
-    <fail
-        message="dependency.properties must be specified by distribution script"
-        unless="dependency.properties"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set"/>
-    <echo
-        message="buildDirectory: ${buildDirectory}"/>
-    <!--
-        Run a given ${target} on all elements being built Add on <ant>
-        task for each top level element being built.
-    -->
-    <target
-        name="allElements">
-        <echo
-            level="info"
-            message="Target:${target} "/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="info"
-            message="component: ${component}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}"/>
-        <echo
-            level="debug"
-            message="generic target: ${genericTargets}"/>
-        <echo
-            message="compilerArg: ${compilerArg}"/>
-        <echo
-            message="individualSourceBundles: ${individualSourceBundles}"/>
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature"/>
-            <property
-                name="id"
-                value="org.eclipse.jst.sdk"/>
-        </ant>
-    </target>
-    <!--
-        Targets to assemble the built elements for particular
-        configurations These generally call the generated assemble
-        scripts (named in ${assembleScriptName}) but may also add pre
-        and post processing Add one target for each root element and
-        each configuration
-    -->
-    <target
-        name="assemble.org.eclipse.jst.sdk">
-        <property
-            name="archiveName"
-            value="wtp-jst-sdk-${buildLabel}.zip"/>
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}"/>
-    </target>
-    <target
-        name="prePackage"/>
-    <target
-        name="postPackage">
-        <property
-            name="archiveName"
-            value="wtp-jst-sdk-${buildLabel}.zip"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-            <property
-                name="buildLabel"
-                value="${buildLabel}"/>
-            <property
-                name="archiveName"
-                value="${archiveName}"/>
-        </ant>
-    </target>
-
-    <!-- 
-        Check out map files from repository
-    -->
-    <target
-        name="getMapFiles">
-
-        <!-- for now, get all, at once. May componetize later. -->
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="fetchAllMaps"/>
-    </target>
-
-
-    <!-- 
-        Steps to do before setup
-    -->
-    <target
-        name="preSetup"></target>
-    <!--
-        Steps to do after setup but before starting the build proper
-    -->
-    <target
-        name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}"/>
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}"/>
-
-        <!-- Get the dependencies -->
-        <antcall
-            target="getDependencies"/>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Get the dependencies based on releng maps -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="getDependencies">
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-            <property
-                name="base.install.dir"
-                value="${buildRoot}"/>
-        </ant>
-    </target>
-
-    <!--
-      Steps to do before fetching the build elements
-    -->
-    <target
-        name="preFetch"></target>
-
-    <!-- 
-      Steps to do after fetching the build elements
-    -->
-    <target
-        name="postFetch"></target>
-
-    <!--
-      Steps to do before generating the build scripts.
-    -->
-    <target
-        name="preGenerate"></target>
-
-    <!--
-      Steps to do after generating the build scripts.
-    -->
-    <target
-        name="postGenerate">
-        <echo
-            message="buildDirectory: ${buildDirectory}"/>
-        <customizeAccessRules
-            bundleDirectory="${buildDirectory}/plugins"
-            defaultRules="+org/eclipse/wst/**/*, +org/eclipse/jst/**/*"/>
-    </target>
-    <!--
-        Steps to do before running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include
-                name="**/about.mappings"/>
-        </replace>
-    </target>
-    <!--
-        Steps to do after running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="postProcess">
-        <condition
-            property="logsAvailable">
-            <istrue
-                value="${javacVerbose}"/>
-        </condition>
-        <antcall
-            target="gatherLogs"/>
-    </target>
-
-
-    <!--
-    	Steps to do before running assemble. 
-    -->
-    <target
-        name="preAssemble"></target>
-
-    <!--
-      Steps to do after  running assemble.
-    -->
-    <target
-        name="postAssemble"></target>
-
-    <!--
-      Steps to do after the build is done.
-    -->
-    <target
-        name="postBuild"></target>
-
-    <!--
-      Steps to do to test the build results
-    -->
-    <target
-        name="test"></target>
-
-    <!--
-      Steps to do to publish the build results
-    -->
-    <target
-        name="publish"></target>
-
-    <!--
-      Helper targets
-    -->
-    <target
-        name="gatherLogs"
-        if="logsAvailable">
-        <mkdir
-            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
-        <echo
-            level="debug"
-            message="logExtension: ${logExtension}"/>
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="gatherLogs"/>
-            <param
-                name="logExtension"
-                value="${logExtension}"/>
-        </antcall>
-        <!--
-            workaround: see
-            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-        -->
-        <copy
-            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
-            overwrite="true">
-            <!--
-                we want all @dot.xml files, but assumes a certain
-                structure, to include directory for name of plugin
-            -->
-            <fileset
-                dir="${buildDirectory}/features/">
-                <include
-                    name="**/feature.temp.folder/"/>
-                <exclude
-                    name="**/*tests*feature*/feature.temp.folder/"/>
-            </fileset>
-            <compositemapper>
-                <mapper
-                    type="regexp"
-                    from="(.*)/plugins/(.*)/@dot.xml"
-                    to="/\2/@dot.xml"/>
-                <mapper
-                    type="regexp"
-                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-                    to="/\2/\3bin.xml"/>
-            </compositemapper>
-        </copy>
-    </target>
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="cleanElement"/>
-        </antcall>
-    </target>
-
-    <!--
-      Default target 
-    -->
-    <target
-        name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/jst-sdk/dependency.xml b/releng.wtpbuilder/components/jst-sdk/dependency.xml
deleted file mode 100644
index bfdefe0..0000000
--- a/releng.wtpbuilder/components/jst-sdk/dependency.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-    <target
-        name="get">
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined via {groupId}.url
-        -->
-        <property
-            file="${dependency.properties}"/>
-        <mkdir
-            dir="${buildDirectory}/maps/${env.RELENG}/maps"/>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="orbitthirdpartymap"/>
-            <param
-                name="base.install.dir"
-                value="${buildDirectory}/maps/${env.RELENG}/maps/"/>
-        </antcall>
-        <property
-            name="pde.builder.path"
-            value="${env.BASE_BUILDERS}/${eclipse.builder.version}/${eclipse.builder}"/>
-        <echo
-            level="debug"
-            message="pde.builder.path: ${pde.builder.path}"/>
-        <echo
-            level="debug"
-            message="eclipse.builder.version: ${eclipse.builder.version}"/>
-        <echo
-            level="debug"
-            message="eclipse.builder: ${eclipse.builder}"/>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfvalidation"/>
-        </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="eclipse"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipseTestFramework"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="dita"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstall"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/jst.tests/build.properties b/releng.wtpbuilder/components/jst.tests/build.properties
deleted file mode 100644
index 42b1c42..0000000
--- a/releng.wtpbuilder/components/jst.tests/build.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# This is a subdirectory of $buildDirectory
-# Set collectingFolder and archivePrefix to . if you want to create archives without
-# trailing eclipse in the paths of the included files
-collectingFolder=eclipse
-logExtension=.xml
-# The prefix that will be used in the generated archive.
-# Does not make sense to use a different archivePrefix than collectingFolder, 
-# because zip wouldn't find any files to include into the target zip otherwise
-archivePrefix=eclipse
-
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-##################################################
-# Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
-javacVerbose=true
-
-sign=false
diff --git a/releng.wtpbuilder/components/jst.tests/customTargets.xml b/releng.wtpbuilder/components/jst.tests/customTargets.xml
deleted file mode 100644
index 6d3ce52..0000000
--- a/releng.wtpbuilder/components/jst.tests/customTargets.xml
+++ /dev/null
@@ -1,339 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-    <!--
-        = = = standard properties pattern = = = 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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- let this project specify properties, if not already set -->
-    <property
-        file="build.properties"/>
-    <fail
-        message="dependency.properties must be specified by distribution script"
-        unless="dependency.properties"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set"/>
-    <echo
-        message="buildDirectory: ${buildDirectory}"/>
-    <!--
-        Run a given ${target} on all elements being built Add on <ant>
-        task for each top level element being built.
-    -->
-    <target
-        name="allElements">
-        <echo
-            level="info"
-            message="Target:${target} "/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="info"
-            message="component: ${component}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}"/>
-        <echo
-            level="debug"
-            message="generic target: ${genericTargets}"/>
-        <echo
-            message="compilerArg: ${compilerArg}"/>
-        <echo
-            message="individualSourceBundles: ${individualSourceBundles}"/>
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature"/>
-            <property
-                name="id"
-                value="org.eclipse.jst.tests"/>
-        </ant>
-    </target>
-    <!--
-        Targets to assemble the built elements for particular
-        configurations These generally call the generated assemble
-        scripts (named in ${assembleScriptName}) but may also add pre
-        and post processing Add one target for each root element and
-        each configuration
-    -->
-    <target
-        name="assemble.org.eclipse.jst.tests">
-        <property
-            name="archiveName"
-            value="wtp-jst-Automated-Tests-${buildLabel}.zip"/>
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}"/>
-    </target>
-    <target
-        name="prePackage"/>
-    <target
-        name="postPackage">
-        <property
-            name="archiveName"
-            value="wtp-jst-Automated-Tests-${buildLabel}.zip"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-            <property
-                name="buildLabel"
-                value="${buildLabel}"/>
-            <property
-                name="archiveName"
-                value="${archiveName}"/>
-        </ant>
-    </target>
-
-    <!-- 
-        Check out map files from repository
-    -->
-    <target
-        name="getMapFiles">
-
-        <!-- for now, get all, at once. May componetize later. -->
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="fetchAllMaps"/>
-    </target>
-
-    <!-- 
-        Steps to do before setup
-    -->
-    <target
-        name="preSetup"></target>
-    <!--
-        Steps to do after setup but before starting the build proper
-    -->
-    <target
-        name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}"/>
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}"/>
-
-        <!-- Get the dependencies -->
-        <antcall
-            target="getDependencies"/>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Get the dependencies based on releng maps -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="getDependencies">
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-            <property
-                name="base.install.dir"
-                value="${buildRoot}"/>
-        </ant>
-    </target>
-
-    <!--
-      Steps to do before fetching the build elements
-    -->
-    <target
-        name="preFetch"></target>
-
-    <!-- 
-      Steps to do after fetching the build elements
-    -->
-    <target
-        name="postFetch"></target>
-
-    <!--
-      Steps to do before generating the build scripts.
-    -->
-    <target
-        name="preGenerate"></target>
-
-    <!--
-      Steps to do after generating the build scripts.
-    -->
-    <target
-        name="postGenerate">
-        <echo
-            message="buildDirectory: ${buildDirectory}"/>
-        <customizeAccessRules
-            bundleDirectory="${buildDirectory}/plugins"
-            defaultRules="+org/eclipse/wst/**/*, +org/eclipse/jst/**/*"/>
-    </target>
-    <!--
-        Steps to do before running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include
-                name="**/about.mappings"/>
-        </replace>
-    </target>
-    <!--
-        Steps to do after running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="postProcess">
-        <condition
-            property="logsAvailable">
-            <istrue
-                value="${javacVerbose}"/>
-        </condition>
-        <antcall
-            target="gatherLogs"/>
-    </target>
-
-
-    <!--
-    	Steps to do before running assemble. 
-    -->
-    <target
-        name="preAssemble"></target>
-
-    <!--
-      Steps to do after  running assemble.
-    -->
-    <target
-        name="postAssemble"></target>
-
-    <!--
-      Steps to do after the build is done.
-    -->
-    <target
-        name="postBuild"></target>
-
-
-    <!--
-      Steps to do to test the build results
-    -->
-    <target
-        name="test"></target>
-
-    <!--
-      Steps to do to publish the build results
-    -->
-    <target
-        name="publish"></target>
-
-    <!--
-      Helper targets
-    -->
-    <target
-        name="gatherLogs"
-        if="logsAvailable">
-        <mkdir
-            dir="${buildDirectory}/${buildLabel}/testcompilelogs"/>
-        <echo
-            level="debug"
-            message="logExtension: ${logExtension}"/>
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="gatherLogs"/>
-            <param
-                name="logExtension"
-                value="${logExtension}"/>
-        </antcall>
-        <unzip
-            dest="${buildDirectory}/${buildLabel}/testcompilelogs"
-            overwrite="true">
-            <fileset
-                dir="${buildDirectory}/features/org.eclipse.jst.tests">
-                <include
-                    name="**/*.log.zip"/>
-            </fileset>
-        </unzip>
-        <!--
-            TODO: it is unclear if the above "gather" and unzip do
-            anything constructive. I think not and should be removed
-            (after experimental run, of course.
-        -->
-        <!--
-            workaround: see
-            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-        -->
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testcompilelogs/plugins"
-            overwrite="true">
-            <!--
-                we want all @dot.xml files, but assumes a certain
-                structure, to include directory for name of plugin
-            -->
-            <fileset
-                dir="${buildDirectory}/features/">
-                <include
-                    name="**/*tests*feature*/feature.temp.folder/"/>
-            </fileset>
-            <compositemapper>
-                <mapper
-                    type="regexp"
-                    from="(.*)/plugins/(.*)/@dot.xml"
-                    to="/\2/@dot.xml"/>
-                <mapper
-                    type="regexp"
-                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-                    to="/\2/\3bin.xml"/>
-            </compositemapper>
-        </copy>
-    </target>
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="cleanElement"/>
-        </antcall>
-    </target>
-
-    <!--
-      Default target 
-    -->
-    <target
-        name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/jst.tests/dependency.xml b/releng.wtpbuilder/components/jst.tests/dependency.xml
deleted file mode 100644
index bbf1521..0000000
--- a/releng.wtpbuilder/components/jst.tests/dependency.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-    <target
-        name="get">
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined via {groupId}.url
-        -->
-        <property
-            file="${dependency.properties}"/>
-        <mkdir
-            dir="${buildDirectory}/maps/${env.RELENG}/maps"/>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="orbitthirdpartymap"/>
-            <param
-                name="base.install.dir"
-                value="${buildDirectory}/maps/${env.RELENG}/maps/"/>
-        </antcall>
-        <property
-            name="pde.builder.path"
-            value="${env.BASE_BUILDERS}/${eclipse.builder.version}/${eclipse.builder}"/>
-        <echo
-            level="debug"
-            message="pde.builder.path: ${pde.builder.path}"/>
-        <echo
-            level="debug"
-            message="eclipse.builder.version: ${eclipse.builder.version}"/>
-        <echo
-            level="debug"
-            message="eclipse.builder: ${eclipse.builder}"/>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfvalidation"/>
-        </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="eclipse"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipseTestFramework"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstall"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/jst/build.properties b/releng.wtpbuilder/components/jst/build.properties
deleted file mode 100644
index 99b50ed..0000000
--- a/releng.wtpbuilder/components/jst/build.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# This is a subdirectory of $buildDirectory
-# Set collectingFolder and archivePrefix to . if you want to create archives without
-# trailing eclipse in the paths of the included files
-collectingFolder=eclipse
-logExtension=.xml
-# The prefix that will be used in the generated archive.
-# Does not make sense to use a different archivePrefix than collectingFolder, 
-# because zip wouldn't find any files to include into the target zip otherwise
-archivePrefix=eclipse
-
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-##################################################
-# Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
-javacVerbose=true
-
-sign=true
diff --git a/releng.wtpbuilder/components/jst/customTargets.xml b/releng.wtpbuilder/components/jst/customTargets.xml
deleted file mode 100644
index 6761d46..0000000
--- a/releng.wtpbuilder/components/jst/customTargets.xml
+++ /dev/null
@@ -1,341 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-    <!--
-        = = = standard properties pattern = = = 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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- let this project specify properties, if not already set -->
-    <property
-        file="build.properties"/>
-    <fail
-        message="dependency.properties must be specified by distribution script"
-        unless="dependency.properties"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set"/>
-    <echo
-        message="buildDirectory: ${buildDirectory}"/>
-    <!--
-        Run a given ${target} on all elements being built Add on <ant>
-        task for each top level element being built.
-    -->
-    <target
-        name="allElements">
-        <echo
-            level="info"
-            message="Target:${target} "/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="info"
-            message="component: ${component}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}"/>
-        <echo
-            level="debug"
-            message="generic target: ${genericTargets}"/>
-        <echo
-            message="compilerArg: ${compilerArg}"/>
-        <echo
-            message="individualSourceBundles: ${individualSourceBundles}"/>
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature"/>
-            <property
-                name="id"
-                value="org.eclipse.jst"/>
-        </ant>
-    </target>
-    <!--
-        Targets to assemble the built elements for particular
-        configurations These generally call the generated assemble
-        scripts (named in ${assembleScriptName}) but may also add pre
-        and post processing Add one target for each root element and
-        each configuration
-    -->
-    <target
-        name="assemble.org.eclipse.jst">
-        <property
-            name="archiveName"
-            value="wtp-jst-${buildLabel}.zip"/>
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}"/>
-    </target>
-    <target
-        name="prePackage"/>
-    <target
-        name="postPackage">
-        <property
-            name="archiveName"
-            value="wtp-jst-${buildLabel}.zip"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-            <property
-                name="buildLabel"
-                value="${buildLabel}"/>
-            <property
-                name="archiveName"
-                value="${archiveName}"/>
-        </ant>
-    </target>
-
-    <!-- 
-        Check out map files from repository
-    -->
-    <target
-        name="getMapFiles">
-
-        <!-- for now, get all, at once. May componetize later. -->
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="fetchAllMaps"/>
-    </target>
-
-
-    <!-- 
-        Steps to do before setup
-    -->
-    <target
-        name="preSetup"></target>
-    <!--
-        Steps to do after setup but before starting the build proper
-    -->
-    <target
-        name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}"/>
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}"/>
-
-        <!-- Get the dependencies -->
-        <antcall
-            target="getDependencies"/>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Get the dependencies based on releng maps -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="getDependencies">
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-            <property
-                name="base.install.dir"
-                value="${buildRoot}"/>
-        </ant>
-    </target>
-
-    <!--
-      Steps to do before fetching the build elements
-    -->
-    <target
-        name="preFetch"></target>
-
-    <!-- 
-      Steps to do after fetching the build elements
-    -->
-    <target
-        name="postFetch"></target>
-
-    <!--
-      Steps to do before generating the build scripts.
-    -->
-    <target
-        name="preGenerate"></target>
-
-    <!--
-      Steps to do after generating the build scripts.
-    -->
-    <target
-        name="postGenerate">
-        <echo
-            message="buildDirectory: ${buildDirectory}"/>
-        <customizeAccessRules
-            bundleDirectory="${buildDirectory}/plugins"
-            defaultRules="+org/eclipse/wst/**/*, +org/eclipse/jst/**/*"/>
-    </target>
-    <!--
-        Steps to do before running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include
-                name="**/about.mappings"/>
-        </replace>
-    </target>
-    <!--
-        Steps to do after running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="postProcess">
-        <condition
-            property="logsAvailable">
-            <istrue
-                value="${javacVerbose}"/>
-        </condition>
-        <antcall
-            target="gatherLogs"/>
-    </target>
-
-
-    <!--
-    	Steps to do before running assemble. 
-    -->
-    <target
-        name="preAssemble"></target>
-
-    <!--
-      Steps to do after  running assemble.
-    -->
-    <target
-        name="postAssemble"></target>
-
-    <!--
-      Steps to do after the build is done.
-    -->
-    <target
-        name="postBuild"></target>
-
-    <!--
-      Steps to do to test the build results
-    -->
-    <target
-        name="test"></target>
-
-    <!--
-      Steps to do to publish the build results
-    -->
-    <target
-        name="publish"></target>
-
-    <!--
-      Helper targets
-    -->
-    <target
-        name="gatherLogs"
-        if="logsAvailable">
-        <mkdir
-            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
-        <echo
-            level="debug"
-            message="logExtension: ${logExtension}"/>
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="gatherLogs"/>
-            <param
-                name="logExtension"
-                value="${logExtension}"/>
-        </antcall>
-        <unzip
-            dest="${buildDirectory}/${buildLabel}/compilelogs"
-            overwrite="true">
-            <fileset
-                dir="${buildDirectory}/features/org.eclipse.jst">
-                <include
-                    name="**/*.log.zip"/>
-            </fileset>
-        </unzip>
-        <!--
-            TODO: it is unclear if the above "gather" and unzip do
-            anything constructive. I think not and should be removed
-            (after experimental run, of course.
-        -->
-        <!--
-            workaround: see
-            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-        -->
-        <copy
-            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
-            overwrite="true">
-            <!--
-                we want all @dot.xml files, but assumes a certain
-                structure, to include directory for name of plugin
-            -->
-            <fileset
-                dir="${buildDirectory}/features/">
-                <include
-                    name="**/feature.temp.folder/"/>
-                <exclude
-                    name="**/*tests*feature*/feature.temp.folder/"/>
-            </fileset>
-            <compositemapper>
-                <mapper
-                    type="regexp"
-                    from="(.*)/plugins/(.*)/@dot.xml"
-                    to="/\2/@dot.xml"/>
-                <mapper
-                    type="regexp"
-                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-                    to="/\2/\3bin.xml"/>
-            </compositemapper>
-        </copy>
-    </target>
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="cleanElement"/>
-        </antcall>
-    </target>
-
-    <!--
-      Default target 
-    -->
-    <target
-        name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/jst/dependency.xml b/releng.wtpbuilder/components/jst/dependency.xml
deleted file mode 100644
index bfdefe0..0000000
--- a/releng.wtpbuilder/components/jst/dependency.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-    <target
-        name="get">
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined via {groupId}.url
-        -->
-        <property
-            file="${dependency.properties}"/>
-        <mkdir
-            dir="${buildDirectory}/maps/${env.RELENG}/maps"/>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="orbitthirdpartymap"/>
-            <param
-                name="base.install.dir"
-                value="${buildDirectory}/maps/${env.RELENG}/maps/"/>
-        </antcall>
-        <property
-            name="pde.builder.path"
-            value="${env.BASE_BUILDERS}/${eclipse.builder.version}/${eclipse.builder}"/>
-        <echo
-            level="debug"
-            message="pde.builder.path: ${pde.builder.path}"/>
-        <echo
-            level="debug"
-            message="eclipse.builder.version: ${eclipse.builder.version}"/>
-        <echo
-            level="debug"
-            message="eclipse.builder: ${eclipse.builder}"/>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfvalidation"/>
-        </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="eclipse"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipseTestFramework"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="dita"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstall"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/pave/build.properties b/releng.wtpbuilder/components/pave/build.properties
deleted file mode 100644
index 5bed879..0000000
--- a/releng.wtpbuilder/components/pave/build.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# This is a subdirectory of $buildDirectory
-# Set collectingFolder and archivePrefix to . if you want to create archives without
-# trailing eclipse in the paths of the included files
-collectingFolder=eclipse
-logExtension=.xml
-# The prefix that will be used in the generated archive.
-# Does not make sense to use a different archivePrefix than collectingFolder, 
-# because zip wouldn't find any files to include into the target zip otherwise
-archivePrefix=eclipse
-
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-##################################################
-# Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
-javacVerbose=true
-
-sign=true
-
-#############################################################
-
-# Properties introduced in 3.5 M3 (PDE base builder R35_M2). See
-# http://aniefer.blogspot.com/2008/10/sorting-bundles-and-parallel.html
-
-flattenDependencies=true
-parallelCompilation=true
-
-
diff --git a/releng.wtpbuilder/components/pave/customTargets.xml b/releng.wtpbuilder/components/pave/customTargets.xml
deleted file mode 100644
index 3bb6aea..0000000
--- a/releng.wtpbuilder/components/pave/customTargets.xml
+++ /dev/null
@@ -1,356 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-    <!--
-        = = = standard properties pattern = = = 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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- let this project specify properties, if not already set -->
-    <property
-        file="build.properties"/>
-    <fail
-        message="dependency.properties must be specified by distribution script"
-        unless="dependency.properties"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set"/>
-    <echo
-        message="buildDirectory: ${buildDirectory}"/>
-    <!--
-        Run a given ${target} on all elements being built Add on <ant>
-        task for each top level element being built.
-    -->
-    <target
-        name="allElements">
-        <echo
-            level="info"
-            message="Target:${target} "/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="info"
-            message="component: ${component}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}"/>
-        <echo
-            level="debug"
-            message="generic target: ${genericTargets}"/>
-        <echo
-            message="compilerArg: ${compilerArg}"/>
-        <echo
-            message="individualSourceBundles: ${individualSourceBundles}"/>
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature"/>
-            <property
-                name="id"
-                value="org.eclipse.pave.feature"/>
-        </ant>
-    </target>
-    <!--
-        Targets to assemble the built elements for particular
-        configurations These generally call the generated assemble
-        scripts (named in ${assembleScriptName}) but may also add pre
-        and post processing Add one target for each root element and
-        each configuration
-    -->
-    <target
-        name="assemble.org.eclipse.pave.feature">
-        <property
-            name="archiveName"
-            value="wtp-incubator-pave-${buildLabel}.zip"/>
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}"/>
-    </target>
-    <target
-        name="prePackage"/>
-    <target
-        name="postPackage">
-        <property
-            name="archiveName"
-            value="wtp-incubator-pave-${buildLabel}.zip"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-            <property
-                name="buildLabel"
-                value="${buildLabel}"/>
-            <property
-                name="archiveName"
-                value="${archiveName}"/>
-        </ant>
-    </target>
-
-    <!-- 
-        Check out map files from repository
-    -->
-    <target
-        name="getMapFiles">
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENG}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENGPAVE}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-    </target>
-
-
-    <!-- 
-        Steps to do before setup
-    -->
-    <target
-        name="preSetup"></target>
-    <!--
-        Steps to do after setup but before starting the build proper
-    -->
-    <target
-        name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}"/>
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}"/>
-
-        <!-- Get the dependencies -->
-        <antcall
-            target="getDependencies"/>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Get the dependencies based on releng maps -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="getDependencies">
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-            <property
-                name="base.install.dir"
-                value="${buildRoot}"/>
-        </ant>
-    </target>
-
-    <!--
-      Steps to do before fetching the build elements
-    -->
-    <target
-        name="preFetch"></target>
-
-    <!-- 
-      Steps to do after fetching the build elements
-    -->
-    <target
-        name="postFetch"></target>
-
-    <!--
-      Steps to do before generating the build scripts.
-    -->
-    <target
-        name="preGenerate"></target>
-
-    <!--
-      Steps to do after generating the build scripts.
-    -->
-    <target
-        name="postGenerate">
-        <echo
-            message="buildDirectory: ${buildDirectory}"/>
-        <customizeAccessRules
-            bundleDirectory="${buildDirectory}/plugins"/>
-    </target>
-    <!--
-        Steps to do before running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include
-                name="**/about.mappings"/>
-        </replace>
-    </target>
-    <!--
-        Steps to do after running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="postProcess">
-        <condition
-            property="logsAvailable">
-            <istrue
-                value="${javacVerbose}"/>
-        </condition>
-        <antcall
-            target="gatherLogs"/>
-    </target>
-
-
-    <!--
-      Steps to do before running assemble. 
-    -->
-    <target
-        name="preAssemble"></target>
-
-    <!--
-      Steps to do after  running assemble.
-    -->
-    <target
-        name="postAssemble"></target>
-
-    <!--
-      Steps to do after the build is done.
-    -->
-    <target
-        name="postBuild"></target>
-
-    <!--
-      Steps to do to test the build results
-    -->
-    <target
-        name="test"></target>
-
-    <!--
-      Steps to do to publish the build results
-    -->
-    <target
-        name="publish"></target>
-
-    <!--
-      Helper targets
-    -->
-	    <target
-	        name="gatherLogs"
-	        if="logsAvailable">
-	        <mkdir
-	            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
-	        <echo
-	            level="debug"
-	            message="logExtension: ${logExtension}"/>
-	        <antcall
-	            target="allElements">
-	            <param
-	                name="target"
-	                value="gatherLogs"/>
-	            <param
-	                name="logExtension"
-	                value="${logExtension}"/>
-	        </antcall>
-	        <unzip
-	            dest="${buildDirectory}/${buildLabel}/compilelogs"
-	            overwrite="true">
-	            <fileset
-                dir="${buildDirectory}/features/org.eclipse.pave.feature">
-	                <include
-	                    name="**/*.log.zip"/>
-	            </fileset>
-	        </unzip>
-	        <!--
-	            TODO: it is unclear if the above "gather" and unzip do
-	            anything constructive. I think not and should be removed
-	            (after experimental run, of course.
-	        -->
-	        <!--
-	            workaround: see
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-	        -->
-	        <copy
-	            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
-	            overwrite="true">
-	            <!--
-	                we want all @dot.xml files, but assumes a certain
-	                structure, to include directory for name of plugin
-	            -->
-	            <fileset
-	                dir="${buildDirectory}/features/">
-	                <include
-	                    name="**/feature.temp.folder/"/>
-	                <exclude
-	                    name="**/*tests*feature*/feature.temp.folder/" />
-	                     
-	            </fileset>
-	            <compositemapper>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/@dot.xml"
-	                    to="/\2/@dot.xml"/>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-	                    to="/\2/\3bin.xml"/>
-	            </compositemapper>
-	        </copy>
-	    </target>
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="cleanElement"/>
-        </antcall>
-    </target>
-
-    <!--
-      Default target 
-    -->
-    <target
-        name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/pave/dependency.xml b/releng.wtpbuilder/components/pave/dependency.xml
deleted file mode 100644
index fe961cb..0000000
--- a/releng.wtpbuilder/components/pave/dependency.xml
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-        <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-        
-    <condition
-        property="getprereq.eclipse">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.eclipseplatform">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.emf">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.emfxsd">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.emfvalidation">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.gef">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.dtp">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.wst">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.jst">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.wtp">
-        <istrue
-            value="true"/>
-    </condition>
-    <target
-        name="get">
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined, which we do later with
-            statements such if="${groupId}.url"
-        -->
-        <property
-            file="${dependency.properties}"/>
-        <antcall
-            target="prereq.eclipse"/>
-        <antcall
-            target="prereq.eclipseplatform"/>
-        <antcall
-            target="prereq.emf"/>
-        <antcall
-            target="prereq.emfxsd"/>
-        <antcall
-            target="prereq.emfvalidation"/>
-        <antcall
-            target="prereq.gef"/>
-        <antcall
-            target="prereq.dtp"/>
-        <antcall
-            target="prereq.wst"/>
-        <antcall
-            target="prereq.jst"/>
-        <antcall
-            target="prereq.wtp"/>
-    </target>
-    <target
-        name="prereq.eclipse"
-        if="getprereq.eclipse">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.eclipseplatform"
-        if="getprereq.eclipseplatform">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipseplatform"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emf"
-        if="getprereq.emf">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfxsd"
-        if="getprereq.emfxsd">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfvalidation"
-        if="getprereq.emfvalidation">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfvalidation"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.gef"
-        if="getprereq.gef">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.dtp"
-        if="getprereq.dtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="dtp"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wst"
-        if="getprereq.wst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.jst"
-        if="getprereq.jst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="jst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wtp"
-        if="getprereq.wtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstall"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/pave_sdk/build.properties b/releng.wtpbuilder/components/pave_sdk/build.properties
deleted file mode 100644
index 5bed879..0000000
--- a/releng.wtpbuilder/components/pave_sdk/build.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# This is a subdirectory of $buildDirectory
-# Set collectingFolder and archivePrefix to . if you want to create archives without
-# trailing eclipse in the paths of the included files
-collectingFolder=eclipse
-logExtension=.xml
-# The prefix that will be used in the generated archive.
-# Does not make sense to use a different archivePrefix than collectingFolder, 
-# because zip wouldn't find any files to include into the target zip otherwise
-archivePrefix=eclipse
-
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-##################################################
-# Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
-javacVerbose=true
-
-sign=true
-
-#############################################################
-
-# Properties introduced in 3.5 M3 (PDE base builder R35_M2). See
-# http://aniefer.blogspot.com/2008/10/sorting-bundles-and-parallel.html
-
-flattenDependencies=true
-parallelCompilation=true
-
-
diff --git a/releng.wtpbuilder/components/pave_sdk/customTargets.xml b/releng.wtpbuilder/components/pave_sdk/customTargets.xml
deleted file mode 100644
index 1a2aefd..0000000
--- a/releng.wtpbuilder/components/pave_sdk/customTargets.xml
+++ /dev/null
@@ -1,356 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-    <!--
-        = = = standard properties pattern = = = 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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- let this project specify properties, if not already set -->
-    <property
-        file="build.properties"/>
-    <fail
-        message="dependency.properties must be specified by distribution script"
-        unless="dependency.properties"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set"/>
-    <echo
-        message="buildDirectory: ${buildDirectory}"/>
-    <!--
-        Run a given ${target} on all elements being built Add on <ant>
-        task for each top level element being built.
-    -->
-    <target
-        name="allElements">
-        <echo
-            level="info"
-            message="Target:${target} "/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="info"
-            message="component: ${component}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}"/>
-        <echo
-            level="debug"
-            message="generic target: ${genericTargets}"/>
-        <echo
-            message="compilerArg: ${compilerArg}"/>
-        <echo
-            message="individualSourceBundles: ${individualSourceBundles}"/>
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature"/>
-            <property
-                name="id"
-                value="org.eclipse.pave_sdk.feature"/>
-        </ant>
-    </target>
-    <!--
-        Targets to assemble the built elements for particular
-        configurations These generally call the generated assemble
-        scripts (named in ${assembleScriptName}) but may also add pre
-        and post processing Add one target for each root element and
-        each configuration
-    -->
-    <target
-        name="assemble.org.eclipse.pave_sdk.feature">
-        <property
-            name="archiveName"
-            value="wtp-incubator-pave-sdk-${buildLabel}.zip"/>
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}"/>
-    </target>
-    <target
-        name="prePackage"/>
-    <target
-        name="postPackage">
-        <property
-            name="archiveName"
-            value="wtp-incubator-pave-sdk-${buildLabel}.zip"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-            <property
-                name="buildLabel"
-                value="${buildLabel}"/>
-            <property
-                name="archiveName"
-                value="${archiveName}"/>
-        </ant>
-    </target>
-
-    <!--
-        Check out map files from repository
-        -->
-    <target
-        name="getMapFiles">
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENG}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENGPAVE}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-    </target>
-
-
-    <!-- 
-        Steps to do before setup
-    -->
-    <target
-        name="preSetup"></target>
-    <!--
-        Steps to do after setup but before starting the build proper
-    -->
-    <target
-        name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}"/>
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}"/>
-
-        <!-- Get the dependencies -->
-        <antcall
-            target="getDependencies"/>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Get the dependencies based on releng maps -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="getDependencies">
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-            <property
-                name="base.install.dir"
-                value="${buildRoot}"/>
-        </ant>
-    </target>
-
-    <!--
-      Steps to do before fetching the build elements
-    -->
-    <target
-        name="preFetch"></target>
-
-    <!-- 
-      Steps to do after fetching the build elements
-    -->
-    <target
-        name="postFetch"></target>
-
-    <!--
-      Steps to do before generating the build scripts.
-    -->
-    <target
-        name="preGenerate"></target>
-
-    <!--
-      Steps to do after generating the build scripts.
-    -->
-    <target
-        name="postGenerate">
-        <echo
-            message="buildDirectory: ${buildDirectory}"/>
-        <customizeAccessRules
-            bundleDirectory="${buildDirectory}/plugins"/>
-    </target>
-    <!--
-        Steps to do before running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include
-                name="**/about.mappings"/>
-        </replace>
-    </target>
-    <!--
-        Steps to do after running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="postProcess">
-        <condition
-            property="logsAvailable">
-            <istrue
-                value="${javacVerbose}"/>
-        </condition>
-        <antcall
-            target="gatherLogs"/>
-    </target>
-
-
-    <!--
-      Steps to do before running assemble. 
-        -->
-    <target
-        name="preAssemble"></target>
-
-    <!--
-      Steps to do after  running assemble.
-    -->
-    <target
-        name="postAssemble"></target>
-
-    <!--
-      Steps to do after the build is done.
-    -->
-    <target
-        name="postBuild"></target>
-
-    <!--
-      Steps to do to test the build results
-    -->
-    <target
-        name="test"></target>
-
-    <!--
-      Steps to do to publish the build results
-    -->
-    <target
-        name="publish"></target>
-
-    <!--
-      Helper targets
-    -->
-	    <target
-	        name="gatherLogs"
-	        if="logsAvailable">
-	        <mkdir
-	            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
-	        <echo
-	            level="debug"
-	            message="logExtension: ${logExtension}"/>
-	        <antcall
-	            target="allElements">
-	            <param
-	                name="target"
-	                value="gatherLogs"/>
-	            <param
-	                name="logExtension"
-	                value="${logExtension}"/>
-	        </antcall>
-	        <unzip
-	            dest="${buildDirectory}/${buildLabel}/compilelogs"
-	            overwrite="true">
-	            <fileset
-                dir="${buildDirectory}/features/org.eclipse.pave_sdk.feature">
-	                <include
-	                    name="**/*.log.zip"/>
-	            </fileset>
-	        </unzip>
-	        <!--
-	            TODO: it is unclear if the above "gather" and unzip do
-	            anything constructive. I think not and should be removed
-	            (after experimental run, of course.
-	        -->
-	        <!--
-	            workaround: see
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-	        -->
-	        <copy
-	            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
-	            overwrite="true">
-	            <!--
-	                we want all @dot.xml files, but assumes a certain
-	                structure, to include directory for name of plugin
-	            -->
-	            <fileset
-	                dir="${buildDirectory}/features/">
-	                <include
-	                    name="**/feature.temp.folder/"/>
-	                <exclude
-	                    name="**/*tests*feature*/feature.temp.folder/" />
-	                     
-	            </fileset>
-	            <compositemapper>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/@dot.xml"
-	                    to="/\2/@dot.xml"/>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-	                    to="/\2/\3bin.xml"/>
-	            </compositemapper>
-	        </copy>
-	    </target>
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="cleanElement"/>
-        </antcall>
-    </target>
-
-    <!--
-      Default target 
-    -->
-    <target
-        name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/pave_sdk/dependency.xml b/releng.wtpbuilder/components/pave_sdk/dependency.xml
deleted file mode 100644
index ce8708f..0000000
--- a/releng.wtpbuilder/components/pave_sdk/dependency.xml
+++ /dev/null
@@ -1,225 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-        <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-        
-	    <condition
-	        property="getprereq.eclipse">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.eclipseplatform">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emf">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfxsd">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfvalidation">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.gef">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.dtp">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.jst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wtp">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	            	
-    <target
-        name="get">
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined, which we do later with
-            statements such if="${groupId}.url"
-        -->
-        <property
-            file="${dependency.properties}"/>
-        <antcall
-            target="prereq.eclipse"/>
-        <antcall
-            target="prereq.eclipseplatform"/>
-        <antcall
-            target="prereq.emf"/>
-        <antcall
-            target="prereq.emfxsd"/>
-        <antcall
-            target="prereq.emfvalidation"/>
-        <antcall
-            target="prereq.gef"/>
-        <antcall
-            target="prereq.dtp"/>
-        <antcall
-            target="prereq.wst"/>
-        <antcall
-            target="prereq.jst"/>
-        <antcall
-            target="prereq.wtp"/>
-    </target>
-    <target
-        name="prereq.eclipse"
-        if="getprereq.eclipse">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.eclipseplatform"
-        if="getprereq.eclipseplatform">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipseplatform"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emf"
-        if="getprereq.emf">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfxsd"
-        if="getprereq.emfxsd">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfvalidation"
-        if="getprereq.emfvalidation">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfvalidation"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.gef"
-        if="getprereq.gef">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.dtp"
-        if="getprereq.dtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="dtp"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wst"
-        if="getprereq.wst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.jst"
-        if="getprereq.jst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="jst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wtp"
-        if="getprereq.wtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstall"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/pave_tests/build.properties b/releng.wtpbuilder/components/pave_tests/build.properties
deleted file mode 100644
index 4d26330..0000000
--- a/releng.wtpbuilder/components/pave_tests/build.properties
+++ /dev/null
@@ -1,46 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# This is a subdirectory of $buildDirectory
-# Set collectingFolder and archivePrefix to . if you want to create archives without
-# trailing eclipse in the paths of the included files
-collectingFolder=eclipse
-logExtension=.xml
-# The prefix that will be used in the generated archive.
-# Does not make sense to use a different archivePrefix than collectingFolder, 
-# because zip wouldn't find any files to include into the target zip otherwise
-archivePrefix=eclipse
-
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-##################################################
-# Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
-javacVerbose=true
-
-sign=false
-
-#############################################################
-
-# Properties introduced in 3.5 M3 (PDE base builder R35_M2). See
-# http://aniefer.blogspot.com/2008/10/sorting-bundles-and-parallel.html
-
-flattenDependencies=true
-parallelCompilation=true
-
diff --git a/releng.wtpbuilder/components/pave_tests/customTargets.xml b/releng.wtpbuilder/components/pave_tests/customTargets.xml
deleted file mode 100644
index 0cd8929..0000000
--- a/releng.wtpbuilder/components/pave_tests/customTargets.xml
+++ /dev/null
@@ -1,356 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-    <!--
-        = = = standard properties pattern = = = 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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- let this project specify properties, if not already set -->
-    <property
-        file="build.properties"/>
-    <fail
-        message="dependency.properties must be specified by distribution script"
-        unless="dependency.properties"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set"/>
-    <echo
-        message="buildDirectory: ${buildDirectory}"/>
-    <!--
-        Run a given ${target} on all elements being built Add on <ant>
-        task for each top level element being built.
-    -->
-    <target
-        name="allElements">
-        <echo
-            level="info"
-            message="Target:${target} "/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="info"
-            message="component: ${component}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}"/>
-        <echo
-            level="debug"
-            message="generic target: ${genericTargets}"/>
-        <echo
-            message="compilerArg: ${compilerArg}"/>
-        <echo
-            message="individualSourceBundles: ${individualSourceBundles}"/>
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature"/>
-            <property
-                name="id"
-                value="org.eclipse.pave_tests.feature"/>
-        </ant>
-    </target>
-    <!--
-        Targets to assemble the built elements for particular
-        configurations These generally call the generated assemble
-        scripts (named in ${assembleScriptName}) but may also add pre
-        and post processing Add one target for each root element and
-        each configuration
-    -->
-    <target
-        name="assemble.org.eclipse.pave_tests.feature">
-        <property
-            name="archiveName"
-            value="wtp-incubator-pave-tests-${buildLabel}.zip"/>
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}"/>
-    </target>
-    <target
-        name="prePackage"/>
-    <target
-        name="postPackage">
-        <property
-            name="archiveName"
-            value="wtp-incubator-pave-tests-${buildLabel}.zip"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-            <property
-                name="buildLabel"
-                value="${buildLabel}"/>
-            <property
-                name="archiveName"
-                value="${archiveName}"/>
-        </ant>
-    </target>
-
-    <!-- 
-        Check out map files from repository
-    -->
-    <target
-        name="getMapFiles">
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENG}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENGPAVE}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-    </target>
-
-
-    <!-- 
-        Steps to do before setup
-    -->
-    <target
-        name="preSetup"></target>
-    <!--
-        Steps to do after setup but before starting the build proper
-    -->
-    <target
-        name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}"/>
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}"/>
-
-        <!-- Get the dependencies -->
-        <antcall
-            target="getDependencies"/>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Get the dependencies based on releng maps -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="getDependencies">
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-            <property
-                name="base.install.dir"
-                value="${buildRoot}"/>
-        </ant>
-    </target>
-
-    <!--
-      Steps to do before fetching the build elements
-    -->
-    <target
-        name="preFetch"></target>
-
-    <!-- 
-      Steps to do after fetching the build elements
-    -->
-    <target
-        name="postFetch"></target>
-
-    <!--
-      Steps to do before generating the build scripts.
-    -->
-    <target
-        name="preGenerate"></target>
-
-    <!--
-      Steps to do after generating the build scripts.
-    -->
-    <target
-        name="postGenerate">
-        <echo
-            message="buildDirectory: ${buildDirectory}"/>
-        <customizeAccessRules
-            bundleDirectory="${buildDirectory}/plugins"/>
-    </target>
-    <!--
-        Steps to do before running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include
-                name="**/about.mappings"/>
-        </replace>
-    </target>
-    <!--
-        Steps to do after running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="postProcess">
-        <condition
-            property="logsAvailable">
-            <istrue
-                value="${javacVerbose}"/>
-        </condition>
-        <antcall
-            target="gatherLogs"/>
-    </target>
-
-
-    <!--
-      Steps to do before running assemble. 
-        -->
-    <target
-        name="preAssemble"></target>
-
-    <!--
-      Steps to do after  running assemble.
-    -->
-    <target
-        name="postAssemble"></target>
-
-    <!--
-      Steps to do after the build is done.
-    -->
-    <target
-        name="postBuild"></target>
-
-    <!--
-      Steps to do to test the build results
-    -->
-    <target
-        name="test"></target>
-
-    <!--
-      Steps to do to publish the build results
-    -->
-    <target
-        name="publish"></target>
-
-    <!--
-      Helper targets
-    -->
-	    <target
-	        name="gatherLogs"
-	        if="logsAvailable">
-	        <mkdir
-            dir="${buildDirectory}/${buildLabel}/testcompilelogs"/>
-	        <echo
-	            level="debug"
-	            message="logExtension: ${logExtension}"/>
-	        <antcall
-	            target="allElements">
-	            <param
-	                name="target"
-	                value="gatherLogs"/>
-	            <param
-	                name="logExtension"
-	                value="${logExtension}"/>
-	        </antcall>
-	        <unzip
-            dest="${buildDirectory}/${buildLabel}/testcompilelogs"
-            overwrite="true">
-	            <fileset
-                dir="${buildDirectory}/features/org.eclipse.pave_tests.feature">
-	                <include
-	                    name="**/*.log.zip"/>
-	            </fileset>
-	        </unzip>
-	        <!--
-	            TODO: it is unclear if the above "gather" and unzip do
-	            anything constructive. I think not and should be removed
-	            (after experimental run, of course.
-	        -->
-	        <!--
-	            workaround: see
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-	        -->
-	        <copy
-	            todir="${buildDirectory}/${buildLabel}/testcompilelogs/plugins"
-	            overwrite="true">
-	            <!--
-	                we want all @dot.xml files, but assumes a certain
-	                structure, to include directory for name of plugin
-	            -->
-	            <fileset
-	                dir="${buildDirectory}/features/">
-	                <include
-	                    name="**/feature.temp.folder/"/>
-	                <exclude
-	                    name="**/*tests*feature*/feature.temp.folder/" />
-	                     
-	            </fileset>
-	            <compositemapper>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/@dot.xml"
-	                    to="/\2/@dot.xml"/>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-	                    to="/\2/\3bin.xml"/>
-	            </compositemapper>
-	        </copy>
-	    </target>
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="cleanElement"/>
-        </antcall>
-    </target>
-
-    <!--
-      Default target 
-    -->
-    <target
-        name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/pave_tests/dependency.xml b/releng.wtpbuilder/components/pave_tests/dependency.xml
deleted file mode 100644
index 12ba4e8..0000000
--- a/releng.wtpbuilder/components/pave_tests/dependency.xml
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-        <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-        
-	    <condition
-	        property="getprereq.eclipse">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.eclipseplatform">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emf">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfxsd">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfvalidation">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.gef">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.dtp">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.jst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wtp">
-	        <istrue
-	            value="true"/>
-	    </condition>
-    <target
-        name="get">
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined, which we do later with
-            statements such if="${groupId}.url"
-        -->
-        <property
-            file="${dependency.properties}"/>
-        <antcall
-            target="prereq.eclipse"/>
-        <antcall
-            target="prereq.eclipseplatform"/>
-        <antcall
-            target="prereq.emf"/>
-        <antcall
-            target="prereq.emfxsd"/>
-        <antcall
-            target="prereq.emfvalidation"/>
-        <antcall
-            target="prereq.gef"/>
-        <antcall
-            target="prereq.dtp"/>
-        <antcall
-            target="prereq.wst"/>
-        <antcall
-            target="prereq.jst"/>
-        <antcall
-            target="prereq.wtp"/>
-       <antcall
-           target="getAndInstall">
-           <param
-               name="groupId"
-               value="eclipseTestFramework"/>    
-       	</antcall>
-    </target>
-    <target
-        name="prereq.eclipse"
-        if="getprereq.eclipse">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.eclipseplatform"
-        if="getprereq.eclipseplatform">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipseplatform"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emf"
-        if="getprereq.emf">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfxsd"
-        if="getprereq.emfxsd">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfvalidation"
-        if="getprereq.emfvalidation">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfvalidation"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.gef"
-        if="getprereq.gef">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.dtp"
-        if="getprereq.dtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="dtp"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wst"
-        if="getprereq.wst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.jst"
-        if="getprereq.jst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="jst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wtp"
-        if="getprereq.wtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstall"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/servadapt/build.properties b/releng.wtpbuilder/components/servadapt/build.properties
deleted file mode 100644
index 5bed879..0000000
--- a/releng.wtpbuilder/components/servadapt/build.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# This is a subdirectory of $buildDirectory
-# Set collectingFolder and archivePrefix to . if you want to create archives without
-# trailing eclipse in the paths of the included files
-collectingFolder=eclipse
-logExtension=.xml
-# The prefix that will be used in the generated archive.
-# Does not make sense to use a different archivePrefix than collectingFolder, 
-# because zip wouldn't find any files to include into the target zip otherwise
-archivePrefix=eclipse
-
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-##################################################
-# Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
-javacVerbose=true
-
-sign=true
-
-#############################################################
-
-# Properties introduced in 3.5 M3 (PDE base builder R35_M2). See
-# http://aniefer.blogspot.com/2008/10/sorting-bundles-and-parallel.html
-
-flattenDependencies=true
-parallelCompilation=true
-
-
diff --git a/releng.wtpbuilder/components/servadapt/customTargets.xml b/releng.wtpbuilder/components/servadapt/customTargets.xml
deleted file mode 100644
index 6588249..0000000
--- a/releng.wtpbuilder/components/servadapt/customTargets.xml
+++ /dev/null
@@ -1,356 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-    <!--
-        = = = standard properties pattern = = = 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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- let this project specify properties, if not already set -->
-    <property
-        file="build.properties"/>
-    <fail
-        message="dependency.properties must be specified by distribution script"
-        unless="dependency.properties"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set"/>
-    <echo
-        message="buildDirectory: ${buildDirectory}"/>
-    <!--
-        Run a given ${target} on all elements being built Add on <ant>
-        task for each top level element being built.
-    -->
-    <target
-        name="allElements">
-        <echo
-            level="info"
-            message="Target:${target} "/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="info"
-            message="component: ${component}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}"/>
-        <echo
-            level="debug"
-            message="generic target: ${genericTargets}"/>
-        <echo
-            message="compilerArg: ${compilerArg}"/>
-        <echo
-            message="individualSourceBundles: ${individualSourceBundles}"/>
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature"/>
-            <property
-                name="id"
-                value="org.eclipse.jst.server_adapters.ext.feature"/>
-        </ant>
-    </target>
-    <!--
-        Targets to assemble the built elements for particular
-        configurations These generally call the generated assemble
-        scripts (named in ${assembleScriptName}) but may also add pre
-        and post processing Add one target for each root element and
-        each configuration
-    -->
-    <target
-        name="assemble.org.eclipse.jst.server_adapters.ext.feature">
-        <property
-            name="archiveName"
-            value="wtp-server-adapters-${buildLabel}.zip"/>
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}"/>
-    </target>
-    <target
-        name="prePackage"/>
-    <target
-        name="postPackage">
-        <property
-            name="archiveName"
-            value="wtp-server-adapters-${buildLabel}.zip"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-            <property
-                name="buildLabel"
-                value="${buildLabel}"/>
-            <property
-                name="archiveName"
-                value="${archiveName}"/>
-        </ant>
-    </target>
-
-    <!-- 
-        Check out map files from repository
-    -->
-    <target
-        name="getMapFiles">
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENG}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENGSERVERTOOLS}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-    </target>
-
-
-    <!-- 
-        Steps to do before setup
-    -->
-    <target
-        name="preSetup"></target>
-    <!--
-        Steps to do after setup but before starting the build proper
-    -->
-    <target
-        name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}"/>
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}"/>
-
-        <!-- Get the dependencies -->
-        <antcall
-            target="getDependencies"/>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Get the dependencies based on releng maps -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="getDependencies">
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-            <property
-                name="base.install.dir"
-                value="${buildRoot}"/>
-        </ant>
-    </target>
-
-    <!--
-      Steps to do before fetching the build elements
-    -->
-    <target
-        name="preFetch"></target>
-
-    <!-- 
-      Steps to do after fetching the build elements
-    -->
-    <target
-        name="postFetch"></target>
-
-    <!--
-      Steps to do before generating the build scripts.
-    -->
-    <target
-        name="preGenerate"></target>
-
-    <!--
-      Steps to do after generating the build scripts.
-    -->
-    <target
-        name="postGenerate">
-        <echo
-            message="buildDirectory: ${buildDirectory}"/>
-        <customizeAccessRules
-            bundleDirectory="${buildDirectory}/plugins"/>
-    </target>
-    <!--
-        Steps to do before running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include
-                name="**/about.mappings"/>
-        </replace>
-    </target>
-    <!--
-        Steps to do after running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="postProcess">
-        <condition
-            property="logsAvailable">
-            <istrue
-                value="${javacVerbose}"/>
-        </condition>
-        <antcall
-            target="gatherLogs"/>
-    </target>
-
-
-    <!--
-      Steps to do before running assemble. 
-    -->
-    <target
-        name="preAssemble"></target>
-
-    <!--
-      Steps to do after  running assemble.
-    -->
-    <target
-        name="postAssemble"></target>
-
-    <!--
-      Steps to do after the build is done.
-    -->
-    <target
-        name="postBuild"></target>
-
-    <!--
-      Steps to do to test the build results
-    -->
-    <target
-        name="test"></target>
-
-    <!--
-      Steps to do to publish the build results
-    -->
-    <target
-        name="publish"></target>
-
-    <!--
-      Helper targets
-    -->
-	    <target
-	        name="gatherLogs"
-	        if="logsAvailable">
-	        <mkdir
-	            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
-	        <echo
-	            level="debug"
-	            message="logExtension: ${logExtension}"/>
-	        <antcall
-	            target="allElements">
-	            <param
-	                name="target"
-	                value="gatherLogs"/>
-	            <param
-	                name="logExtension"
-	                value="${logExtension}"/>
-	        </antcall>
-	        <unzip
-	            dest="${buildDirectory}/${buildLabel}/compilelogs"
-	            overwrite="true">
-	            <fileset
-                dir="${buildDirectory}/features/org.eclipse.jst.server_adapters.ext.feature">
-	                <include
-	                    name="**/*.log.zip"/>
-	            </fileset>
-	        </unzip>
-	        <!--
-	            TODO: it is unclear if the above "gather" and unzip do
-	            anything constructive. I think not and should be removed
-	            (after experimental run, of course.
-	        -->
-	        <!--
-	            workaround: see
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-	        -->
-	        <copy
-	            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
-	            overwrite="true">
-	            <!--
-	                we want all @dot.xml files, but assumes a certain
-	                structure, to include directory for name of plugin
-	            -->
-	            <fileset
-	                dir="${buildDirectory}/features/">
-	                <include
-	                    name="**/feature.temp.folder/"/>
-	                <exclude
-	                    name="**/*tests*feature*/feature.temp.folder/" />
-	                     
-	            </fileset>
-	            <compositemapper>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/@dot.xml"
-	                    to="/\2/@dot.xml"/>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-	                    to="/\2/\3bin.xml"/>
-	            </compositemapper>
-	        </copy>
-	    </target>
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="cleanElement"/>
-        </antcall>
-    </target>
-
-    <!--
-      Default target 
-    -->
-    <target
-        name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/servadapt/dependency.xml b/releng.wtpbuilder/components/servadapt/dependency.xml
deleted file mode 100644
index 3aa2d0b..0000000
--- a/releng.wtpbuilder/components/servadapt/dependency.xml
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-        <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-        
-    <condition
-        property="getprereq.eclipse">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.eclipseplatform">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.emf">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.emfxsd">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.emfvalidation">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.gef">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.dtp">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.wst">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.jst">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.wtp">
-        <istrue
-            value="false"/>
-    </condition>
-    <target
-        name="get">
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined, which we do later with
-            statements such if="${groupId}.url"
-        -->
-        <property
-            file="${dependency.properties}"/>
-        <antcall
-            target="prereq.eclipse"/>
-        <antcall
-            target="prereq.eclipseplatform"/>
-        <antcall
-            target="prereq.emf"/>
-        <antcall
-            target="prereq.emfxsd"/>
-        <antcall
-            target="prereq.emfvalidation"/>
-        <antcall
-            target="prereq.gef"/>
-        <antcall
-            target="prereq.dtp"/>
-        <antcall
-            target="prereq.wst"/>
-        <antcall
-            target="prereq.jst"/>
-        <antcall
-            target="prereq.wtp"/>
-    </target>
-    <target
-        name="prereq.eclipse"
-        if="getprereq.eclipse">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.eclipseplatform"
-        if="getprereq.eclipseplatform">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipseplatform"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emf"
-        if="getprereq.emf">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfxsd"
-        if="getprereq.emfxsd">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfvalidation"
-        if="getprereq.emfvalidation">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfvalidation"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.gef"
-        if="getprereq.gef">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.dtp"
-        if="getprereq.dtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="dtp"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wst"
-        if="getprereq.wst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.jst"
-        if="getprereq.jst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="jst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wtp"
-        if="getprereq.wtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstall"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/servadapt_sdk/build.properties b/releng.wtpbuilder/components/servadapt_sdk/build.properties
deleted file mode 100644
index 5bed879..0000000
--- a/releng.wtpbuilder/components/servadapt_sdk/build.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# This is a subdirectory of $buildDirectory
-# Set collectingFolder and archivePrefix to . if you want to create archives without
-# trailing eclipse in the paths of the included files
-collectingFolder=eclipse
-logExtension=.xml
-# The prefix that will be used in the generated archive.
-# Does not make sense to use a different archivePrefix than collectingFolder, 
-# because zip wouldn't find any files to include into the target zip otherwise
-archivePrefix=eclipse
-
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-##################################################
-# Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
-javacVerbose=true
-
-sign=true
-
-#############################################################
-
-# Properties introduced in 3.5 M3 (PDE base builder R35_M2). See
-# http://aniefer.blogspot.com/2008/10/sorting-bundles-and-parallel.html
-
-flattenDependencies=true
-parallelCompilation=true
-
-
diff --git a/releng.wtpbuilder/components/servadapt_sdk/customTargets.xml b/releng.wtpbuilder/components/servadapt_sdk/customTargets.xml
deleted file mode 100644
index 81a71e2..0000000
--- a/releng.wtpbuilder/components/servadapt_sdk/customTargets.xml
+++ /dev/null
@@ -1,356 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-    <!--
-        = = = standard properties pattern = = = 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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- let this project specify properties, if not already set -->
-    <property
-        file="build.properties"/>
-    <fail
-        message="dependency.properties must be specified by distribution script"
-        unless="dependency.properties"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set"/>
-    <echo
-        message="buildDirectory: ${buildDirectory}"/>
-    <!--
-        Run a given ${target} on all elements being built Add on <ant>
-        task for each top level element being built.
-    -->
-    <target
-        name="allElements">
-        <echo
-            level="info"
-            message="Target:${target} "/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="info"
-            message="component: ${component}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}"/>
-        <echo
-            level="debug"
-            message="generic target: ${genericTargets}"/>
-        <echo
-            message="compilerArg: ${compilerArg}"/>
-        <echo
-            message="individualSourceBundles: ${individualSourceBundles}"/>
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature"/>
-            <property
-                name="id"
-                value="org.eclipse.jst.server_adapters.ext.sdk.feature"/>
-        </ant>
-    </target>
-    <!--
-        Targets to assemble the built elements for particular
-        configurations These generally call the generated assemble
-        scripts (named in ${assembleScriptName}) but may also add pre
-        and post processing Add one target for each root element and
-        each configuration
-    -->
-    <target
-        name="assemble.org.eclipse.jst.server_adapters.ext.sdk.feature">
-        <property
-            name="archiveName"
-            value="wtp-server-adapters-sdk-${buildLabel}.zip"/>
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}"/>
-    </target>
-    <target
-        name="prePackage"/>
-    <target
-        name="postPackage">
-        <property
-            name="archiveName"
-            value="wtp-server-adapters-sdk-${buildLabel}.zip"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-            <property
-                name="buildLabel"
-                value="${buildLabel}"/>
-            <property
-                name="archiveName"
-                value="${archiveName}"/>
-        </ant>
-    </target>
-
-    <!--
-        Check out map files from repository
-        -->
-    <target
-        name="getMapFiles">
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENG}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENGSERVERTOOLS}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-    </target>
-
-
-    <!-- 
-        Steps to do before setup
-    -->
-    <target
-        name="preSetup"></target>
-    <!--
-        Steps to do after setup but before starting the build proper
-    -->
-    <target
-        name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}"/>
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}"/>
-
-        <!-- Get the dependencies -->
-        <antcall
-            target="getDependencies"/>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Get the dependencies based on releng maps -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="getDependencies">
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-            <property
-                name="base.install.dir"
-                value="${buildRoot}"/>
-        </ant>
-    </target>
-
-    <!--
-      Steps to do before fetching the build elements
-    -->
-    <target
-        name="preFetch"></target>
-
-    <!-- 
-      Steps to do after fetching the build elements
-    -->
-    <target
-        name="postFetch"></target>
-
-    <!--
-      Steps to do before generating the build scripts.
-    -->
-    <target
-        name="preGenerate"></target>
-
-    <!--
-      Steps to do after generating the build scripts.
-    -->
-    <target
-        name="postGenerate">
-        <echo
-            message="buildDirectory: ${buildDirectory}"/>
-        <customizeAccessRules
-            bundleDirectory="${buildDirectory}/plugins"/>
-    </target>
-    <!--
-        Steps to do before running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include
-                name="**/about.mappings"/>
-        </replace>
-    </target>
-    <!--
-        Steps to do after running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="postProcess">
-        <condition
-            property="logsAvailable">
-            <istrue
-                value="${javacVerbose}"/>
-        </condition>
-        <antcall
-            target="gatherLogs"/>
-    </target>
-
-
-    <!--
-      Steps to do before running assemble. 
-        -->
-    <target
-        name="preAssemble"></target>
-
-    <!--
-      Steps to do after  running assemble.
-    -->
-    <target
-        name="postAssemble"></target>
-
-    <!--
-      Steps to do after the build is done.
-    -->
-    <target
-        name="postBuild"></target>
-
-    <!--
-      Steps to do to test the build results
-    -->
-    <target
-        name="test"></target>
-
-    <!--
-      Steps to do to publish the build results
-    -->
-    <target
-        name="publish"></target>
-
-    <!--
-      Helper targets
-    -->
-	    <target
-	        name="gatherLogs"
-	        if="logsAvailable">
-	        <mkdir
-	            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
-	        <echo
-	            level="debug"
-	            message="logExtension: ${logExtension}"/>
-	        <antcall
-	            target="allElements">
-	            <param
-	                name="target"
-	                value="gatherLogs"/>
-	            <param
-	                name="logExtension"
-	                value="${logExtension}"/>
-	        </antcall>
-	        <unzip
-	            dest="${buildDirectory}/${buildLabel}/compilelogs"
-	            overwrite="true">
-	            <fileset
-                dir="${buildDirectory}/features/org.eclipse.jst.server_adapters.ext.sdk.feature">
-	                <include
-	                    name="**/*.log.zip"/>
-	            </fileset>
-	        </unzip>
-	        <!--
-	            TODO: it is unclear if the above "gather" and unzip do
-	            anything constructive. I think not and should be removed
-	            (after experimental run, of course.
-	        -->
-	        <!--
-	            workaround: see
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-	        -->
-	        <copy
-	            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
-	            overwrite="true">
-	            <!--
-	                we want all @dot.xml files, but assumes a certain
-	                structure, to include directory for name of plugin
-	            -->
-	            <fileset
-	                dir="${buildDirectory}/features/">
-	                <include
-	                    name="**/feature.temp.folder/"/>
-	                <exclude
-	                    name="**/*tests*feature*/feature.temp.folder/" />
-	                     
-	            </fileset>
-	            <compositemapper>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/@dot.xml"
-	                    to="/\2/@dot.xml"/>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-	                    to="/\2/\3bin.xml"/>
-	            </compositemapper>
-	        </copy>
-	    </target>
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="cleanElement"/>
-        </antcall>
-    </target>
-
-    <!--
-      Default target 
-    -->
-    <target
-        name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/servadapt_sdk/dependency.xml b/releng.wtpbuilder/components/servadapt_sdk/dependency.xml
deleted file mode 100644
index 2023e34..0000000
--- a/releng.wtpbuilder/components/servadapt_sdk/dependency.xml
+++ /dev/null
@@ -1,225 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-        <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-        
-	    <condition
-	        property="getprereq.eclipse">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.eclipseplatform">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emf">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfxsd">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfvalidation">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.gef">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.dtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.jst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	            	
-    <target
-        name="get">
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined, which we do later with
-            statements such if="${groupId}.url"
-        -->
-        <property
-            file="${dependency.properties}"/>
-        <antcall
-            target="prereq.eclipse"/>
-        <antcall
-            target="prereq.eclipseplatform"/>
-        <antcall
-            target="prereq.emf"/>
-        <antcall
-            target="prereq.emfxsd"/>
-        <antcall
-            target="prereq.emfvalidation"/>
-        <antcall
-            target="prereq.gef"/>
-        <antcall
-            target="prereq.dtp"/>
-        <antcall
-            target="prereq.wst"/>
-        <antcall
-            target="prereq.jst"/>
-        <antcall
-            target="prereq.wtp"/>
-    </target>
-    <target
-        name="prereq.eclipse"
-        if="getprereq.eclipse">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.eclipseplatform"
-        if="getprereq.eclipseplatform">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipseplatform"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emf"
-        if="getprereq.emf">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfxsd"
-        if="getprereq.emfxsd">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfvalidation"
-        if="getprereq.emfvalidation">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfvalidation"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.gef"
-        if="getprereq.gef">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.dtp"
-        if="getprereq.dtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="dtp"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wst"
-        if="getprereq.wst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.jst"
-        if="getprereq.jst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="jst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wtp"
-        if="getprereq.wtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstall"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/servadapt_tests/build.properties b/releng.wtpbuilder/components/servadapt_tests/build.properties
deleted file mode 100644
index 4d26330..0000000
--- a/releng.wtpbuilder/components/servadapt_tests/build.properties
+++ /dev/null
@@ -1,46 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# This is a subdirectory of $buildDirectory
-# Set collectingFolder and archivePrefix to . if you want to create archives without
-# trailing eclipse in the paths of the included files
-collectingFolder=eclipse
-logExtension=.xml
-# The prefix that will be used in the generated archive.
-# Does not make sense to use a different archivePrefix than collectingFolder, 
-# because zip wouldn't find any files to include into the target zip otherwise
-archivePrefix=eclipse
-
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-##################################################
-# Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
-javacVerbose=true
-
-sign=false
-
-#############################################################
-
-# Properties introduced in 3.5 M3 (PDE base builder R35_M2). See
-# http://aniefer.blogspot.com/2008/10/sorting-bundles-and-parallel.html
-
-flattenDependencies=true
-parallelCompilation=true
-
diff --git a/releng.wtpbuilder/components/servadapt_tests/customTargets.xml b/releng.wtpbuilder/components/servadapt_tests/customTargets.xml
deleted file mode 100644
index 143042c..0000000
--- a/releng.wtpbuilder/components/servadapt_tests/customTargets.xml
+++ /dev/null
@@ -1,356 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-    <!--
-        = = = standard properties pattern = = = 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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- let this project specify properties, if not already set -->
-    <property
-        file="build.properties"/>
-    <fail
-        message="dependency.properties must be specified by distribution script"
-        unless="dependency.properties"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set"/>
-    <echo
-        message="buildDirectory: ${buildDirectory}"/>
-    <!--
-        Run a given ${target} on all elements being built Add on <ant>
-        task for each top level element being built.
-    -->
-    <target
-        name="allElements">
-        <echo
-            level="info"
-            message="Target:${target} "/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="info"
-            message="component: ${component}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}"/>
-        <echo
-            level="debug"
-            message="generic target: ${genericTargets}"/>
-        <echo
-            message="compilerArg: ${compilerArg}"/>
-        <echo
-            message="individualSourceBundles: ${individualSourceBundles}"/>
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature"/>
-            <property
-                name="id"
-                value="org.eclipse.jst.server_adapters.ext_tests.feature"/>
-        </ant>
-    </target>
-    <!--
-        Targets to assemble the built elements for particular
-        configurations These generally call the generated assemble
-        scripts (named in ${assembleScriptName}) but may also add pre
-        and post processing Add one target for each root element and
-        each configuration
-    -->
-    <target
-        name="assemble.org.eclipse.jst.server_adapters.ext_tests.feature">
-        <property
-            name="archiveName"
-            value="wtp-server-adapters-tests-${buildLabel}.zip"/>
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}"/>
-    </target>
-    <target
-        name="prePackage"/>
-    <target
-        name="postPackage">
-        <property
-            name="archiveName"
-            value="wtp-server-adapters-tests-${buildLabel}.zip"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-            <property
-                name="buildLabel"
-                value="${buildLabel}"/>
-            <property
-                name="archiveName"
-                value="${archiveName}"/>
-        </ant>
-    </target>
-
-    <!-- 
-        Check out map files from repository
-    -->
-    <target
-        name="getMapFiles">
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENG}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENGSERVERTOOLS}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-    </target>
-
-
-    <!-- 
-        Steps to do before setup
-    -->
-    <target
-        name="preSetup"></target>
-    <!--
-        Steps to do after setup but before starting the build proper
-    -->
-    <target
-        name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}"/>
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}"/>
-
-        <!-- Get the dependencies -->
-        <antcall
-            target="getDependencies"/>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Get the dependencies based on releng maps -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="getDependencies">
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-            <property
-                name="base.install.dir"
-                value="${buildRoot}"/>
-        </ant>
-    </target>
-
-    <!--
-      Steps to do before fetching the build elements
-    -->
-    <target
-        name="preFetch"></target>
-
-    <!-- 
-      Steps to do after fetching the build elements
-    -->
-    <target
-        name="postFetch"></target>
-
-    <!--
-      Steps to do before generating the build scripts.
-    -->
-    <target
-        name="preGenerate"></target>
-
-    <!--
-      Steps to do after generating the build scripts.
-    -->
-    <target
-        name="postGenerate">
-        <echo
-            message="buildDirectory: ${buildDirectory}"/>
-        <customizeAccessRules
-            bundleDirectory="${buildDirectory}/plugins"/>
-    </target>
-    <!--
-        Steps to do before running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include
-                name="**/about.mappings"/>
-        </replace>
-    </target>
-    <!--
-        Steps to do after running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="postProcess">
-        <condition
-            property="logsAvailable">
-            <istrue
-                value="${javacVerbose}"/>
-        </condition>
-        <antcall
-            target="gatherLogs"/>
-    </target>
-
-
-    <!--
-      Steps to do before running assemble. 
-        -->
-    <target
-        name="preAssemble"></target>
-
-    <!--
-      Steps to do after  running assemble.
-    -->
-    <target
-        name="postAssemble"></target>
-
-    <!--
-      Steps to do after the build is done.
-    -->
-    <target
-        name="postBuild"></target>
-
-    <!--
-      Steps to do to test the build results
-    -->
-    <target
-        name="test"></target>
-
-    <!--
-      Steps to do to publish the build results
-    -->
-    <target
-        name="publish"></target>
-
-    <!--
-      Helper targets
-    -->
-	    <target
-	        name="gatherLogs"
-	        if="logsAvailable">
-	        <mkdir
-            dir="${buildDirectory}/${buildLabel}/testcompilelogs"/>
-	        <echo
-	            level="debug"
-	            message="logExtension: ${logExtension}"/>
-	        <antcall
-	            target="allElements">
-	            <param
-	                name="target"
-	                value="gatherLogs"/>
-	            <param
-	                name="logExtension"
-	                value="${logExtension}"/>
-	        </antcall>
-	        <unzip
-            dest="${buildDirectory}/${buildLabel}/testcompilelogs"
-            overwrite="true">
-	            <fileset
-                dir="${buildDirectory}/features/org.eclipse.jst.server_adapters.ext_tests.feature">
-	                <include
-	                    name="**/*.log.zip"/>
-	            </fileset>
-	        </unzip>
-	        <!--
-	            TODO: it is unclear if the above "gather" and unzip do
-	            anything constructive. I think not and should be removed
-	            (after experimental run, of course.
-	        -->
-	        <!--
-	            workaround: see
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-	        -->
-	        <copy
-	            todir="${buildDirectory}/${buildLabel}/testcompilelogs/plugins"
-	            overwrite="true">
-	            <!--
-	                we want all @dot.xml files, but assumes a certain
-	                structure, to include directory for name of plugin
-	            -->
-	            <fileset
-	                dir="${buildDirectory}/features/">
-	                <include
-	                    name="**/feature.temp.folder/"/>
-	                <exclude
-	                    name="**/*tests*feature*/feature.temp.folder/" />
-	                     
-	            </fileset>
-	            <compositemapper>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/@dot.xml"
-	                    to="/\2/@dot.xml"/>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-	                    to="/\2/\3bin.xml"/>
-	            </compositemapper>
-	        </copy>
-	    </target>
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="cleanElement"/>
-        </antcall>
-    </target>
-
-    <!--
-      Default target 
-    -->
-    <target
-        name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/servadapt_tests/dependency.xml b/releng.wtpbuilder/components/servadapt_tests/dependency.xml
deleted file mode 100644
index b4a2703..0000000
--- a/releng.wtpbuilder/components/servadapt_tests/dependency.xml
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-        <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-        
-	    <condition
-	        property="getprereq.eclipse">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.eclipseplatform">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emf">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfxsd">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfvalidation">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.gef">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.dtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.jst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
-    <target
-        name="get">
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined, which we do later with
-            statements such if="${groupId}.url"
-        -->
-        <property
-            file="${dependency.properties}"/>
-        <antcall
-            target="prereq.eclipse"/>
-        <antcall
-            target="prereq.eclipseplatform"/>
-        <antcall
-            target="prereq.emf"/>
-        <antcall
-            target="prereq.emfxsd"/>
-        <antcall
-            target="prereq.emfvalidation"/>
-        <antcall
-            target="prereq.gef"/>
-        <antcall
-            target="prereq.dtp"/>
-        <antcall
-            target="prereq.wst"/>
-        <antcall
-            target="prereq.jst"/>
-        <antcall
-            target="prereq.wtp"/>
-       <antcall
-           target="getAndInstall">
-           <param
-               name="groupId"
-               value="eclipseTestFramework"/>    
-       	</antcall>
-    </target>
-    <target
-        name="prereq.eclipse"
-        if="getprereq.eclipse">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.eclipseplatform"
-        if="getprereq.eclipseplatform">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipseplatform"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emf"
-        if="getprereq.emf">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfxsd"
-        if="getprereq.emfxsd">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfvalidation"
-        if="getprereq.emfvalidation">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfvalidation"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.gef"
-        if="getprereq.gef">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.dtp"
-        if="getprereq.dtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="dtp"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wst"
-        if="getprereq.wst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.jst"
-        if="getprereq.jst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="jst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wtp"
-        if="getprereq.wtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstall"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/vex/build.properties b/releng.wtpbuilder/components/vex/build.properties
deleted file mode 100644
index 5bed879..0000000
--- a/releng.wtpbuilder/components/vex/build.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# This is a subdirectory of $buildDirectory
-# Set collectingFolder and archivePrefix to . if you want to create archives without
-# trailing eclipse in the paths of the included files
-collectingFolder=eclipse
-logExtension=.xml
-# The prefix that will be used in the generated archive.
-# Does not make sense to use a different archivePrefix than collectingFolder, 
-# because zip wouldn't find any files to include into the target zip otherwise
-archivePrefix=eclipse
-
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-##################################################
-# Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
-javacVerbose=true
-
-sign=true
-
-#############################################################
-
-# Properties introduced in 3.5 M3 (PDE base builder R35_M2). See
-# http://aniefer.blogspot.com/2008/10/sorting-bundles-and-parallel.html
-
-flattenDependencies=true
-parallelCompilation=true
-
-
diff --git a/releng.wtpbuilder/components/vex/customTargets.xml b/releng.wtpbuilder/components/vex/customTargets.xml
deleted file mode 100644
index 7f897b1..0000000
--- a/releng.wtpbuilder/components/vex/customTargets.xml
+++ /dev/null
@@ -1,356 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-    <!--
-        = = = standard properties pattern = = = 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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- let this project specify properties, if not already set -->
-    <property
-        file="build.properties"/>
-    <fail
-        message="dependency.properties must be specified by distribution script"
-        unless="dependency.properties"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set"/>
-    <echo
-        message="buildDirectory: ${buildDirectory}"/>
-    <!--
-        Run a given ${target} on all elements being built Add on <ant>
-        task for each top level element being built.
-    -->
-    <target
-        name="allElements">
-        <echo
-            level="info"
-            message="Target:${target} "/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="info"
-            message="component: ${component}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}"/>
-        <echo
-            level="debug"
-            message="generic target: ${genericTargets}"/>
-        <echo
-            message="compilerArg: ${compilerArg}"/>
-        <echo
-            message="individualSourceBundles: ${individualSourceBundles}"/>
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature"/>
-            <property
-                name="id"
-                value="org.eclipse.wst.xml.vex.feature"/>
-        </ant>
-    </target>
-    <!--
-        Targets to assemble the built elements for particular
-        configurations These generally call the generated assemble
-        scripts (named in ${assembleScriptName}) but may also add pre
-        and post processing Add one target for each root element and
-        each configuration
-    -->
-    <target
-        name="assemble.org.eclipse.wst.xml.vex.feature">
-        <property
-            name="archiveName"
-            value="wtp-incubator-xml.vex-${buildLabel}.zip"/>
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}"/>
-    </target>
-    <target
-        name="prePackage"/>
-    <target
-        name="postPackage">
-        <property
-            name="archiveName"
-            value="wtp-incubator-xml.vex-${buildLabel}.zip"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-            <property
-                name="buildLabel"
-                value="${buildLabel}"/>
-            <property
-                name="archiveName"
-                value="${archiveName}"/>
-        </ant>
-    </target>
-
-    <!-- 
-        Check out map files from repository
-    -->
-    <target
-        name="getMapFiles">
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENG}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENGINCUBATORVEX}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-    </target>
-
-
-    <!-- 
-        Steps to do before setup
-    -->
-    <target
-        name="preSetup"></target>
-    <!--
-        Steps to do after setup but before starting the build proper
-    -->
-    <target
-        name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}"/>
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}"/>
-
-        <!-- Get the dependencies -->
-        <antcall
-            target="getDependencies"/>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Get the dependencies based on releng maps -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="getDependencies">
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-            <property
-                name="base.install.dir"
-                value="${buildRoot}"/>
-        </ant>
-    </target>
-
-    <!--
-      Steps to do before fetching the build elements
-    -->
-    <target
-        name="preFetch"></target>
-
-    <!-- 
-      Steps to do after fetching the build elements
-    -->
-    <target
-        name="postFetch"></target>
-
-    <!--
-      Steps to do before generating the build scripts.
-    -->
-    <target
-        name="preGenerate"></target>
-
-    <!--
-      Steps to do after generating the build scripts.
-    -->
-    <target
-        name="postGenerate">
-        <echo
-            message="buildDirectory: ${buildDirectory}"/>
-        <customizeAccessRules
-            bundleDirectory="${buildDirectory}/plugins"/>
-    </target>
-    <!--
-        Steps to do before running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include
-                name="**/about.mappings"/>
-        </replace>
-    </target>
-    <!--
-        Steps to do after running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="postProcess">
-        <condition
-            property="logsAvailable">
-            <istrue
-                value="${javacVerbose}"/>
-        </condition>
-        <antcall
-            target="gatherLogs"/>
-    </target>
-
-
-    <!--
-      Steps to do before running assemble. 
-    -->
-    <target
-        name="preAssemble"></target>
-
-    <!--
-      Steps to do after  running assemble.
-    -->
-    <target
-        name="postAssemble"></target>
-
-    <!--
-      Steps to do after the build is done.
-    -->
-    <target
-        name="postBuild"></target>
-
-    <!--
-      Steps to do to test the build results
-    -->
-    <target
-        name="test"></target>
-
-    <!--
-      Steps to do to publish the build results
-    -->
-    <target
-        name="publish"></target>
-
-    <!--
-      Helper targets
-    -->
-	    <target
-	        name="gatherLogs"
-	        if="logsAvailable">
-	        <mkdir
-	            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
-	        <echo
-	            level="debug"
-	            message="logExtension: ${logExtension}"/>
-	        <antcall
-	            target="allElements">
-	            <param
-	                name="target"
-	                value="gatherLogs"/>
-	            <param
-	                name="logExtension"
-	                value="${logExtension}"/>
-	        </antcall>
-	        <unzip
-	            dest="${buildDirectory}/${buildLabel}/compilelogs"
-	            overwrite="true">
-	            <fileset
-                dir="${buildDirectory}/features/org.eclipse.wst.xml.vex.feature">
-	                <include
-	                    name="**/*.log.zip"/>
-	            </fileset>
-	        </unzip>
-	        <!--
-	            TODO: it is unclear if the above "gather" and unzip do
-	            anything constructive. I think not and should be removed
-	            (after experimental run, of course.
-	        -->
-	        <!--
-	            workaround: see
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-	        -->
-	        <copy
-	            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
-	            overwrite="true">
-	            <!--
-	                we want all @dot.xml files, but assumes a certain
-	                structure, to include directory for name of plugin
-	            -->
-	            <fileset
-	                dir="${buildDirectory}/features/">
-	                <include
-	                    name="**/feature.temp.folder/"/>
-	                <exclude
-	                    name="**/*tests*feature*/feature.temp.folder/" />
-	                     
-	            </fileset>
-	            <compositemapper>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/@dot.xml"
-	                    to="/\2/@dot.xml"/>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-	                    to="/\2/\3bin.xml"/>
-	            </compositemapper>
-	        </copy>
-	    </target>
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="cleanElement"/>
-        </antcall>
-    </target>
-
-    <!--
-      Default target 
-    -->
-    <target
-        name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/vex/dependency.xml b/releng.wtpbuilder/components/vex/dependency.xml
deleted file mode 100644
index caafe1f..0000000
--- a/releng.wtpbuilder/components/vex/dependency.xml
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-        <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-        
-    <condition
-        property="getprereq.eclipse">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.eclipseplatform">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.emf">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.emfxsd">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.emfvalidation">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.gef">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.dtp">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.wst">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.jst">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.wtp">
-        <istrue
-            value="false"/>
-    </condition>
-    <target
-        name="get">
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined, which we do later with
-            statements such if="${groupId}.url"
-        -->
-        <property
-            file="${dependency.properties}"/>
-        <antcall
-            target="prereq.eclipse"/>
-        <antcall
-            target="prereq.eclipseplatform"/>
-        <antcall
-            target="prereq.emf"/>
-        <antcall
-            target="prereq.emfxsd"/>
-        <antcall
-            target="prereq.emfvalidation"/>
-        <antcall
-            target="prereq.gef"/>
-        <antcall
-            target="prereq.dtp"/>
-        <antcall
-            target="prereq.wst"/>
-        <antcall
-            target="prereq.jst"/>
-        <antcall
-            target="prereq.wtp"/>
-    </target>
-    <target
-        name="prereq.eclipse"
-        if="getprereq.eclipse">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.eclipseplatform"
-        if="getprereq.eclipseplatform">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipseplatform"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emf"
-        if="getprereq.emf">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfxsd"
-        if="getprereq.emfxsd">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfvalidation"
-        if="getprereq.emfvalidation">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfvalidation"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.gef"
-        if="getprereq.gef">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.dtp"
-        if="getprereq.dtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="dtp"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wst"
-        if="getprereq.wst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.jst"
-        if="getprereq.jst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="jst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wtp"
-        if="getprereq.wtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstall"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/vex_sdk/build.properties b/releng.wtpbuilder/components/vex_sdk/build.properties
deleted file mode 100644
index 5bed879..0000000
--- a/releng.wtpbuilder/components/vex_sdk/build.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# This is a subdirectory of $buildDirectory
-# Set collectingFolder and archivePrefix to . if you want to create archives without
-# trailing eclipse in the paths of the included files
-collectingFolder=eclipse
-logExtension=.xml
-# The prefix that will be used in the generated archive.
-# Does not make sense to use a different archivePrefix than collectingFolder, 
-# because zip wouldn't find any files to include into the target zip otherwise
-archivePrefix=eclipse
-
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-##################################################
-# Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
-javacVerbose=true
-
-sign=true
-
-#############################################################
-
-# Properties introduced in 3.5 M3 (PDE base builder R35_M2). See
-# http://aniefer.blogspot.com/2008/10/sorting-bundles-and-parallel.html
-
-flattenDependencies=true
-parallelCompilation=true
-
-
diff --git a/releng.wtpbuilder/components/vex_sdk/customTargets.xml b/releng.wtpbuilder/components/vex_sdk/customTargets.xml
deleted file mode 100644
index 546386b..0000000
--- a/releng.wtpbuilder/components/vex_sdk/customTargets.xml
+++ /dev/null
@@ -1,356 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-    <!--
-        = = = standard properties pattern = = = 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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- let this project specify properties, if not already set -->
-    <property
-        file="build.properties"/>
-    <fail
-        message="dependency.properties must be specified by distribution script"
-        unless="dependency.properties"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set"/>
-    <echo
-        message="buildDirectory: ${buildDirectory}"/>
-    <!--
-        Run a given ${target} on all elements being built Add on <ant>
-        task for each top level element being built.
-    -->
-    <target
-        name="allElements">
-        <echo
-            level="info"
-            message="Target:${target} "/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="info"
-            message="component: ${component}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}"/>
-        <echo
-            level="debug"
-            message="generic target: ${genericTargets}"/>
-        <echo
-            message="compilerArg: ${compilerArg}"/>
-        <echo
-            message="individualSourceBundles: ${individualSourceBundles}"/>
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature"/>
-            <property
-                name="id"
-                value="org.eclipse.wst.xml.vex_sdk.feature"/>
-        </ant>
-    </target>
-    <!--
-        Targets to assemble the built elements for particular
-        configurations These generally call the generated assemble
-        scripts (named in ${assembleScriptName}) but may also add pre
-        and post processing Add one target for each root element and
-        each configuration
-    -->
-    <target
-        name="assemble.org.eclipse.wst.xml.vex_sdk.feature">
-        <property
-            name="archiveName"
-            value="wtp-incubator-xml.vex-sdk-${buildLabel}.zip"/>
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}"/>
-    </target>
-    <target
-        name="prePackage"/>
-    <target
-        name="postPackage">
-        <property
-            name="archiveName"
-            value="wtp-incubator-xml.vex-sdk-${buildLabel}.zip"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-            <property
-                name="buildLabel"
-                value="${buildLabel}"/>
-            <property
-                name="archiveName"
-                value="${archiveName}"/>
-        </ant>
-    </target>
-
-    <!--
-        Check out map files from repository
-        -->
-    <target
-        name="getMapFiles">
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENG}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENGINCUBATORVEX}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-    </target>
-
-
-    <!-- 
-        Steps to do before setup
-    -->
-    <target
-        name="preSetup"></target>
-    <!--
-        Steps to do after setup but before starting the build proper
-    -->
-    <target
-        name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}"/>
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}"/>
-
-        <!-- Get the dependencies -->
-        <antcall
-            target="getDependencies"/>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Get the dependencies based on releng maps -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="getDependencies">
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-            <property
-                name="base.install.dir"
-                value="${buildRoot}"/>
-        </ant>
-    </target>
-
-    <!--
-      Steps to do before fetching the build elements
-    -->
-    <target
-        name="preFetch"></target>
-
-    <!-- 
-      Steps to do after fetching the build elements
-    -->
-    <target
-        name="postFetch"></target>
-
-    <!--
-      Steps to do before generating the build scripts.
-    -->
-    <target
-        name="preGenerate"></target>
-
-    <!--
-      Steps to do after generating the build scripts.
-    -->
-    <target
-        name="postGenerate">
-        <echo
-            message="buildDirectory: ${buildDirectory}"/>
-        <customizeAccessRules
-            bundleDirectory="${buildDirectory}/plugins"/>
-    </target>
-    <!--
-        Steps to do before running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include
-                name="**/about.mappings"/>
-        </replace>
-    </target>
-    <!--
-        Steps to do after running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="postProcess">
-        <condition
-            property="logsAvailable">
-            <istrue
-                value="${javacVerbose}"/>
-        </condition>
-        <antcall
-            target="gatherLogs"/>
-    </target>
-
-
-    <!--
-      Steps to do before running assemble. 
-        -->
-    <target
-        name="preAssemble"></target>
-
-    <!--
-      Steps to do after  running assemble.
-    -->
-    <target
-        name="postAssemble"></target>
-
-    <!--
-      Steps to do after the build is done.
-    -->
-    <target
-        name="postBuild"></target>
-
-    <!--
-      Steps to do to test the build results
-    -->
-    <target
-        name="test"></target>
-
-    <!--
-      Steps to do to publish the build results
-    -->
-    <target
-        name="publish"></target>
-
-    <!--
-      Helper targets
-    -->
-	    <target
-	        name="gatherLogs"
-	        if="logsAvailable">
-	        <mkdir
-	            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
-	        <echo
-	            level="debug"
-	            message="logExtension: ${logExtension}"/>
-	        <antcall
-	            target="allElements">
-	            <param
-	                name="target"
-	                value="gatherLogs"/>
-	            <param
-	                name="logExtension"
-	                value="${logExtension}"/>
-	        </antcall>
-	        <unzip
-	            dest="${buildDirectory}/${buildLabel}/compilelogs"
-	            overwrite="true">
-	            <fileset
-                dir="${buildDirectory}/features/org.eclipse.wst.xml.vex_sdk.feature">
-	                <include
-	                    name="**/*.log.zip"/>
-	            </fileset>
-	        </unzip>
-	        <!--
-	            TODO: it is unclear if the above "gather" and unzip do
-	            anything constructive. I think not and should be removed
-	            (after experimental run, of course.
-	        -->
-	        <!--
-	            workaround: see
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-	        -->
-	        <copy
-	            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
-	            overwrite="true">
-	            <!--
-	                we want all @dot.xml files, but assumes a certain
-	                structure, to include directory for name of plugin
-	            -->
-	            <fileset
-	                dir="${buildDirectory}/features/">
-	                <include
-	                    name="**/feature.temp.folder/"/>
-	                <exclude
-	                    name="**/*tests*feature*/feature.temp.folder/" />
-	                     
-	            </fileset>
-	            <compositemapper>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/@dot.xml"
-	                    to="/\2/@dot.xml"/>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-	                    to="/\2/\3bin.xml"/>
-	            </compositemapper>
-	        </copy>
-	    </target>
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="cleanElement"/>
-        </antcall>
-    </target>
-
-    <!--
-      Default target 
-    -->
-    <target
-        name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/vex_sdk/dependency.xml b/releng.wtpbuilder/components/vex_sdk/dependency.xml
deleted file mode 100644
index 20bc365..0000000
--- a/releng.wtpbuilder/components/vex_sdk/dependency.xml
+++ /dev/null
@@ -1,225 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-        <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-        
-	    <condition
-	        property="getprereq.eclipse">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.eclipseplatform">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emf">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfxsd">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfvalidation">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.gef">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.dtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wst">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.jst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	            	
-    <target
-        name="get">
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined, which we do later with
-            statements such if="${groupId}.url"
-        -->
-        <property
-            file="${dependency.properties}"/>
-        <antcall
-            target="prereq.eclipse"/>
-        <antcall
-            target="prereq.eclipseplatform"/>
-        <antcall
-            target="prereq.emf"/>
-        <antcall
-            target="prereq.emfxsd"/>
-        <antcall
-            target="prereq.emfvalidation"/>
-        <antcall
-            target="prereq.gef"/>
-        <antcall
-            target="prereq.dtp"/>
-        <antcall
-            target="prereq.wst"/>
-        <antcall
-            target="prereq.jst"/>
-        <antcall
-            target="prereq.wtp"/>
-    </target>
-    <target
-        name="prereq.eclipse"
-        if="getprereq.eclipse">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.eclipseplatform"
-        if="getprereq.eclipseplatform">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipseplatform"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emf"
-        if="getprereq.emf">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfxsd"
-        if="getprereq.emfxsd">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfvalidation"
-        if="getprereq.emfvalidation">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfvalidation"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.gef"
-        if="getprereq.gef">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.dtp"
-        if="getprereq.dtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="dtp"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wst"
-        if="getprereq.wst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.jst"
-        if="getprereq.jst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="jst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wtp"
-        if="getprereq.wtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstall"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/vex_tests/build.properties b/releng.wtpbuilder/components/vex_tests/build.properties
deleted file mode 100644
index 4d26330..0000000
--- a/releng.wtpbuilder/components/vex_tests/build.properties
+++ /dev/null
@@ -1,46 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# This is a subdirectory of $buildDirectory
-# Set collectingFolder and archivePrefix to . if you want to create archives without
-# trailing eclipse in the paths of the included files
-collectingFolder=eclipse
-logExtension=.xml
-# The prefix that will be used in the generated archive.
-# Does not make sense to use a different archivePrefix than collectingFolder, 
-# because zip wouldn't find any files to include into the target zip otherwise
-archivePrefix=eclipse
-
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-##################################################
-# Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
-javacVerbose=true
-
-sign=false
-
-#############################################################
-
-# Properties introduced in 3.5 M3 (PDE base builder R35_M2). See
-# http://aniefer.blogspot.com/2008/10/sorting-bundles-and-parallel.html
-
-flattenDependencies=true
-parallelCompilation=true
-
diff --git a/releng.wtpbuilder/components/vex_tests/customTargets.xml b/releng.wtpbuilder/components/vex_tests/customTargets.xml
deleted file mode 100644
index f307af1..0000000
--- a/releng.wtpbuilder/components/vex_tests/customTargets.xml
+++ /dev/null
@@ -1,356 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-    <!--
-        = = = standard properties pattern = = = 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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- let this project specify properties, if not already set -->
-    <property
-        file="build.properties"/>
-    <fail
-        message="dependency.properties must be specified by distribution script"
-        unless="dependency.properties"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set"/>
-    <echo
-        message="buildDirectory: ${buildDirectory}"/>
-    <!--
-        Run a given ${target} on all elements being built Add on <ant>
-        task for each top level element being built.
-    -->
-    <target
-        name="allElements">
-        <echo
-            level="info"
-            message="Target:${target} "/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="info"
-            message="component: ${component}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}"/>
-        <echo
-            level="debug"
-            message="generic target: ${genericTargets}"/>
-        <echo
-            message="compilerArg: ${compilerArg}"/>
-        <echo
-            message="individualSourceBundles: ${individualSourceBundles}"/>
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature"/>
-            <property
-                name="id"
-                value="org.eclipse.wst.xml.vex_tests.feature"/>
-        </ant>
-    </target>
-    <!--
-        Targets to assemble the built elements for particular
-        configurations These generally call the generated assemble
-        scripts (named in ${assembleScriptName}) but may also add pre
-        and post processing Add one target for each root element and
-        each configuration
-    -->
-    <target
-        name="assemble.org.eclipse.wst.xml.vex_tests.feature">
-        <property
-            name="archiveName"
-            value="wtp-incubator-xml.vex-tests-${buildLabel}.zip"/>
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}"/>
-    </target>
-    <target
-        name="prePackage"/>
-    <target
-        name="postPackage">
-        <property
-            name="archiveName"
-            value="wtp-incubator-xml.vex-tests-${buildLabel}.zip"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-            <property
-                name="buildLabel"
-                value="${buildLabel}"/>
-            <property
-                name="archiveName"
-                value="${archiveName}"/>
-        </ant>
-    </target>
-
-    <!-- 
-        Check out map files from repository
-    -->
-    <target
-        name="getMapFiles">
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENG}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENGINCUBATORVEX}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-    </target>
-
-
-    <!-- 
-        Steps to do before setup
-    -->
-    <target
-        name="preSetup"></target>
-    <!--
-        Steps to do after setup but before starting the build proper
-    -->
-    <target
-        name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}"/>
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}"/>
-
-        <!-- Get the dependencies -->
-        <antcall
-            target="getDependencies"/>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Get the dependencies based on releng maps -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="getDependencies">
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-            <property
-                name="base.install.dir"
-                value="${buildRoot}"/>
-        </ant>
-    </target>
-
-    <!--
-      Steps to do before fetching the build elements
-    -->
-    <target
-        name="preFetch"></target>
-
-    <!-- 
-      Steps to do after fetching the build elements
-    -->
-    <target
-        name="postFetch"></target>
-
-    <!--
-      Steps to do before generating the build scripts.
-    -->
-    <target
-        name="preGenerate"></target>
-
-    <!--
-      Steps to do after generating the build scripts.
-    -->
-    <target
-        name="postGenerate">
-        <echo
-            message="buildDirectory: ${buildDirectory}"/>
-        <customizeAccessRules
-            bundleDirectory="${buildDirectory}/plugins"/>
-    </target>
-    <!--
-        Steps to do before running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include
-                name="**/about.mappings"/>
-        </replace>
-    </target>
-    <!--
-        Steps to do after running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="postProcess">
-        <condition
-            property="logsAvailable">
-            <istrue
-                value="${javacVerbose}"/>
-        </condition>
-        <antcall
-            target="gatherLogs"/>
-    </target>
-
-
-    <!--
-      Steps to do before running assemble. 
-        -->
-    <target
-        name="preAssemble"></target>
-
-    <!--
-      Steps to do after  running assemble.
-    -->
-    <target
-        name="postAssemble"></target>
-
-    <!--
-      Steps to do after the build is done.
-    -->
-    <target
-        name="postBuild"></target>
-
-    <!--
-      Steps to do to test the build results
-    -->
-    <target
-        name="test"></target>
-
-    <!--
-      Steps to do to publish the build results
-    -->
-    <target
-        name="publish"></target>
-
-    <!--
-      Helper targets
-    -->
-	    <target
-	        name="gatherLogs"
-	        if="logsAvailable">
-	        <mkdir
-            dir="${buildDirectory}/${buildLabel}/testcompilelogs"/>
-	        <echo
-	            level="debug"
-	            message="logExtension: ${logExtension}"/>
-	        <antcall
-	            target="allElements">
-	            <param
-	                name="target"
-	                value="gatherLogs"/>
-	            <param
-	                name="logExtension"
-	                value="${logExtension}"/>
-	        </antcall>
-	        <unzip
-            dest="${buildDirectory}/${buildLabel}/testcompilelogs"
-            overwrite="true">
-	            <fileset
-                dir="${buildDirectory}/features/org.eclipse.wst.xml.vex_tests.feature">
-	                <include
-	                    name="**/*.log.zip"/>
-	            </fileset>
-	        </unzip>
-	        <!--
-	            TODO: it is unclear if the above "gather" and unzip do
-	            anything constructive. I think not and should be removed
-	            (after experimental run, of course.
-	        -->
-	        <!--
-	            workaround: see
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-	        -->
-	        <copy
-	            todir="${buildDirectory}/${buildLabel}/testcompilelogs/plugins"
-	            overwrite="true">
-	            <!--
-	                we want all @dot.xml files, but assumes a certain
-	                structure, to include directory for name of plugin
-	            -->
-	            <fileset
-	                dir="${buildDirectory}/features/">
-	                <include
-	                    name="**/feature.temp.folder/"/>
-	                <exclude
-	                    name="**/*tests*feature*/feature.temp.folder/" />
-	                     
-	            </fileset>
-	            <compositemapper>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/@dot.xml"
-	                    to="/\2/@dot.xml"/>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-	                    to="/\2/\3bin.xml"/>
-	            </compositemapper>
-	        </copy>
-	    </target>
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="cleanElement"/>
-        </antcall>
-    </target>
-
-    <!--
-      Default target 
-    -->
-    <target
-        name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/vex_tests/dependency.xml b/releng.wtpbuilder/components/vex_tests/dependency.xml
deleted file mode 100644
index 2b856ef..0000000
--- a/releng.wtpbuilder/components/vex_tests/dependency.xml
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-        <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-        
-	    <condition
-	        property="getprereq.eclipse">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.eclipseplatform">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emf">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfxsd">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfvalidation">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.gef">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.dtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wst">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.jst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
-    <target
-        name="get">
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined, which we do later with
-            statements such if="${groupId}.url"
-        -->
-        <property
-            file="${dependency.properties}"/>
-        <antcall
-            target="prereq.eclipse"/>
-        <antcall
-            target="prereq.eclipseplatform"/>
-        <antcall
-            target="prereq.emf"/>
-        <antcall
-            target="prereq.emfxsd"/>
-        <antcall
-            target="prereq.emfvalidation"/>
-        <antcall
-            target="prereq.gef"/>
-        <antcall
-            target="prereq.dtp"/>
-        <antcall
-            target="prereq.wst"/>
-        <antcall
-            target="prereq.jst"/>
-        <antcall
-            target="prereq.wtp"/>
-       <antcall
-           target="getAndInstall">
-           <param
-               name="groupId"
-               value="eclipseTestFramework"/>    
-       	</antcall>
-    </target>
-    <target
-        name="prereq.eclipse"
-        if="getprereq.eclipse">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.eclipseplatform"
-        if="getprereq.eclipseplatform">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipseplatform"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emf"
-        if="getprereq.emf">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfxsd"
-        if="getprereq.emfxsd">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfvalidation"
-        if="getprereq.emfvalidation">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfvalidation"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.gef"
-        if="getprereq.gef">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.dtp"
-        if="getprereq.dtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="dtp"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wst"
-        if="getprereq.wst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.jst"
-        if="getprereq.jst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="jst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wtp"
-        if="getprereq.wtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstall"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/wst-sdk/build.properties b/releng.wtpbuilder/components/wst-sdk/build.properties
deleted file mode 100644
index 7e21d62..0000000
--- a/releng.wtpbuilder/components/wst-sdk/build.properties
+++ /dev/null
@@ -1,38 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# This is a subdirectory of $buildDirectory
-# Set collectingFolder and archivePrefix to . if you want to create archives without
-# trailing eclipse in the paths of the included files
-collectingFolder=eclipse
-
-# The prefix that will be used in the generated archive.
-# Does not make sense to use a different archivePrefix than collectingFolder, 
-# because zip wouldn't find any files to include into the target zip otherwise
-archivePrefix=eclipse
-logExtension=.xml
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-##################################################
-# Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
-javacVerbose=true
-
-sign=true
-
diff --git a/releng.wtpbuilder/components/wst-sdk/customTargets.xml b/releng.wtpbuilder/components/wst-sdk/customTargets.xml
deleted file mode 100644
index 3b65a5f..0000000
--- a/releng.wtpbuilder/components/wst-sdk/customTargets.xml
+++ /dev/null
@@ -1,372 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-    <!--
-        = = = standard properties pattern = = = 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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- let this project specify properties, if not already set -->
-    <property
-        file="build.properties"/>
-    <fail
-        message="dependency.properties must be specified by distribution script"
-        unless="dependency.properties"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set"/>
-    <echo
-        message="buildDirectory: ${buildDirectory}"/>
-    <!--
-        Run a given ${target} on all elements being built Add on <ant>
-        task for each top level element being built.
-    -->
-    <target
-        name="allElements">
-        <echo
-            level="info"
-            message="Target:${target} "/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="info"
-            message="component: ${component}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}"/>
-        <echo
-            level="debug"
-            message="generic target: ${genericTargets}"/>
-        <echo
-            message="compilerArg: ${compilerArg}"/>
-        <echo
-            message="individualSourceBundles: ${individualSourceBundles}"/>
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature"/>
-            <property
-                name="id"
-                value="org.eclipse.wst.sdk"/>
-        </ant>
-    </target>
-    <!--
-        Targets to assemble the built elements for particular
-        configurations These generally call the generated assemble
-        scripts (named in ${assembleScriptName}) but may also add pre
-        and post processing Add one target for each root element and
-        each configuration
-    -->
-    <target
-        name="assemble.org.eclipse.wst.sdk">
-        <property
-            name="archiveName"
-            value="wtp-wst-sdk-${buildLabel}.zip"/>
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}"/>
-    </target>
-    <target
-        name="prePackage"/>
-    <target
-        name="postPackage">
-        <property
-            name="archiveName"
-            value="wtp-wst-sdk-${buildLabel}.zip"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-            <property
-                name="buildLabel"
-                value="${buildLabel}"/>
-            <property
-                name="archiveName"
-                value="${archiveName}"/>
-        </ant>
-    </target>
-
-    <!--
-        Check out map files from repository
-    -->
-    <target
-        name="getMapFiles">
-
-        <!-- for now, get all, at once. May componetize later. -->
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="fetchAllMaps"/>
-    </target>
-
-
-    <!--
-      Steps to do before setup
-    -->
-    <target
-        name="preSetup"></target>
-    <!--
-        Steps to do after setup but before starting the build proper
-    -->
-    <target
-        name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}"/>
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}"/>
-
-        <!-- Get the dependencies -->
-        <antcall
-            target="getDependencies"/>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Get the dependencies based on releng maps -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="getDependencies">
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-            <property
-                name="base.install.dir"
-                value="${buildRoot}"/>
-        </ant>
-    </target>
-
-    <!--
-      Steps to do before fetching the build elements
-    -->
-    <target
-        name="preFetch"></target>
-
-    <!-- 
-      Steps to do after fetching the build elements
-    -->
-    <target
-        name="postFetch"></target>
-
-    <!--
-      Steps to do before generating the build scripts.
-    -->
-    <target
-        name="preGenerate"></target>
-
-    <!--
-      Steps to do after generating the build scripts.
-    -->
-    <target
-        name="postGenerate">
-        <echo
-            message="buildDirectory: ${buildDirectory}"/>
-        <customizeAccessRules
-            bundleDirectory="${buildDirectory}/plugins"
-            defaultRules="+org/eclipse/wst/**/*, +org/eclipse/jst/**/*"/>
-    </target>
-    <!--
-        Steps to do before running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include
-                name="**/about.mappings"/>
-        </replace>
-    </target>
-    <!--
-        Steps to do after running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="postProcess">
-        <condition
-            property="logsAvailable">
-            <istrue
-                value="${javacVerbose}"/>
-        </condition>
-        <antcall
-            target="gatherLogs"/>
-    </target>
-    <!--
-        Steps to do before running assemble. Note: in version 2.0 (and
-        previous) we need to build the explorer war file by invoking
-        script. In 3.0 forward, we do not, so this simple existence
-        check allows us to use the same script for both streams
-    -->
-    <property
-        name="buildwarfilename"
-        value="${buildDirectory}/plugins/org.eclipse.wst.ws.explorer/build-war.xml"/>
-    <target
-        name="preAssemble"
-        depends="buildwar">
-    </target>
-    <target
-        name="checkForBuildFile">
-        <condition
-            property="buildFileExists">
-            <available
-                file="${buildwarfilename}"/>
-        </condition>
-    </target>
-    <target
-        name="buildwar"
-        depends="checkForBuildFile"
-        if="buildFileExists">
-        <ant
-            antfile="${buildwarfilename}">
-            <property
-                name="baseLocation"
-                value="${baseLocation}"/>
-            <property
-                name="basedir"
-                value="${buildDirectory}/plugins/org.eclipse.wst.ws.explorer"/>
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-        </ant>
-    </target>
-
-    <!--
-      Steps to do after  running assemble.
-    -->
-    <target
-        name="postAssemble"></target>
-
-    <!--
-      Steps to do after the build is done.
-    -->
-    <target
-        name="postBuild"></target>
-
-    <!--
-      Steps to do to test the build results
-    -->
-    <target
-        name="test"></target>
-
-    <!--
-      Steps to do to publish the build results
-    -->
-    <target
-        name="publish"></target>
-
-    <!--
-      Helper targets
-    -->
-    <target
-        name="gatherLogs"
-        if="logsAvailable">
-        <mkdir
-            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
-        <echo
-            level="debug"
-            message="logExtension: ${logExtension}"/>
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="gatherLogs"/>
-            <param
-                name="logExtension"
-                value="${logExtension}"/>
-        </antcall>
-        <unzip
-            dest="${buildDirectory}/${buildLabel}/compilelogs"
-            overwrite="true">
-            <fileset
-                dir="${buildDirectory}/features/org.eclipse.wst.sdk">
-                <include
-                    name="**/*.log.zip"/>
-            </fileset>
-        </unzip>
-        <!--
-            TODO: it is unclear if the above "gather" and unzip do
-            anything constructive. I think not and should be removed
-            (after experimental run, of course.
-        -->
-        <!--
-            workaround: see
-            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-        -->
-        <copy
-            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
-            overwrite="true">
-            <!--
-                we want all @dot.xml files, but assumes a certain
-                structure, to include directory for name of plugin
-            -->
-            <fileset
-                dir="${buildDirectory}/features/">
-                <include
-                    name="**/feature.temp.folder/"/>
-                <exclude
-                    name="**/*tests*feature*/feature.temp.folder/"/>
-            </fileset>
-            <compositemapper>
-                <mapper
-                    type="regexp"
-                    from="(.*)/plugins/(.*)/@dot.xml"
-                    to="/\2/@dot.xml"/>
-                <mapper
-                    type="regexp"
-                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-                    to="/\2/\3bin.xml"/>
-            </compositemapper>
-        </copy>
-    </target>
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="cleanElement"/>
-        </antcall>
-    </target>
-
-    <!--
-      Default target 
-    -->
-    <target
-        name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/wst-sdk/dependency.xml b/releng.wtpbuilder/components/wst-sdk/dependency.xml
deleted file mode 100644
index e0701ed..0000000
--- a/releng.wtpbuilder/components/wst-sdk/dependency.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-    <target
-        name="get">
-        <mkdir
-            dir="${buildDirectory}/maps/${env.RELENG}/maps"/>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="orbitthirdpartymap"/>
-            <param
-                name="base.install.dir"
-                value="${buildDirectory}/maps/${env.RELENG}/maps/"/>
-        </antcall>
-        <property
-            name="pde.builder.path"
-            value="${env.BASE_BUILDERS}/${eclipse.builder.version}/${eclipse.builder}"/>
-        <echo
-            level="debug"
-            message="pde.builder.path: ${pde.builder.path}"/>
-        <echo
-            level="debug"
-            message="eclipse.builder.version: ${eclipse.builder.version}"/>
-        <echo
-            level="debug"
-            message="eclipse.builder: ${eclipse.builder}"/>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipseTestFramework"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="dita"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstall">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/wst.tests/build.properties b/releng.wtpbuilder/components/wst.tests/build.properties
deleted file mode 100644
index 42b1c42..0000000
--- a/releng.wtpbuilder/components/wst.tests/build.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# This is a subdirectory of $buildDirectory
-# Set collectingFolder and archivePrefix to . if you want to create archives without
-# trailing eclipse in the paths of the included files
-collectingFolder=eclipse
-logExtension=.xml
-# The prefix that will be used in the generated archive.
-# Does not make sense to use a different archivePrefix than collectingFolder, 
-# because zip wouldn't find any files to include into the target zip otherwise
-archivePrefix=eclipse
-
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-##################################################
-# Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
-javacVerbose=true
-
-sign=false
diff --git a/releng.wtpbuilder/components/wst.tests/customTargets.xml b/releng.wtpbuilder/components/wst.tests/customTargets.xml
deleted file mode 100644
index dc3a060..0000000
--- a/releng.wtpbuilder/components/wst.tests/customTargets.xml
+++ /dev/null
@@ -1,337 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-    <!--
-        = = = standard properties pattern = = = 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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- let this project specify properties, if not already set -->
-    <property
-        file="build.properties"/>
-    <fail
-        message="dependency.properties must be specified by distribution script"
-        unless="dependency.properties"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set"/>
-    <echo
-        message="buildDirectory: ${buildDirectory}"/>
-    <!--
-        Run a given ${target} on all elements being built Add on <ant>
-        task for each top level element being built.
-    -->
-    <target
-        name="allElements">
-        <echo
-            level="info"
-            message="Target:${target} "/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="info"
-            message="component: ${component}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}"/>
-        <echo
-            level="debug"
-            message="generic target: ${genericTargets}"/>
-        <echo
-            message="compilerArg: ${compilerArg}"/>
-        <echo
-            message="individualSourceBundles: ${individualSourceBundles}"/>
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature"/>
-            <property
-                name="id"
-                value="org.eclipse.wst.tests.feature"/>
-        </ant>
-    </target>
-    <!--
-        Targets to assemble the built elements for particular
-        configurations These generally call the generated assemble
-        scripts (named in ${assembleScriptName}) but may also add pre
-        and post processing Add one target for each root element and
-        each configuration
-    -->
-    <target
-        name="assemble.org.eclipse.wst.tests.feature">
-        <property
-            name="archiveName"
-            value="wtp-wst-Automated-Tests-${buildLabel}.zip"/>
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}"/>
-    </target>
-    <target
-        name="prePackage"/>
-    <target
-        name="postPackage">
-        <property
-            name="archiveName"
-            value="wtp-wst-Automated-Tests-${buildLabel}.zip"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-            <property
-                name="buildLabel"
-                value="${buildLabel}"/>
-            <property
-                name="archiveName"
-                value="${archiveName}"/>
-        </ant>
-    </target>
-
-    <!--
-        Check out map files from repository
-    -->
-    <target
-        name="getMapFiles">
-
-        <!-- for now, get all, at once. May componetize later. -->
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="fetchAllMaps"/>
-    </target>
-
-
-    <!--
-      Steps to do before setup
-    -->
-    <target
-        name="preSetup"></target>
-    <!--
-        Steps to do after setup but before starting the build proper
-    -->
-    <target
-        name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}"/>
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}"/>
-
-        <!-- Get the dependencies -->
-        <antcall
-            target="getDependencies"/>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Get the dependencies based on releng maps -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="getDependencies">
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-            <property
-                name="base.install.dir"
-                value="${buildRoot}"/>
-        </ant>
-    </target>
-
-    <!--
-      Steps to do before fetching the build elements
-    -->
-    <target
-        name="preFetch"></target>
-
-    <!-- 
-      Steps to do after fetching the build elements
-    -->
-    <target
-        name="postFetch"></target>
-
-    <!--
-      Steps to do before generating the build scripts.
-    -->
-    <target
-        name="preGenerate"></target>
-
-    <!--
-      Steps to do after generating the build scripts.
-    -->
-    <target
-        name="postGenerate">
-        <echo
-            message="buildDirectory: ${buildDirectory}"/>
-        <customizeAccessRules
-            bundleDirectory="${buildDirectory}/plugins"
-            defaultRules="+org/eclipse/wst/**/*, +org/eclipse/jst/**/*"/>
-    </target>
-    <!--
-        Steps to do before running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include
-                name="**/about.mappings"/>
-        </replace>
-    </target>
-    <!--
-        Steps to do after running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="postProcess">
-        <condition
-            property="logsAvailable">
-            <istrue
-                value="${javacVerbose}"/>
-        </condition>
-        <antcall
-            target="gatherLogs"/>
-    </target>
-    <!--
-    	Steps to do before running assemble. 
-    -->
-    <target
-        name="preAssemble"></target>
-
-    <!--
-      Steps to do after  running assemble.
-    -->
-    <target
-        name="postAssemble"></target>
-
-    <!--
-      Steps to do after the build is done.
-    -->
-    <target
-        name="postBuild"></target>
-
-    <!--
-      Steps to do to test the build results
-    -->
-    <target
-        name="test"></target>
-
-    <!--
-      Steps to do to publish the build results
-    -->
-    <target
-        name="publish"></target>
-
-    <!--
-      Helper targets
-    -->
-    <target
-        name="gatherLogs"
-        if="logsAvailable">
-        <mkdir
-            dir="${buildDirectory}/${buildLabel}/testcompilelogs"/>
-        <echo
-            level="debug"
-            message="logExtension: ${logExtension}"/>
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="gatherLogs"/>
-            <param
-                name="logExtension"
-                value="${logExtension}"/>
-        </antcall>
-        <unzip
-            dest="${buildDirectory}/${buildLabel}/testcompilelogs"
-            overwrite="true">
-            <fileset
-                dir="${buildDirectory}/features/org.eclipse.wst.tests.feature">
-                <include
-                    name="**/*.log.zip"/>
-            </fileset>
-        </unzip>
-        <!--
-            TODO: it is unclear if the above "gather" and unzip do
-            anything constructive. I think not and should be removed
-            (after experimental run, of course.
-        -->
-        <!--
-            workaround: see
-            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-        -->
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testcompilelogs/plugins"
-            overwrite="true">
-            <!--
-                we want all @dot.xml files, but assumes a certain
-                structure, to include directory for name of plugin
-            -->
-            <fileset
-                dir="${buildDirectory}/features/">
-                <include
-                    name="**/*tests*feature*/feature.temp.folder/"/>
-            </fileset>
-            <compositemapper>
-                <mapper
-                    type="regexp"
-                    from="(.*)/plugins/(.*)/@dot.xml"
-                    to="/\2/@dot.xml"/>
-                <mapper
-                    type="regexp"
-                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-                    to="/\2/\3bin.xml"/>
-            </compositemapper>
-        </copy>
-    </target>
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="cleanElement"/>
-        </antcall>
-    </target>
-
-    <!--
-      Default target 
-    -->
-    <target
-        name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/wst.tests/dependency.xml b/releng.wtpbuilder/components/wst.tests/dependency.xml
deleted file mode 100644
index aebfc34..0000000
--- a/releng.wtpbuilder/components/wst.tests/dependency.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-    <target
-        name="get">
-        <mkdir
-            dir="${buildDirectory}/maps/${env.RELENG}/maps"/>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="orbitthirdpartymap"/>
-            <param
-                name="base.install.dir"
-                value="${buildDirectory}/maps/${env.RELENG}/maps/"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipseTestFramework"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstall">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/wst/build.properties b/releng.wtpbuilder/components/wst/build.properties
deleted file mode 100644
index 99b50ed..0000000
--- a/releng.wtpbuilder/components/wst/build.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# This is a subdirectory of $buildDirectory
-# Set collectingFolder and archivePrefix to . if you want to create archives without
-# trailing eclipse in the paths of the included files
-collectingFolder=eclipse
-logExtension=.xml
-# The prefix that will be used in the generated archive.
-# Does not make sense to use a different archivePrefix than collectingFolder, 
-# because zip wouldn't find any files to include into the target zip otherwise
-archivePrefix=eclipse
-
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-##################################################
-# Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
-javacVerbose=true
-
-sign=true
diff --git a/releng.wtpbuilder/components/wst/customTargets.xml b/releng.wtpbuilder/components/wst/customTargets.xml
deleted file mode 100644
index 2f5a999..0000000
--- a/releng.wtpbuilder/components/wst/customTargets.xml
+++ /dev/null
@@ -1,379 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-    <property
-        name="buildfeature"
-        value="org.eclipse.wst"/>
-    <!--
-        = = = standard properties pattern = = = 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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- let this project specify properties, if not already set -->
-    <property
-        file="build.properties"/>
-    <fail
-        message="dependency.properties must be specified by distribution script"
-        unless="dependency.properties"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set"/>
-    <echo
-        message="buildDirectory: ${buildDirectory}"/>
-    <!--
-        Run a given ${target} on all elements being built Add on <ant>
-        task for each top level element being built.
-    -->
-    <target
-        name="allElements">
-        <echo
-            level="info"
-            message="Target:${target} "/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="info"
-            message="component: ${component}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}"/>
-        <echo
-            level="debug"
-            message="patchFeature: ${patchFeature}"/>
-         <echo
-            level="debug"
-            message="generic target: ${genericTargets}"/>
-        <echo
-            message="compilerArg: ${compilerArg}"/>
-        <echo
-            message="individualSourceBundles: ${individualSourceBundles}"/>
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature"/>
-            <property
-                name="id"
-                value="${buildfeature}"/>
-        </ant>
-    </target>
-    <!--
-        Targets to assemble the built elements for particular
-        configurations These generally call the generated assemble
-        scripts (named in ${assembleScriptName}) but may also add pre
-        and post processing Add one target for each root element and
-        each configuration
-    -->
-    <target
-        name="assemble.org.eclipse.wst">
-        <property
-            name="archiveName"
-            value="wtp-wst-${buildLabel}.zip"/>
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}"/>
-    </target>
-    <target
-        name="prePackage"/>
-    <target
-        name="postPackage">
-        <property
-            name="archiveName"
-            value="wtp-wst-${buildLabel}.zip"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-            <property
-                name="buildLabel"
-                value="${buildLabel}"/>
-            <property
-                name="archiveName"
-                value="${archiveName}"/>
-        </ant>
-    </target>
-
-    <!--
-        Check out map files from repository
-        -->
-    <target
-        name="getMapFiles">
-
-        <!-- for now, get all, at once. May componetize later. -->
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="fetchAllMaps"/>
-    </target>
-
-
-    <!-- 
-        Steps to do before setup
-    -->
-    <target
-        name="preSetup"></target>
-    <!--
-        Steps to do after setup but before starting the build proper
-    -->
-    <target
-        name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}"/>
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}"/>
-
-        <!-- Get the dependencies -->
-        <antcall
-            target="getDependencies"/>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Get the dependencies based on releng maps -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="getDependencies">
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-            <property
-                name="base.install.dir"
-                value="${buildRoot}"/>
-        </ant>
-    </target>
-
-    <!--
-      Steps to do before fetching the build elements
-    -->
-    <target
-        name="preFetch"></target>
-
-    <!-- 
-      Steps to do after fetching the build elements
-    -->
-    <target
-        name="postFetch"></target>
-
-    <!--
-      Steps to do before generating the build scripts.
-    -->
-    <target
-        name="preGenerate"></target>
-
-    <!--
-      Steps to do after generating the build scripts.
-    -->
-    <target
-        name="postGenerate">
-        <echo
-            message="buildDirectory: ${buildDirectory}"/>
-        <customizeAccessRules
-            bundleDirectory="${buildDirectory}/plugins"
-            defaultRules="+org/eclipse/wst/**/*, +org/eclipse/jst/**/*"/>
-    </target>
-    <!--
-        Steps to do before running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include
-                name="**/about.mappings"/>
-        </replace>
-    </target>
-    <!--
-        Steps to do after running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="postProcess">
-        <condition
-            property="logsAvailable">
-            <istrue
-                value="${javacVerbose}"/>
-        </condition>
-        <antcall
-            target="gatherLogs"/>
-    </target>
-    <!--
-        Steps to do before running assemble. Note: in version 2.0 (and
-        previous) we need to build the explorer war file by invoking
-        script. In 3.0 forward, we do not, so this simple existence
-        check allows us to use the same script for both streams
-    -->
-    <property
-        name="buildwarfilename"
-        value="${buildDirectory}/plugins/org.eclipse.wst.ws.explorer/build-war.xml"/>
-    <target
-        name="preAssemble"
-        depends="buildwar">
-    </target>
-    <target
-        name="checkForBuildFile">
-        <condition
-            property="buildFileExists">
-            <available
-                file="${buildwarfilename}"/>
-        </condition>
-    </target>
-    <target
-        name="buildwar"
-        depends="checkForBuildFile"
-        if="buildFileExists">
-        <ant
-            antfile="${buildwarfilename}">
-            <property
-                name="baseLocation"
-                value="${baseLocation}"/>
-            <property
-                name="basedir"
-                value="${buildDirectory}/plugins/org.eclipse.wst.ws.explorer"/>
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-        </ant>
-    </target>
-
-    <!--
-      Steps to do after  running assemble.
-    -->
-    <target
-        name="postAssemble"></target>
-
-    <!--
-      Steps to do after the build is done.
-    -->
-    <target
-        name="postBuild"></target>
-
-    <!--
-      Steps to do to test the build results
-    -->
-    <target
-        name="test"></target>
-
-    <!--
-      Steps to do to publish the build results
-    -->
-    <target
-        name="publish"></target>
-
-    <!--
-      Helper targets
-    -->
-    <target
-        name="gatherLogs"
-        if="logsAvailable">
-    	
-        <mkdir
-            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
-        <echo
-            level="debug"
-            message="logExtension: ${logExtension}"/>
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="gatherLogs"/>
-            <param
-                name="logExtension"
-                value="${logExtension}"/>
-        </antcall>
-        <unzip
-            dest="${buildDirectory}/${buildLabel}/compilelogs"
-            overwrite="true">
-            <fileset
-                dir="${buildDirectory}/features/${buildfeature}">
-                <include
-                    name="**/*.log.zip"/>
-            </fileset>
-        </unzip>
-        <!--
-            TODO: it is unclear if the above "gather" and unzip do
-            anything constructive. I think not and should be removed
-            (after experimental run, of course.
-        -->
-        <!--
-            workaround: see
-            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-        -->
-        <copy
-            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
-            overwrite="true">
-            <!--
-                we want all @dot.xml files, but assumes a certain
-                structure, to include directory for name of plugin
-            -->
-            <fileset
-                dir="${buildDirectory}/features/">
-                <include
-                    name="**/feature.temp.folder/"/>
-                <exclude
-                    name="**/*tests*feature*/feature.temp.folder/"/>
-            </fileset>
-            <compositemapper>
-                <mapper
-                    type="regexp"
-                    from="(.*)/plugins/(.*)/@dot.xml"
-                    to="/\2/@dot.xml"/>
-                <mapper
-                    type="regexp"
-                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-                    to="/\2/\3bin.xml"/>
-            </compositemapper>
-        </copy>
-    </target>
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="cleanElement"/>
-        </antcall>
-    </target>
-
-    <!--
-      Default target 
-    -->
-    <target
-        name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/wst/dependency.xml b/releng.wtpbuilder/components/wst/dependency.xml
deleted file mode 100644
index 56df953..0000000
--- a/releng.wtpbuilder/components/wst/dependency.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-    <target
-        name="get">
-
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined
-        -->
-        <property
-            file="${dependency.properties}"/>
-
-        <mkdir
-            dir="${buildDirectory}/maps/${env.RELENG}/maps"/>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="orbitthirdpartymap"/>
-            <param
-                name="base.install.dir"
-                value="${buildDirectory}/maps/${env.RELENG}/maps/"/>
-        </antcall>
-        <property
-            name="pde.builder.path"
-            value="${env.BASE_BUILDERS}/${eclipse.builder.version}/${eclipse.builder}"/>
-        <echo
-            level="debug"
-            message="pde.builder.path: ${pde.builder.path}"/>
-        <echo
-            level="debug"
-            message="eclipse.builder.version: ${eclipse.builder.version}"/>
-        <echo
-            level="debug"
-            message="eclipse.builder: ${eclipse.builder}"/>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipseTestFramework"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="dita"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstall"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/wstfproj/build.properties b/releng.wtpbuilder/components/wstfproj/build.properties
deleted file mode 100644
index 1232026..0000000
--- a/releng.wtpbuilder/components/wstfproj/build.properties
+++ /dev/null
@@ -1,45 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# This is a subdirectory of $buildDirectory
-# Set collectingFolder and archivePrefix to . if you want to create archives without
-# trailing eclipse in the paths of the included files
-collectingFolder=eclipse
-logExtension=.xml
-# The prefix that will be used in the generated archive.
-# Does not make sense to use a different archivePrefix than collectingFolder, 
-# because zip wouldn't find any files to include into the target zip otherwise
-archivePrefix=eclipse
-
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-##################################################
-# Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
-javacVerbose=true
-
-sign=true
-
-#############################################################
-
-# Properties introduced in 3.5 M3 (PDE base builder R35_M2). See
-# http://aniefer.blogspot.com/2008/10/sorting-bundles-and-parallel.html
-
-flattenDependencies=true
-parallelCompilation=true
diff --git a/releng.wtpbuilder/components/wstfproj/customTargets.xml b/releng.wtpbuilder/components/wstfproj/customTargets.xml
deleted file mode 100644
index 253bb35..0000000
--- a/releng.wtpbuilder/components/wstfproj/customTargets.xml
+++ /dev/null
@@ -1,319 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-    <!--
-        = = = standard properties pattern = = = 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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- let this project specify properties, if not already set -->
-    <property
-        file="build.properties"/>
-    <fail
-        message="dependency.properties must be specified by distribution script"
-        unless="dependency.properties"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set"/>
-    <echo
-        message="buildDirectory: ${buildDirectory}"/>
-    <!--
-        Run a given ${target} on all elements being built Add on <ant>
-        task for each top level element being built.
-    -->
-    <target
-        name="allElements">
-        <echo
-            level="info"
-            message="Target:${target} "/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="info"
-            message="component: ${component}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}"/>
-        <echo
-            level="debug"
-            message="generic target: ${genericTargets}"/>
-        <echo
-            message="compilerArg: ${compilerArg}"/>
-        <echo
-            message="individualSourceBundles: ${individualSourceBundles}"/>
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature"/>
-            <property
-                name="id"
-                value="org.eclipse.wst.common.fproj"/>
-        </ant>
-    </target>
-    <!--
-        Targets to assemble the built elements for particular
-        configurations These generally call the generated assemble
-        scripts (named in ${assembleScriptName}) but may also add pre
-        and post processing Add one target for each root element and
-        each configuration
-    -->
-    <target
-        name="assemble.org.eclipse.wst.common.fproj">
-        <property
-            name="archiveName"
-            value="wst-common-fproj-${buildLabel}.zip"/>
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}"/>
-    </target>
-    <target
-        name="prePackage"/>
-    <target
-        name="postPackage">
-        <property
-            name="archiveName"
-            value="wst-common-fproj-${buildLabel}.zip"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-            <property
-                name="buildLabel"
-                value="${buildLabel}"/>
-            <property
-                name="archiveName"
-                value="${archiveName}"/>
-        </ant>
-    </target>
-
-    <!-- 
-        Check out map files from repository
-    -->
-    <target
-        name="getMapFiles">
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENG}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENGCOMMON}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-    </target>
-
-
-    <!-- 
-        Steps to do before setup
-    -->
-    <target
-        name="preSetup"></target>
-    <!--
-        Steps to do after setup but before starting the build proper
-    -->
-    <target
-        name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}"/>
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}"/>
-
-        <!-- Get the dependencies -->
-        <antcall
-            target="getDependencies"/>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Get the dependencies based on releng maps -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="getDependencies">
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-            <property
-                name="base.install.dir"
-                value="${buildRoot}"/>
-        </ant>
-    </target>
-
-    <!--
-      Steps to do before fetching the build elements
-    -->
-    <target
-        name="preFetch"></target>
-
-    <!-- 
-      Steps to do after fetching the build elements
-    -->
-    <target
-        name="postFetch"></target>
-
-    <!--
-      Steps to do before generating the build scripts.
-    -->
-    <target
-        name="preGenerate"></target>
-
-    <!--
-      Steps to do after generating the build scripts.
-    -->
-    <target
-        name="postGenerate">
-        <echo
-            message="buildDirectory: ${buildDirectory}"/>
-        <customizeAccessRules
-            bundleDirectory="${buildDirectory}/plugins"/>
-    </target>
-    <!--
-        Steps to do before running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include
-                name="**/about.mappings"/>
-        </replace>
-    </target>
-    <!--
-        Steps to do after running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="postProcess">
-        <condition
-            property="logsAvailable">
-            <istrue
-                value="${javacVerbose}"/>
-        </condition>
-        <antcall
-            target="gatherLogs"/>
-    </target>
-
-
-    <!--
-      Steps to do before running assemble. 
-    -->
-    <target
-        name="preAssemble"></target>
-
-    <!--
-      Steps to do after  running assemble.
-    -->
-    <target
-        name="postAssemble"></target>
-
-    <!--
-      Steps to do after the build is done.
-    -->
-    <target
-        name="postBuild"></target>
-
-    <!--
-      Steps to do to test the build results
-    -->
-    <target
-        name="test"></target>
-
-    <!--
-      Steps to do to publish the build results
-    -->
-    <target
-        name="publish"></target>
-
-    <!--
-      Helper targets
-    -->
-    <target
-        name="gatherLogs"
-        if="logsAvailable">
-        <mkdir
-            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
-        <echo
-            level="debug"
-            message="logExtension: ${logExtension}"/>
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="gatherLogs"/>
-            <param
-                name="logExtension"
-                value="${logExtension}"/>
-        </antcall>
-        <unzip
-            dest="${buildDirectory}/${buildLabel}/compilelogs"
-            overwrite="true">
-            <fileset
-                dir="${buildDirectory}/features/org.eclipse.wst.common.fproj">
-                <include
-                    name="**/*.log.zip"/>
-            </fileset>
-        </unzip>
-    </target>
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="cleanElement"/>
-        </antcall>
-    </target>
-
-    <!--
-      Default target 
-    -->
-    <target
-        name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/wstfproj/dependency.xml b/releng.wtpbuilder/components/wstfproj/dependency.xml
deleted file mode 100644
index 350dbac..0000000
--- a/releng.wtpbuilder/components/wstfproj/dependency.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-    <target
-        name="get">
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined, which we do later with
-            statements such if="${groupId}.url"
-        -->
-        <property
-            file="${dependency.properties}"/>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-        <!--
-            <antcall target="getAndInstall"> <param name="groupId"
-            value="dtp"/> </antcall>
-        -->
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value=""/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstall"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/wstfproj_sdk/build.properties b/releng.wtpbuilder/components/wstfproj_sdk/build.properties
deleted file mode 100644
index fef57d7..0000000
--- a/releng.wtpbuilder/components/wstfproj_sdk/build.properties
+++ /dev/null
@@ -1,45 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# This is a subdirectory of $buildDirectory
-# Set collectingFolder and archivePrefix to . if you want to create archives without
-# trailing eclipse in the paths of the included files
-collectingFolder=eclipse
-logExtension=.xml
-# The prefix that will be used in the generated archive.
-# Does not make sense to use a different archivePrefix than collectingFolder, 
-# because zip wouldn't find any files to include into the target zip otherwise
-archivePrefix=eclipse
-
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-##################################################
-# Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
-javacVerbose=true
-
-sign=true
-
-#############################################################
-
-# Properties introduced in 3.5 M3 (PDE base builder R35_M2). See
-# http://aniefer.blogspot.com/2008/10/sorting-bundles-and-parallel.html
-
-flattenDependencies=true
-parallelCompilation=true
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/wstfproj_sdk/customTargets.xml b/releng.wtpbuilder/components/wstfproj_sdk/customTargets.xml
deleted file mode 100644
index 1245350..0000000
--- a/releng.wtpbuilder/components/wstfproj_sdk/customTargets.xml
+++ /dev/null
@@ -1,319 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-    <!--
-        = = = standard properties pattern = = = 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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- let this project specify properties, if not already set -->
-    <property
-        file="build.properties"/>
-    <fail
-        message="dependency.properties must be specified by distribution script"
-        unless="dependency.properties"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set"/>
-    <echo
-        message="buildDirectory: ${buildDirectory}"/>
-    <!--
-        Run a given ${target} on all elements being built Add on <ant>
-        task for each top level element being built.
-    -->
-    <target
-        name="allElements">
-        <echo
-            level="info"
-            message="Target:${target} "/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="info"
-            message="component: ${component}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}"/>
-        <echo
-            level="debug"
-            message="generic target: ${genericTargets}"/>
-        <echo
-            message="compilerArg: ${compilerArg}"/>
-        <echo
-            message="individualSourceBundles: ${individualSourceBundles}"/>
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature"/>
-            <property
-                name="id"
-                value="org.eclipse.wst.common.fproj.sdk"/>
-        </ant>
-    </target>
-    <!--
-        Targets to assemble the built elements for particular
-        configurations These generally call the generated assemble
-        scripts (named in ${assembleScriptName}) but may also add pre
-        and post processing Add one target for each root element and
-        each configuration
-    -->
-    <target
-        name="assemble.org.eclipse.wst.common.fproj.sdk">
-        <property
-            name="archiveName"
-            value="wst-common-fproj-sdk-${buildLabel}.zip"/>
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}"/>
-    </target>
-    <target
-        name="prePackage"/>
-    <target
-        name="postPackage">
-        <property
-            name="archiveName"
-            value="wst-common-fproj-sdk-${buildLabel}.zip"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-            <property
-                name="buildLabel"
-                value="${buildLabel}"/>
-            <property
-                name="archiveName"
-                value="${archiveName}"/>
-        </ant>
-    </target>
-
-    <!--
-        Check out map files from repository
-        -->
-    <target
-        name="getMapFiles">
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENG}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENGCOMMON}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-    </target>
-
-
-    <!-- 
-        Steps to do before setup
-    -->
-    <target
-        name="preSetup"></target>
-    <!--
-        Steps to do after setup but before starting the build proper
-    -->
-    <target
-        name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}"/>
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}"/>
-
-        <!-- Get the dependencies -->
-        <antcall
-            target="getDependencies"/>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Get the dependencies based on releng maps -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="getDependencies">
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-            <property
-                name="base.install.dir"
-                value="${buildRoot}"/>
-        </ant>
-    </target>
-
-    <!--
-      Steps to do before fetching the build elements
-    -->
-    <target
-        name="preFetch"></target>
-
-    <!-- 
-      Steps to do after fetching the build elements
-    -->
-    <target
-        name="postFetch"></target>
-
-    <!--
-      Steps to do before generating the build scripts.
-    -->
-    <target
-        name="preGenerate"></target>
-
-    <!--
-      Steps to do after generating the build scripts.
-    -->
-    <target
-        name="postGenerate">
-        <echo
-            message="buildDirectory: ${buildDirectory}"/>
-        <customizeAccessRules
-            bundleDirectory="${buildDirectory}/plugins"/>
-    </target>
-    <!--
-        Steps to do before running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include
-                name="**/about.mappings"/>
-        </replace>
-    </target>
-    <!--
-        Steps to do after running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="postProcess">
-        <condition
-            property="logsAvailable">
-            <istrue
-                value="${javacVerbose}"/>
-        </condition>
-        <antcall
-            target="gatherLogs"/>
-    </target>
-
-
-    <!--
-      Steps to do before running assemble. 
-        -->
-    <target
-        name="preAssemble"></target>
-
-    <!--
-      Steps to do after  running assemble.
-    -->
-    <target
-        name="postAssemble"></target>
-
-    <!--
-      Steps to do after the build is done.
-    -->
-    <target
-        name="postBuild"></target>
-
-    <!--
-      Steps to do to test the build results
-    -->
-    <target
-        name="test"></target>
-
-    <!--
-      Steps to do to publish the build results
-    -->
-    <target
-        name="publish"></target>
-
-    <!--
-      Helper targets
-    -->
-    <target
-        name="gatherLogs"
-        if="logsAvailable">
-        <mkdir
-            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
-        <echo
-            level="debug"
-            message="logExtension: ${logExtension}"/>
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="gatherLogs"/>
-            <param
-                name="logExtension"
-                value="${logExtension}"/>
-        </antcall>
-        <unzip
-            dest="${buildDirectory}/${buildLabel}/compilelogs"
-            overwrite="true">
-            <fileset
-                dir="${buildDirectory}/features/org.eclipse.wst.common.fproj.sdk">
-                <include
-                    name="**/*.log.zip"/>
-            </fileset>
-        </unzip>
-    </target>
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="cleanElement"/>
-        </antcall>
-    </target>
-
-    <!--
-      Default target 
-    -->
-    <target
-        name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/wstfproj_sdk/dependency.xml b/releng.wtpbuilder/components/wstfproj_sdk/dependency.xml
deleted file mode 100644
index ed8fe66..0000000
--- a/releng.wtpbuilder/components/wstfproj_sdk/dependency.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-    <target
-        name="get">
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined
-        -->
-        <property
-            file="${dependency.properties}"/>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="orbitthirdpartymap"/>
-            <param
-                name="base.install.dir"
-                value="${buildDirectory}/maps/${env.RELENG}/maps/"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-        <!--
-            <antcall target="getAndInstall"> <param name="groupId"
-            value="dtp"/> </antcall>
-        -->
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value=""/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstall"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/wtp-buildTools/build.properties b/releng.wtpbuilder/components/wtp-buildTools/build.properties
deleted file mode 100644
index fa452f3..0000000
--- a/releng.wtpbuilder/components/wtp-buildTools/build.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# This is a subdirectory of $buildDirectory
-# Set collectingFolder and archivePrefix to . if you want to create archives without
-# trailing eclipse in the paths of the included files
-collectingFolder=eclipse
-
-# The prefix that will be used in the generated archive.
-# Does not make sense to use a different archivePrefix than collectingFolder, 
-# because zip wouldn't find any files to include into the target zip otherwise
-archivePrefix=eclipse
-
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-##################################################
-# Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
-javacVerbose=true
-
-sign=false
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/wtp-buildTools/customTargets.xml b/releng.wtpbuilder/components/wtp-buildTools/customTargets.xml
deleted file mode 100644
index 88f6d26..0000000
--- a/releng.wtpbuilder/components/wtp-buildTools/customTargets.xml
+++ /dev/null
@@ -1,278 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-
-  <!-- = = = standard properties pattern = = = 
-
-      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" />
-
-  <!-- 
-      Let users override standard properties, if desired.
-      If directory, file, or some properties do not exist,  
-      then standard properties will be used.
-  -->
-  <property
-      file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties" />
-
-  <!-- let this project specify properties, if not already set -->
-  <property file="build.properties" />
-
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set" />
-    <echo message="buildDirectory: ${buildDirectory}" />
-
-    <!-- 
-        Run a given ${target} on all elements being built
-        Add on <ant> task for each top level element being built.
-    -->
-    <target name="allElements">
-        <echo
-            level="info"
-            message="Target:${target} " />
-        <echo
-            level="debug"
-            message="basedir: ${basedir}" />
-        <echo
-            level="info"
-            message="component: ${component}" />
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}" />
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}" />
-        <echo
-            level="debug"
-            message="generic target: ${genericTargets}" />
-      <echo
-          message="compilerArg: ${compilerArg}" />
-      <echo
-          message="individualSourceBundles: ${individualSourceBundles}" />
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature" />
-            <property
-                name="id"
-                value="org.eclipse.wtp.releng.tests.feature" />
-        </ant>
-    </target>
-
-    <!-- 
-        Targets to assemble the built elements for particular configurations  
-        These generally call the generated assemble scripts (named in 
-        ${assembleScriptName}) but may also add pre and post processing 
-        Add one target for each root element and each configuration 
-    -->
-
-    <target name="assemble.org.eclipse.wtp.releng.tests.feature">
-        <property
-            name="archiveName"
-            value="wtp-buildTools-${buildLabel}.zip" />
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}" />
-
-    </target>
-
-    <target name="prePackage" />
-
-    <target name="postPackage">
-        <property
-            name="archiveName"
-            value="wtp-buildTools-${buildLabel}.zip" />
-
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}" />
-            <property
-                name="buildLabel"
-                value="${buildLabel}" />
-            <property
-                name="archiveName"
-                value="${archiveName}" />
-        </ant>
-
-
-    </target>
-
-        <!--
-        Check out map files from repository
-        -->
-
-
-    <target name="getMapFiles">
-
-        <!-- for now, get all, at once. May componetize later. -->
-
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="fetchAllMaps" />
-
-    </target>
-
-
-    <!-- 
-        Steps to do before setup
-    -->
-    <target name="preSetup"></target>
-
-    <!--
-      Steps to do after setup but before starting the build proper
-    -->
-    <target name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir" />
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}" />
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}" />
-
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-            <property
-                name="dependency.properties"
-                value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties" />
-            <property
-                name="base.install.dir"
-                value="${buildRoot}" />
-        </ant>
-
-    </target>
-
-    <!--
-      Steps to do before fetching the build elements
-    -->
-    <target name="preFetch"></target>
-
-    <!-- 
-      Steps to do after fetching the build elements
-    -->
-    <target name="postFetch"></target>
-
-    <!--
-      Steps to do before generating the build scripts.
-    -->   
-     <target name="preGenerate"></target>
-
-    <!--
-      Steps to do after generating the build scripts.
-    -->
-    <target name="postGenerate"></target>
-
-
-    <!-- 
-      Steps to do before running the build.xmls for the elements being built.
-    -->
-    <target name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include name="**/about.mappings" />
-        </replace>
-    </target>
-
-    <!--
-      Steps to do after running the build.xmls for the elements being built.
-    -->
-    <target name="postProcess">
-        <condition property="logsAvailable">
-            <istrue value="${javacVerbose}" />
-        </condition>
-        <antcall target="gatherLogs" />
-    </target>
-
-
-    <!-- 
-        Steps to do before running assemble.
-     -->
-    <target name="preAssemble"></target>
-
-    <!--
-      Steps to do after  running assemble.
-    -->
-    <target name="postAssemble"></target>
-
-    <!--
-      Steps to do after the build is done.
-    -->
-    <target name="postBuild"></target>
-
-    <!--
-      Steps to do to test the build results
-    -->    
-    <target name="test"></target>
-
-    <!--
-      Steps to do to publish the build results
-    -->
-    <target name="publish"></target>
-
-    <!--
-      Helper targets
-    -->
-    <target
-        name="gatherLogs"
-        if="logsAvailable">
-        <mkdir dir="${buildDirectory}/${buildLabel}/compilelogs" />
-        <echo
-            level="debug"
-            message="logExtension: ${logExtension}" />
-        <antcall target="allElements">
-            <param
-                name="target"
-                value="gatherLogs" />
-          <param
-              name="logExtension"
-              value="${logExtension}" />
-
-        </antcall>
-
-        <unzip
-            dest="${buildDirectory}/${buildLabel}/compilelogs"
-            overwrite="true">
-            <fileset
-                dir="${buildDirectory}/features/org.eclipse.wtp.releng.tests.feature">
-                <include name="**/*.log.zip" />
-            </fileset>
-        </unzip>
-
-
-    </target>
-
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall target="allElements">
-            <param
-                name="target"
-                value="cleanElement" />
-        </antcall>
-    </target>
-
-    <!--
-      Default target 
-    -->
-    <target name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file" />
-    </target>
-
-</project>
diff --git a/releng.wtpbuilder/components/wtp-buildTools/dependency.xml b/releng.wtpbuilder/components/wtp-buildTools/dependency.xml
deleted file mode 100644
index 1c73094..0000000
--- a/releng.wtpbuilder/components/wtp-buildTools/dependency.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<!-- ====================================================================== 
-    Properties that must be passed to this script:
-    base.install.dir
-    dependencyTargets
-    local.cache.dir
-    dependency.properties
-    
-    
-    ====================================================================== -->
-<project
-    name="test"
-    default="get">
-
-    <target name="get">
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipse" />
-        </antcall>
-    </target>
-
-
-    <target name="getAndInstall">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}" />
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}" />
-            <property
-                name="install.destination"
-                value="${base.install.dir}" />
-        </ant>
-    </target>
-
-
-
-
-</project>
-
diff --git a/releng.wtpbuilder/components/wtp-patches-tests/build.properties b/releng.wtpbuilder/components/wtp-patches-tests/build.properties
deleted file mode 100644
index d50ce24..0000000
--- a/releng.wtpbuilder/components/wtp-patches-tests/build.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# This is a subdirectory of $buildDirectory
-# Set collectingFolder and archivePrefix to . if you want to create archives without
-# trailing eclipse in the paths of the included files
-collectingFolder=eclipse
-
-# The prefix that will be used in the generated archive.
-# Does not make sense to use a different archivePrefix than collectingFolder, 
-# because zip wouldn't find any files to include into the target zip otherwise
-archivePrefix=eclipse
-logExtension=.xml
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-##################################################
-# Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
-javacVerbose=true
-
-sign=false
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/wtp-patches-tests/customTargets.xml b/releng.wtpbuilder/components/wtp-patches-tests/customTargets.xml
deleted file mode 100644
index 035d713..0000000
--- a/releng.wtpbuilder/components/wtp-patches-tests/customTargets.xml
+++ /dev/null
@@ -1,286 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-
-    <property
-        name="patchFeature"
-        value="org.eclipse.wtp.patch.tests.assembly.feature" />
-
-
-
-  <!-- = = = standard properties pattern = = = 
-
-      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" />
-
-  <!-- 
-      Let users override standard properties, if desired.
-      If directory, file, or some properties do not exist,  
-      then standard properties will be used.
-  -->
-  <property
-      file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties" />
-
-  <!-- let this project specify properties, if not already set -->
-  <property file="build.properties" />
-
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set" />
-    <echo message="buildDirectory: ${buildDirectory}" />
-
-    <!-- 
-        Run a given ${target} on all elements being built
-        Add on <ant> task for each top level element being built.
-    -->
-    <target name="allElements">
-        <echo
-            level="info"
-            message="Target:${target} " />
-        <echo
-            level="debug"
-            message="basedir: ${basedir}" />
-        <echo
-            level="info"
-            message="component: ${component}" />
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}" />
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}" />
-        <echo
-            level="debug"
-            message="patchFeature: ${patchFeature}" />
-      <echo
-          message="compilerArg: ${compilerArg}" />
-      <echo
-          message="individualSourceBundles: ${individualSourceBundles}" />
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature" />
-            <property
-                name="id"
-                value="${patchFeature}" />
-        </ant>
-    </target>
-
-    <!-- 
-        Targets to assemble the built elements for particular configurations  
-        These generally call the generated assemble scripts (named in 
-        ${assembleScriptName}) but may also add pre and post processing 
-        Add one target for each root element and each configuration 
-    -->
-
-    <target name="assemble.org.eclipse.wtp.patch.tests.assembly.feature">
-        <property
-            name="archiveName"
-            value="wtp-patches-tests-${buildLabel}.zip" />
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}" />
-    </target>
-
-    <target name="prePackage" />
-
-
-    <target name="postPackage">
-        <property
-            name="archiveName"
-            value="wtp-patches-tests-${buildLabel}.zip" />
-
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}" />
-            <property
-                name="buildLabel"
-                value="${buildLabel}" />
-            <property
-                name="archiveName"
-                value="${archiveName}" />
-        </ant>
-
-
-    </target>
-
-
-        <!--
-        Check out map files from repository
-        -->
-    <target name="getMapFiles">
-
-        <!-- for now, get all, at once. May componetize later. -->
-
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="fetchAllMaps" />
-
-    </target>
-
-
-    <!-- 
-        Steps to do before setup
-    -->
-    <target name="preSetup"></target>
-
-    <!--
-      Steps to do after setup but before starting the build proper
-    -->
-    <target name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir" />
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}" />
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}" />
-
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-
-              <property
-                  name="env.DEP_DIR"
-                  value=""/>
-        	
-            <property
-                name="dependency.properties"
-                value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties" />
-            <property
-                name="base.install.dir"
-                value="${buildRoot}" />
-        </ant>
-
-    </target>
-
-    <!--
-      Steps to do before fetching the build elements
-    -->
-    <target name="preFetch"></target>
-
-    <!-- 
-      Steps to do after fetching the build elements
-    -->
-    <target name="postFetch"></target>
-
-    <!--
-      Steps to do before generating the build scripts.
-    -->
-    <target name="preGenerate"></target>
-
-    <!-- 
-      Steps to do after generating the build scripts.
-     -->
-    <target name="postGenerate"></target>
-
-
-    <!-- 
-      Steps to do before running the build.xmls for the elements being built.
-    -->
-    <target name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include name="**/about.mappings" />
-        </replace>
-    </target>
-
-    <!--
-      Steps to do after running the build.xmls for the elements being built.
-    -->
-    <target name="postProcess">
-        <condition property="logsAvailable">
-            <istrue value="${javacVerbose}" />
-        </condition>
-        <antcall target="gatherLogs" />
-    </target>
-
-    <!-- 
-    	  Steps to do before running assemble. 
-     -->
-    <target name="preAssemble"></target>
-
-    <!--
-      Steps to do after  running assemble.
-    -->
-    <target name="postAssemble"></target>
-
-    <!--
-      Steps to do after the build is done.
-    -->
-    <target name="postBuild"></target>
-
-    <!--
-      Steps to do to test the build results
-    -->    
-    <target name="test"></target>
-
-    <!--
-      Steps to do to publish the build results
-    -->
-    <target name="publish"></target>
-
-    <!--
-      Helper targets
-    -->
-    <target
-        name="gatherLogs"
-        if="logsAvailable">
-        <mkdir dir="${buildDirectory}/${buildLabel}/testcompilelogs" />
-        <echo
-            level="debug"
-            message="logExtension: ${logExtension}" />
-        <antcall target="allElements">
-            <param
-                name="target"
-                value="gatherLogs" />
-          <param
-              name="logExtension"
-              value="${logExtension}" />
-
-        </antcall>
-        <unzip
-            dest="${buildDirectory}/${buildLabel}/testcompilelogs"
-            overwrite="true">
-            <fileset 
-                dir="${buildDirectory}/features/${patchFeature}">
-                <include name="**/*.log.zip" />
-            </fileset>
-        </unzip>
-
-
-    </target>
-
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall target="allElements">
-            <param
-                name="target"
-                value="cleanElement" />
-        </antcall>
-    </target>
-
-    <!--
-      Default target 
-    -->
-    <target name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file" />
-    </target>
-
-</project>
diff --git a/releng.wtpbuilder/components/wtp-patches-tests/dependency.xml b/releng.wtpbuilder/components/wtp-patches-tests/dependency.xml
deleted file mode 100644
index 8e2981a..0000000
--- a/releng.wtpbuilder/components/wtp-patches-tests/dependency.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0"?>
-<!-- ====================================================================== 
-    Properties that must be passed to this script:
-    base.install.dir
-    dependencyTargets
-    local.cache.dir
-    dependency.properties
-    
-    
-    ====================================================================== -->
-<project
-    name="test"
-    default="get">
-
-    <target name="get">
-        <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="eclipse" />
-        </antcall>
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipseTestFramework" />
-        </antcall>
-
-
-        <!-- for patch builds, also get a whole released version to 
-            compile against -->
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp" />
-        </antcall>
-        <!-- including tests -->
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp-wst-test" />
-        </antcall>
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp-jst-test" />
-        </antcall>
-    </target>
-
-
-    <target name="getAndInstall">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}" />
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}" />
-            <property
-                name="install.destination"
-                value="${base.install.dir}" />
-        </ant>
-    </target>
-
-
-
-
-</project>
-
diff --git a/releng.wtpbuilder/components/wtp-patches/build.properties b/releng.wtpbuilder/components/wtp-patches/build.properties
deleted file mode 100644
index 2fbf421..0000000
--- a/releng.wtpbuilder/components/wtp-patches/build.properties
+++ /dev/null
@@ -1,38 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-#####################
-# Parameters describing how and where to execute the build.
-# Typical users need only update the following properties:
-#    baseLocation - where things you are building against are installed
-#    configs - the list of {os, ws, arch} configurations to build.  
-#
-# Of course any of the settings here can be overridden by spec'ing 
-# them on the command line (e.g., -DbaseLocation=d:/eclipse
-
-############# CVS CONTROL ################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# The location underwhich all of the build output will be collected.
-collectingFolder=eclipse
-
-# The prefix that will be used in the generated archive.
-archivePrefix=eclipse
-
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-sign=false
diff --git a/releng.wtpbuilder/components/wtp-patches/customTargets.xml b/releng.wtpbuilder/components/wtp-patches/customTargets.xml
deleted file mode 100644
index 89d28dd..0000000
--- a/releng.wtpbuilder/components/wtp-patches/customTargets.xml
+++ /dev/null
@@ -1,413 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-    <property
-        name="buildfeature"
-        value="org.eclipse.wtp.patch.assembly.feature"/>
-    <!--
-        = = = standard properties pattern = = = 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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-	<!-- let this project specify properties, if not already set -->
-    <property
-        file="build.properties"/>
-    <fail
-        message="dependency.properties must be specified by distribution script"
-        unless="dependency.properties"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set"/>
-    <echo
-        message="buildDirectory: ${buildDirectory}"/>
-    <!--
-        Run a given ${target} on all elements being built Add on <ant>
-        task for each top level element being built.
-    -->
-    <target
-        name="allElements">
-        <echo
-            level="info"
-            message="Target:${target} "/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="info"
-            message="component: ${component}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}"/>
-        <echo
-            level="debug"
-            message="patchFeature: ${patchFeature}"/>
-        <echo
-            message="compilerArg: ${compilerArg}"/>
-        <echo
-            message="individualSourceBundles: ${individualSourceBundles}"/>
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature"/>
-            <property
-                name="id"
-                value="${buildfeature}"/>
-        </ant>
-    </target>
-    <!--
-        Targets to assemble the built elements for particular
-        configurations These generally call the generated assemble
-        scripts (named in ${assembleScriptName}) but may also add pre
-        and post processing Add one target for each root element and
-        each configuration
-    -->
-    <target
-        name="assemble.org.eclipse.wtp.patch.assembly.feature">
-        <property
-            name="archiveName"
-            value="wtp-${buildLabel}.zip"/>
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}"/>
-    </target>
-    <target
-        name="prePackage"/>
-    <target
-        name="postPackage">
-        <property
-            name="archiveName"
-            value="wtp-${buildLabel}.zip"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-            <property
-                name="buildLabel"
-                value="${buildLabel}"/>
-            <property
-                name="archiveName"
-                value="${archiveName}"/>
-        </ant>
-    </target>
-
-
-	<!-- 
-        Check out map files from repository
-    -->
-    <target
-        name="getMapFiles">
-
-		<!-- fetch only those related to 155 patches -->
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENG}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENGCOMMON}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENGSERVERTOOLS}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENGSOURCEEDITING}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENGWEBSERVICES}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENGEJBTOOLS}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENGJEETOOLS}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENGDATATOOLS}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-    </target>
-
-
-	<!-- 
-        Steps to do before setup
-    -->
-    <target
-        name="preSetup">
-    </target>
-    <!--
-        Steps to do after setup but before starting the build proper
-    -->
-    <target
-        name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}"/>
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}"/>
-
-        <!-- Get the dependencies -->
-        <antcall
-            target="getDependencies"/>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Get the dependencies based on releng maps -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="getDependencies">
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-            <property
-                name="base.install.dir"
-                value="${buildRoot}"/>
-        </ant>
-    </target>
-
-	<!--
-      Steps to do before fetching the build elements
-    -->
-    <target
-        name="preFetch"></target>
-
-	<!-- 
-      Steps to do after fetching the build elements
-    -->
-    <target
-        name="postFetch"></target>
-
-	<!--
-      Steps to do before generating the build scripts.
-    -->
-    <target
-        name="preGenerate"></target>
-
-	<!-- 
-      Steps to do after generating the build scripts.
-     -->
-    <target
-        name="postGenerate">
-    </target>
-    <!--
-        Steps to do before running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include
-                name="**/about.mappings"/>
-        </replace>
-    </target>
-    <!--
-        Steps to do after running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="postProcess">
-        <condition
-            property="logsAvailable">
-            <istrue
-                value="${javacVerbose}"/>
-        </condition>
-        <antcall
-            target="gatherLogs"/>
-    </target>
-    <!--
-        Steps to do before running assemble. Note: in version 2.0 (and
-        previous) we need to build the explorer war file by invoking
-        script. In 3.0 forward, we do not, so this simple existence
-        check allows us to use the same script for both streams
-    -->
-    <property
-        name="buildwarfilename"
-        value="${buildDirectory}/plugins/org.eclipse.wst.ws.explorer/build-war.xml"/>
-    <target
-        name="preAssemble"
-        depends="buildwar">
-    </target>
-    <target
-        name="checkForBuildFile">
-        <condition
-            property="buildFileExists">
-            <available
-                file="${buildwarfilename}"/>
-        </condition>
-    </target>
-    <target
-        name="buildwar"
-        depends="checkForBuildFile"
-        if="buildFileExists">
-        <ant
-            antfile="${buildwarfilename}">
-            <property
-                name="baseLocation"
-                value="${baseLocation}"/>
-            <property
-                name="basedir"
-                value="${buildDirectory}/plugins/org.eclipse.wst.ws.explorer"/>
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-        </ant>
-    </target>
-
-	<!--
-      Steps to do after  running assemble.
-    -->
-    <target
-        name="postAssemble"></target>
-
-	<!--
-      Steps to do after the build is done.
-    -->
-    <target
-        name="postBuild"></target>
-
-	<!--
-      Steps to do to test the build results
-    -->
-    <target
-        name="test"></target>
-
-	<!--
-      Steps to do to publish the build results
-    -->
-    <target
-        name="publish"></target>
-
-	<!--
-      Helper targets
-    -->
-    <target
-        name="gatherLogs"
-        if="logsAvailable">
-        <mkdir
-            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
-        <echo
-            level="debug"
-            message="logExtension: ${logExtension}"/>
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="gatherLogs"/>
-            <param
-                name="logExtension"
-                value="${logExtension}"/>
-        </antcall>
-        <unzip
-            dest="${buildDirectory}/${buildLabel}/compilelogs"
-            overwrite="true">
-            <fileset
-                dir="${buildDirectory}/features/${buildfeature}">
-                <include
-                    name="**/*.log.zip"/>
-            </fileset>
-        </unzip>
-    </target>
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="cleanElement"/>
-        </antcall>
-    </target>
-
-	<!--
-      Default target 
-    -->
-    <target
-        name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/wtp-patches/dependency.xml b/releng.wtpbuilder/components/wtp-patches/dependency.xml
deleted file mode 100644
index 82323c5..0000000
--- a/releng.wtpbuilder/components/wtp-patches/dependency.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-    
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-
-    <target 
-        name="get">
-        
-        <fail message="depenendency.properties must be defined" unless="dependency.properties" />
-    	<available file="${dependency.properties}" property="dependenciesExists" />
-    	<fail message="The expected depenendency.properties, ${dependency.properties}, does not exist." unless="dependenciesExists" />
-    	<echo message="dependency.properties file: ${dependency.properties}" />
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined
-        -->
-        <property
-            file="${dependency.properties}"/>
-
-        <mkdir
-            dir="${buildDirectory}/maps/${env.RELENG}/maps"/>
-            
-                    <property
-            name="pde.builder.path"
-            value="${env.BASE_BUILDERS}/${eclipse.builder.version}/${eclipse.builder}"/>
-        <echo
-            level="debug"
-            message="pde.builder.path: ${pde.builder.path}"/>
-        <echo
-            level="debug"
-            message="eclipse.builder.version: ${eclipse.builder.version}"/>
-        <echo
-            level="debug"
-            message="eclipse.builder: ${eclipse.builder}"/>
-        
-        <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="eclipse" />
-        </antcall>
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipseTestFramework" />
-        </antcall>
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="dita" />
-        </antcall>
-
-        <!--
-            for patch builds, also get a whole released version to
-            compile against
-        -->
-        
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp" />
-        </antcall>
-        <!-- including tests -->
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp-wst-test" />
-        </antcall>
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp-jst-test" />
-        </antcall>
-
-
-    </target>
-
-
-    <target 
-        name="getAndInstall"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}" />
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}" />
-            <property
-                name="install.destination"
-                value="${base.install.dir}" />
-        </ant>
-    </target>
-
-
-
-
-</project>
-
diff --git a/releng.wtpbuilder/components/wtp-patches2-tests/build.properties b/releng.wtpbuilder/components/wtp-patches2-tests/build.properties
deleted file mode 100644
index d50ce24..0000000
--- a/releng.wtpbuilder/components/wtp-patches2-tests/build.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# This is a subdirectory of $buildDirectory
-# Set collectingFolder and archivePrefix to . if you want to create archives without
-# trailing eclipse in the paths of the included files
-collectingFolder=eclipse
-
-# The prefix that will be used in the generated archive.
-# Does not make sense to use a different archivePrefix than collectingFolder, 
-# because zip wouldn't find any files to include into the target zip otherwise
-archivePrefix=eclipse
-logExtension=.xml
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-##################################################
-# Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
-javacVerbose=true
-
-sign=false
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/wtp-patches2-tests/customTargets.xml b/releng.wtpbuilder/components/wtp-patches2-tests/customTargets.xml
deleted file mode 100644
index d01fd61..0000000
--- a/releng.wtpbuilder/components/wtp-patches2-tests/customTargets.xml
+++ /dev/null
@@ -1,282 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-
-    <property
-        name="patchFeature"
-        value="org.eclipse.wtp.patch.tests.assembly.feature" />
-
-
-
-  <!-- = = = standard properties pattern = = = 
-
-      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" />
-
-  <!-- 
-      Let users override standard properties, if desired.
-      If directory, file, or some properties do not exist,  
-      then standard properties will be used.
-  -->
-  <property
-      file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties" />
-
-  <!-- let this project specify properties, if not already set -->
-  <property file="build.properties" />
-
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set" />
-    <echo message="buildDirectory: ${buildDirectory}" />
-
-    <!-- 
-        Run a given ${target} on all elements being built
-        Add on <ant> task for each top level element being built.
-    -->
-    <target name="allElements">
-        <echo
-            level="info"
-            message="Target:${target} " />
-        <echo
-            level="debug"
-            message="basedir: ${basedir}" />
-        <echo
-            level="info"
-            message="component: ${component}" />
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}" />
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}" />
-        <echo
-            level="debug"
-            message="patchFeature: ${patchFeature}" />
-      <echo
-          message="compilerArg: ${compilerArg}" />
-      <echo
-          message="individualSourceBundles: ${individualSourceBundles}" />
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature" />
-            <property
-                name="id"
-                value="${patchFeature}" />
-        </ant>
-    </target>
-
-    <!-- 
-        Targets to assemble the built elements for particular configurations  
-        These generally call the generated assemble scripts (named in 
-        ${assembleScriptName}) but may also add pre and post processing 
-        Add one target for each root element and each configuration 
-    -->
-
-    <target name="assemble.org.eclipse.wtp.patch.tests.assembly.feature">
-        <property
-            name="archiveName"
-            value="wtp-patches-tests-${buildLabel}.zip" />
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}" />
-    </target>
-
-    <target name="prePackage" />
-
-
-    <target name="postPackage">
-        <property
-            name="archiveName"
-            value="wtp-patches-tests-${buildLabel}.zip" />
-
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}" />
-            <property
-                name="buildLabel"
-                value="${buildLabel}" />
-            <property
-                name="archiveName"
-                value="${archiveName}" />
-        </ant>
-
-
-   </target>
-
-
-        <!--
-        Check out map files from repository
-        -->
-    <target name="getMapFiles">
-
-        <!-- for now, get all, at once. May componetize later. -->
-
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="fetchAllMaps" />
-
-    </target>
-
-
-    <!-- 
-        Steps to do before setup
-    -->
-    <target name="preSetup"></target>
-
-    <!--
-      Steps to do after setup but before starting the build proper
-    -->
-    <target name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir" />
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}" />
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}" />
-
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-            <property
-                name="dependency.properties"
-                value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties" />
-            <property
-                name="base.install.dir"
-                value="${buildRoot}" />
-        </ant>
-
-    </target>
-
-    <!--
-      Steps to do before fetching the build elements
-    -->
-    <target name="preFetch"></target>
-
-    <!-- 
-      Steps to do after fetching the build elements
-    -->
-    <target name="postFetch"></target>
-
-    <!--
-      Steps to do before generating the build scripts.
-    -->
-    <target name="preGenerate"></target>
-
-    <!-- 
-      Steps to do after generating the build scripts.
-     -->
-    <target name="postGenerate"></target>
-
-
-    <!-- 
-      Steps to do before running the build.xmls for the elements being built.
-    -->
-    <target name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include name="**/about.mappings" />
-        </replace>
-    </target>
-
-    <!--
-      Steps to do after running the build.xmls for the elements being built.
-    -->
-    <target name="postProcess">
-        <condition property="logsAvailable">
-            <istrue value="${javacVerbose}" />
-        </condition>
-        <antcall target="gatherLogs" />
-
-    </target>
-
-    <!-- 
-    	  Steps to do before running assemble. 
-     -->
-    <target name="preAssemble"></target>
-
-    <!--
-      Steps to do after  running assemble.
-    -->
-    <target name="postAssemble"></target>
-
-    <!--
-      Steps to do after the build is done.
-    -->
-    <target name="postBuild"></target>
-
-    <!--
-      Steps to do to test the build results
-    -->    
-    <target name="test"></target>
-
-    <!--
-      Steps to do to publish the build results
-    -->
-    <target name="publish"></target>
-
-    <!--
-      Helper targets
-    -->
-    <target
-        name="gatherLogs"
-        if="logsAvailable">
-        <mkdir dir="${buildDirectory}/${buildLabel}/testcompilelogs" />
-        <echo
-            level="debug"
-            message="logExtension: ${logExtension}" />
-        <antcall target="allElements">
-            <param
-                name="target"
-                value="gatherLogs" />
-          <param
-              name="logExtension"
-              value="${logExtension}" />
-
-        </antcall>
-        <unzip
-            dest="${buildDirectory}/${buildLabel}/testcompilelogs"
-            overwrite="true">
-            <fileset 
-                dir="${buildDirectory}/features/${patchFeature}">
-                <include name="**/*.log.zip" />
-            </fileset>
-        </unzip>
-
-
-    </target>
-
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall target="allElements">
-            <param
-                name="target"
-                value="cleanElement" />
-        </antcall>
-    </target>
-
-    <!--
-      Default target 
-    -->
-    <target name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file" />
-    </target>
-
-</project>
diff --git a/releng.wtpbuilder/components/wtp-patches2-tests/dependency.xml b/releng.wtpbuilder/components/wtp-patches2-tests/dependency.xml
deleted file mode 100644
index 8e2981a..0000000
--- a/releng.wtpbuilder/components/wtp-patches2-tests/dependency.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0"?>
-<!-- ====================================================================== 
-    Properties that must be passed to this script:
-    base.install.dir
-    dependencyTargets
-    local.cache.dir
-    dependency.properties
-    
-    
-    ====================================================================== -->
-<project
-    name="test"
-    default="get">
-
-    <target name="get">
-        <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="eclipse" />
-        </antcall>
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipseTestFramework" />
-        </antcall>
-
-
-        <!-- for patch builds, also get a whole released version to 
-            compile against -->
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp" />
-        </antcall>
-        <!-- including tests -->
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp-wst-test" />
-        </antcall>
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp-jst-test" />
-        </antcall>
-    </target>
-
-
-    <target name="getAndInstall">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}" />
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}" />
-            <property
-                name="install.destination"
-                value="${base.install.dir}" />
-        </ant>
-    </target>
-
-
-
-
-</project>
-
diff --git a/releng.wtpbuilder/components/wtp-patches2/build.properties b/releng.wtpbuilder/components/wtp-patches2/build.properties
deleted file mode 100644
index 2fbf421..0000000
--- a/releng.wtpbuilder/components/wtp-patches2/build.properties
+++ /dev/null
@@ -1,38 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-#####################
-# Parameters describing how and where to execute the build.
-# Typical users need only update the following properties:
-#    baseLocation - where things you are building against are installed
-#    configs - the list of {os, ws, arch} configurations to build.  
-#
-# Of course any of the settings here can be overridden by spec'ing 
-# them on the command line (e.g., -DbaseLocation=d:/eclipse
-
-############# CVS CONTROL ################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# The location underwhich all of the build output will be collected.
-collectingFolder=eclipse
-
-# The prefix that will be used in the generated archive.
-archivePrefix=eclipse
-
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-sign=false
diff --git a/releng.wtpbuilder/components/wtp-patches2/customTargets.xml b/releng.wtpbuilder/components/wtp-patches2/customTargets.xml
deleted file mode 100644
index ae1d0ea..0000000
--- a/releng.wtpbuilder/components/wtp-patches2/customTargets.xml
+++ /dev/null
@@ -1,304 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-    <property
-        name="patchFeature"
-        value="org.eclipse.wtp.patch.assembly.feature" />
-
-
-  <!-- = = = standard properties pattern = = = 
-
-      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" />
-
-	<!-- 
-      Let users override standard properties, if desired.
-      If directory, file, or some properties do not exist,  
-      then standard properties will be used.
-  -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties" />
-
-	<!-- let this project specify properties, if not already set -->
-  <property file="build.properties" />
-
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set" />
-    <echo message="buildDirectory: ${buildDirectory}" />
-
-    <!-- 
-        Run a given ${target} on all elements being built
-        Add on <ant> task for each top level element being built.
-    -->
-    <target name="allElements">
-        <echo
-            level="info"
-            message="Target:${target} " />
-        <echo
-            level="debug"
-            message="basedir: ${basedir}" />
-        <echo
-            level="info"
-            message="component: ${component}" />
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}" />
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}" />
-        <echo
-            level="debug"
-            message="patchFeature: ${patchFeature}" />
-      <echo
-          message="compilerArg: ${compilerArg}" />
-      <echo
-          message="individualSourceBundles: ${individualSourceBundles}" />
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature" />
-            <property
-                name="id"
-                value="${patchFeature}" />
-        </ant>
-    </target>
-
-    <!-- 
-        Targets to assemble the built elements for particular configurations  
-        These generally call the generated assemble scripts (named in 
-        ${assembleScriptName}) but may also add pre and post processing 
-        Add one target for each root element and each configuration 
-    -->
-
-    <target name="assemble.org.eclipse.wtp.patch.assembly.feature">
-        <property
-            name="archiveName"
-            value="wtp-${buildLabel}.zip" />
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}" />
-    </target>
-
-    <target name="prePackage" />
-
-    <target name="postPackage">
-        <property
-            name="archiveName"
-            value="wtp-${buildLabel}.zip" />
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}" />
-            <property
-                name="buildLabel"
-                value="${buildLabel}" />
-            <property
-                name="archiveName"
-                value="${archiveName}" />
-        </ant>
-
-    </target>
-
-
-   <!-- 
-        Check out map files from repository
-    -->
-    <target name="getMapFiles">
-
-        <!-- for now, get all, at once. May componetize later. -->
-
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="fetchAllMaps" />
-
-    </target>
-
-
-    <!-- 
-        Steps to do before setup
-    -->
-    <target name="preSetup"></target>
-
-    <!--
-      Steps to do after setup but before starting the build proper
-    -->
-    <target name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir" />
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}" />
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}" />
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-            <property
-                name="dependency.properties"
-                value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties" />
-            <property
-                name="base.install.dir"
-                value="${buildRoot}" />
-        </ant>
-
-   </target>
-   
-    <!--
-      Steps to do before fetching the build elements
-    -->
-    <target name="preFetch"></target>
-
-    <!-- 
-      Steps to do after fetching the build elements
-    -->
-    <target name="postFetch"></target>
-
-    <!--
-      Steps to do before generating the build scripts.
-    -->
-    <target name="preGenerate"></target>
-
-    <!-- 
-      Steps to do after generating the build scripts.
-     -->
-    <target name="postGenerate"></target>
-
-
-    <!-- 
-      Steps to do before running the build.xmls for the elements being built.
-    -->
-    <target name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include name="**/about.mappings" />
-        </replace>
-    </target>
-
-    <!--
-      Steps to do after running the build.xmls for the elements being built.
-    -->
-    <target name="postProcess">
-        <condition property="logsAvailable">
-            <istrue value="${javacVerbose}" />
-        </condition>
-        <antcall target="gatherLogs" />
-    </target>
-
-
-    <!-- 
-      Steps to do before running assemble.
-      Note: in version 2.0 (and previous) we need to build the 
-        explorer war file by invoking script. In 3.0 forward, we do not, 
-        so this simple existence check allows us to use the same script for 
-        both streams
-    -->
-    <property
-        name="buildwarfilename"
-        value="${buildDirectory}/plugins/org.eclipse.wst.ws.explorer/build-war.xml" />
-    <target
-        name="preAssemble"
-        depends="buildwar">
-    </target>
-
-    <target name="checkForBuildFile">
-        <condition property="buildFileExists">
-            <available file="${buildwarfilename}" />
-        </condition>
-    </target>
-    <target
-        name="buildwar"
-        depends="checkForBuildFile"
-        if="buildFileExists">
-        <ant antfile="${buildwarfilename}">
-            <property
-                name="baseLocation"
-                value="${baseLocation}" />
-            <property
-                name="basedir"
-                value="${buildDirectory}/plugins/org.eclipse.wst.ws.explorer" />
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}" />
-        </ant>
-    </target>
-
-    <!--
-      Steps to do after  running assemble.
-    -->
-    <target name="postAssemble"></target>
-
-    <!--
-      Steps to do after the build is done.
-    -->
-    <target name="postBuild"></target>
-
-    <!--
-      Steps to do to test the build results
-    -->    
-    <target name="test"></target>
-
-    <!--
-      Steps to do to publish the build results
-    -->
-    <target name="publish"></target>
-
-    <!--
-      Helper targets
-    -->
-    <target
-        name="gatherLogs"
-        if="logsAvailable">
-        <mkdir dir="${buildDirectory}/${buildLabel}/compilelogs" />
-        <echo
-            level="debug"
-            message="logExtension: ${logExtension}" />
-        <antcall target="allElements">
-            <param
-                name="target"
-                value="gatherLogs" />
-            <param
-                name="logExtension"
-                value="${logExtension}" />
-        </antcall>
-        <unzip
-            dest="${buildDirectory}/${buildLabel}/compilelogs"
-            overwrite="true">
-            <fileset
-                dir="${buildDirectory}/features/${patchFeature}">
-                <include name="**/*.log.zip" />
-            </fileset>
-        </unzip>
-    </target>
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall target="allElements">
-            <param
-                name="target"
-                value="cleanElement" />
-        </antcall>
-    </target>
-
-    <!--
-      Default target 
-    -->
-    <target name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file" />
-    </target>
-
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/wtp-patches2/dependency.xml b/releng.wtpbuilder/components/wtp-patches2/dependency.xml
deleted file mode 100644
index 801d37d..0000000
--- a/releng.wtpbuilder/components/wtp-patches2/dependency.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0"?>
-<!-- ====================================================================== 
-    Properties that must be passed to this script:
-    base.install.dir
-    dependencyTargets
-    local.cache.dir
-    dependency.properties
-    baseos
-    basews
-    basearch
-    
-    ====================================================================== -->
-<project
-    name="test"
-    default="get">
-
-    <target name="get">
-        <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="eclipse" />
-        </antcall>
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipseTestFramework" />
-        </antcall>
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="dita" />
-        </antcall>
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp" />
-        </antcall>
-
-        <!-- for patch builds, also get a whole released version to 
-            compile against -->
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp" />
-        </antcall>
-        <!-- including tests -->
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp-wst-test" />
-        </antcall>
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp-jst-test" />
-        </antcall>
-
-
-    </target>
-
-
-    <target name="getAndInstall">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}" />
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}" />
-            <property
-                name="install.destination"
-                value="${base.install.dir}" />
-        </ant>
-    </target>
-
-
-
-
-</project>
-
diff --git a/releng.wtpbuilder/components/wtp-patches3-tests/build.properties b/releng.wtpbuilder/components/wtp-patches3-tests/build.properties
deleted file mode 100644
index d50ce24..0000000
--- a/releng.wtpbuilder/components/wtp-patches3-tests/build.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# This is a subdirectory of $buildDirectory
-# Set collectingFolder and archivePrefix to . if you want to create archives without
-# trailing eclipse in the paths of the included files
-collectingFolder=eclipse
-
-# The prefix that will be used in the generated archive.
-# Does not make sense to use a different archivePrefix than collectingFolder, 
-# because zip wouldn't find any files to include into the target zip otherwise
-archivePrefix=eclipse
-logExtension=.xml
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-##################################################
-# Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
-javacVerbose=true
-
-sign=false
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/wtp-patches3-tests/customTargets.xml b/releng.wtpbuilder/components/wtp-patches3-tests/customTargets.xml
deleted file mode 100644
index 8c14280..0000000
--- a/releng.wtpbuilder/components/wtp-patches3-tests/customTargets.xml
+++ /dev/null
@@ -1,286 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-
-    <property
-        name="patchFeature"
-        value="org.eclipse.wtp.patch.tests.assembly.feature" />
-
-
-
-  <!-- = = = standard properties pattern = = = 
-
-      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" />
-
-  <!-- 
-      Let users override standard properties, if desired.
-      If directory, file, or some properties do not exist,  
-      then standard properties will be used.
-  -->
-  <property
-      file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties" />
-
-  <!-- let this project specify properties, if not already set -->
-  <property file="build.properties" />
-
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set" />
-    <echo message="buildDirectory: ${buildDirectory}" />
-	
-    <!-- 
-        Run a given ${target} on all elements being built
-        Add on <ant> task for each top level element being built.
-    -->
-    <target name="allElements">
-        <echo
-            level="info"
-            message="Target:${target} " />
-        <echo
-            level="debug"
-            message="basedir: ${basedir}" />
-        <echo
-            level="info"
-            message="component: ${component}" />
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}" />
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}" />
-        <echo
-            level="debug"
-            message="patchFeature: ${patchFeature}" />
-      <echo
-          message="compilerArg: ${compilerArg}" />
-      <echo
-          message="individualSourceBundles: ${individualSourceBundles}" />
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature" />
-            <property
-                name="id"
-                value="${patchFeature}" />
-        </ant>
-    </target>
-
-    <!-- 
-        Targets to assemble the built elements for particular configurations  
-        These generally call the generated assemble scripts (named in 
-        ${assembleScriptName}) but may also add pre and post processing 
-        Add one target for each root element and each configuration 
-    -->
-
-    <target name="assemble.org.eclipse.wtp.patch.tests.assembly.feature">
-        <property
-            name="archiveName"
-            value="wtp-patches-tests-${buildLabel}.zip" />
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}" />
-    </target>
-
-    <target name="prePackage" />
-
-
-    <target name="postPackage">
-        <property
-            name="archiveName"
-            value="wtp-patches-tests-${buildLabel}.zip" />
-
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}" />
-            <property
-                name="buildLabel"
-                value="${buildLabel}" />
-            <property
-                name="archiveName"
-                value="${archiveName}" />
-        </ant>
-
-
-    </target>
-
-
-        <!--
-        Check out map files from repository
-        -->
-    <target name="getMapFiles">
-
-        <!-- for now, get all, at once. May componetize later. -->
-
-          <ant
-              antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="fetchAllMaps" />
-
-    </target>
-
-
-    <!-- 
-        Steps to do before setup
-    -->
-    <target name="preSetup"></target>
-
-    <!--
-      Steps to do after setup but before starting the build proper
-    -->
-    <target name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir" />
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}" />
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}" />
-
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-
-              <property
-                  name="env.DEP_DIR"
-                  value=""/>
-        	
-            <property
-                name="dependency.properties"
-                value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties" />
-            <property
-                name="base.install.dir"
-                value="${buildRoot}" />
-        </ant>
-
-    </target>
-
-    <!--
-      Steps to do before fetching the build elements
-    -->
-    <target name="preFetch"></target>
-
-    <!-- 
-      Steps to do after fetching the build elements
-    -->
-    <target name="postFetch"></target>
-
-    <!--
-      Steps to do before generating the build scripts.
-    -->
-    <target name="preGenerate"></target>
-
-    <!-- 
-      Steps to do after generating the build scripts.
-     -->
-    <target name="postGenerate"></target>
-
-
-    <!-- 
-      Steps to do before running the build.xmls for the elements being built.
-    -->
-    <target name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include name="**/about.mappings" />
-        </replace>
-    </target>
-
-    <!--
-      Steps to do after running the build.xmls for the elements being built.
-    -->
-    <target name="postProcess">
-        <condition property="logsAvailable">
-            <istrue value="${javacVerbose}" />
-        </condition>
-        <antcall target="gatherLogs" />
-    </target>
-
-    <!-- 
-    	  Steps to do before running assemble. 
-     -->
-    <target name="preAssemble"></target>
-
-    <!--
-      Steps to do after  running assemble.
-    -->
-    <target name="postAssemble"></target>
-
-    <!--
-      Steps to do after the build is done.
-    -->
-    <target name="postBuild"></target>
-
-    <!--
-      Steps to do to test the build results
-    -->    
-    <target name="test"></target>
-
-    <!--
-      Steps to do to publish the build results
-    -->
-    <target name="publish"></target>
-
-    <!--
-      Helper targets
-    -->
-    <target
-        name="gatherLogs"
-        if="logsAvailable">
-        <mkdir dir="${buildDirectory}/${buildLabel}/testcompilelogs" />
-        <echo
-            level="debug"
-            message="logExtension: ${logExtension}" />
-        <antcall target="allElements">
-            <param
-                name="target"
-                value="gatherLogs" />
-          <param
-              name="logExtension"
-              value="${logExtension}" />
-
-        </antcall>
-        <unzip
-            dest="${buildDirectory}/${buildLabel}/testcompilelogs"
-            overwrite="true">
-            <fileset 
-                dir="${buildDirectory}/features/${patchFeature}">
-                <include name="**/*.log.zip" />
-            </fileset>
-        </unzip>
-
-
-    </target>
-
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall target="allElements">
-            <param
-                name="target"
-                value="cleanElement" />
-        </antcall>
-    </target>
-
-    <!--
-      Default target 
-    -->
-    <target name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file" />
-    </target>
-
-</project>
diff --git a/releng.wtpbuilder/components/wtp-patches3-tests/dependency.xml b/releng.wtpbuilder/components/wtp-patches3-tests/dependency.xml
deleted file mode 100644
index 706a65a..0000000
--- a/releng.wtpbuilder/components/wtp-patches3-tests/dependency.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0"?>
-<!-- ====================================================================== 
-    Properties that must be passed to this script:
-    base.install.dir
-    dependencyTargets
-    local.cache.dir
-    dependency.properties
-    
-    
-    ====================================================================== -->
-<project
-    name="test"
-    default="get">
-
-    <target name="get">
-        <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="eclipse" />
-        </antcall>
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipseTestFramework" />
-        </antcall>
-
-
-        <!-- for patch builds, also get a whole released version to 
-            compile against -->
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp" />
-        </antcall>
-        <!-- including tests -->
-        <antcall target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp-test" />
-        </antcall>
-    </target>
-
-
-    <target name="getAndInstall">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}" />
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}" />
-            <property
-                name="install.destination"
-                value="${base.install.dir}" />
-        </ant>
-    </target>
-
-
-
-
-</project>
-
diff --git a/releng.wtpbuilder/components/wtp-patches3/build.properties b/releng.wtpbuilder/components/wtp-patches3/build.properties
deleted file mode 100644
index 4a14ba6..0000000
--- a/releng.wtpbuilder/components/wtp-patches3/build.properties
+++ /dev/null
@@ -1,38 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-#####################
-# Parameters describing how and where to execute the build.
-# Typical users need only update the following properties:
-#    baseLocation - where things you are building against are installed
-#    configs - the list of {os, ws, arch} configurations to build.  
-#
-# Of course any of the settings here can be overridden by spec'ing 
-# them on the command line (e.g., -DbaseLocation=d:/eclipse
-
-############# CVS CONTROL ################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# The location underwhich all of the build output will be collected.
-collectingFolder=eclipse
-
-# The prefix that will be used in the generated archive.
-archivePrefix=eclipse
-
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-sign=true
diff --git a/releng.wtpbuilder/components/wtp-patches3/customTargets.xml b/releng.wtpbuilder/components/wtp-patches3/customTargets.xml
deleted file mode 100644
index d9a813a..0000000
--- a/releng.wtpbuilder/components/wtp-patches3/customTargets.xml
+++ /dev/null
@@ -1,338 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-    <property
-        name="buildfeature"
-        value="org.eclipse.wtp.patch.assembly.feature"/>
-    <!--
-        = = = standard properties pattern = = = 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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-	<!-- let this project specify properties, if not already set -->
-    <property
-        file="build.properties"/>
-    <fail
-        message="dependency.properties must be specified by distribution script"
-        unless="dependency.properties"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set"/>
-    <echo
-        message="buildDirectory: ${buildDirectory}"/>
-    <!--
-        Run a given ${target} on all elements being built Add on <ant>
-        task for each top level element being built.
-    -->
-    <target
-        name="allElements">
-        <echo
-            level="info"
-            message="Target:${target} "/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="info"
-            message="component: ${component}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}"/>
-        <echo
-            level="debug"
-            message="patchFeature: ${patchFeature}"/>
-        <echo
-            message="compilerArg: ${compilerArg}"/>
-        <echo
-            message="individualSourceBundles: ${individualSourceBundles}"/>
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature"/>
-            <property
-                name="id"
-                value="${buildfeature}"/>
-        </ant>
-    </target>
-    <!--
-        Targets to assemble the built elements for particular
-        configurations These generally call the generated assemble
-        scripts (named in ${assembleScriptName}) but may also add pre
-        and post processing Add one target for each root element and
-        each configuration
-    -->
-    <target
-        name="assemble.org.eclipse.wtp.patch.assembly.feature">
-        <property
-            name="archiveName"
-            value="wtp-${buildLabel}.zip"/>
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}"/>
-    </target>
-    <target
-        name="prePackage"/>
-    <target
-        name="postPackage">
-        <property
-            name="archiveName"
-            value="wtp-${buildLabel}.zip"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-            <property
-                name="buildLabel"
-                value="${buildLabel}"/>
-            <property
-                name="archiveName"
-                value="${archiveName}"/>
-        </ant>
-    </target>
-
-
-	<!-- 
-        Check out map files from repository
-    -->
-    <target
-        name="getMapFiles">
-
-        <!-- for now, get all, at once. May componetize later. -->
-
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="fetchAllMaps" />
-
-
-    </target>
-
-
-	<!-- 
-        Steps to do before setup
-    -->
-    <target
-        name="preSetup"></target>
-    <!--
-        Steps to do after setup but before starting the build proper
-    -->
-    <target
-        name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}"/>
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}"/>
-
-        <!-- Get the dependencies -->
-        <antcall
-            target="getDependencies"/>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Get the dependencies based on releng maps -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="getDependencies">
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-            <property
-                name="base.install.dir"
-                value="${buildRoot}"/>
-        </ant>
-    </target>
-
-	<!--
-      Steps to do before fetching the build elements
-    -->
-    <target
-        name="preFetch"></target>
-
-	<!-- 
-      Steps to do after fetching the build elements
-    -->
-    <target
-        name="postFetch"></target>
-
-	<!--
-      Steps to do before generating the build scripts.
-    -->
-    <target
-        name="preGenerate"></target>
-
-	<!-- 
-      Steps to do after generating the build scripts.
-     -->
-    <target
-        name="postGenerate">
-    </target>
-    <!--
-        Steps to do before running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include
-                name="**/about.mappings"/>
-        </replace>
-    </target>
-    <!--
-        Steps to do after running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="postProcess">
-        <condition
-            property="logsAvailable">
-            <istrue
-                value="${javacVerbose}"/>
-        </condition>
-        <antcall
-            target="gatherLogs"/>
-    </target>
-    <!--
-        Steps to do before running assemble. Note: in version 2.0 (and
-        previous) we need to build the explorer war file by invoking
-        script. In 3.0 forward, we do not, so this simple existence
-        check allows us to use the same script for both streams
-    -->
-    <property
-        name="buildwarfilename"
-        value="${buildDirectory}/plugins/org.eclipse.wst.ws.explorer/build-war.xml"/>
-    <target
-        name="preAssemble"
-        depends="buildwar">
-    </target>
-    <target
-        name="checkForBuildFile">
-        <condition
-            property="buildFileExists">
-            <available
-                file="${buildwarfilename}"/>
-        </condition>
-    </target>
-    <target
-        name="buildwar"
-        depends="checkForBuildFile"
-        if="buildFileExists">
-        <ant
-            antfile="${buildwarfilename}">
-            <property
-                name="baseLocation"
-                value="${baseLocation}"/>
-            <property
-                name="basedir"
-                value="${buildDirectory}/plugins/org.eclipse.wst.ws.explorer"/>
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-        </ant>
-    </target>
-
-	<!--
-      Steps to do after  running assemble.
-    -->
-    <target
-        name="postAssemble"></target>
-
-	<!--
-      Steps to do after the build is done.
-    -->
-    <target
-        name="postBuild"></target>
-
-	<!--
-      Steps to do to test the build results
-    -->
-    <target
-        name="test"></target>
-
-	<!--
-      Steps to do to publish the build results
-    -->
-    <target
-        name="publish"></target>
-
-	<!--
-      Helper targets
-    -->
-    <target
-        name="gatherLogs"
-        if="logsAvailable">
-        <mkdir
-            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
-        <echo
-            level="debug"
-            message="logExtension: ${logExtension}"/>
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="gatherLogs"/>
-            <param
-                name="logExtension"
-                value="${logExtension}"/>
-        </antcall>
-        <unzip
-            dest="${buildDirectory}/${buildLabel}/compilelogs"
-            overwrite="true">
-            <fileset
-                dir="${buildDirectory}/features/${buildfeature}">
-                <include
-                    name="**/*.log.zip"/>
-            </fileset>
-        </unzip>
-    </target>
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="cleanElement"/>
-        </antcall>
-    </target>
-
-	<!--
-      Default target 
-    -->
-    <target
-        name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/wtp-patches3/dependency.xml b/releng.wtpbuilder/components/wtp-patches3/dependency.xml
deleted file mode 100644
index c219475..0000000
--- a/releng.wtpbuilder/components/wtp-patches3/dependency.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-
-    <target
-        name="get">
-
-	 <fail message="depenendency.properties must be defined" unless="dependency.properties" />
-    	<available file="${dependency.properties}" property="dependenciesExists" />
-    	<fail message="The expected depenendency.properties, ${dependency.properties}, does not exist." unless="dependenciesExists" />
-    	<echo message="dependency.properties file: ${dependency.properties}" />
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined
-        -->
-        <property
-            file="${dependency.properties}"/>
-
-        <mkdir
-            dir="${buildDirectory}/maps/${env.RELENG}/maps"/>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="orbitthirdpartymap"/>
-            <param
-                name="base.install.dir"
-                value="${buildDirectory}/maps/${env.RELENG}/maps/"/>
-        </antcall>
-        <property
-            name="pde.builder.path"
-            value="${env.BASE_BUILDERS}/${eclipse.builder.version}/${eclipse.builder}"/>
-        <echo
-            level="debug"
-            message="pde.builder.path: ${pde.builder.path}"/>
-        <echo
-            level="debug"
-            message="eclipse.builder.version: ${eclipse.builder.version}"/>
-        <echo
-            level="debug"
-            message="eclipse.builder: ${eclipse.builder}"/>
-        
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </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="eclipse"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipseTestFramework"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="dita"/>
-        </antcall>
-
-        <!--
-            for patch builds, also get a whole released version to
-            compile against
-        -->
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp"/>
-        </antcall>
-        <!-- including tests -->
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp-test"/>
-        </antcall>
-
-    </target>
-
-
-    <target
-        name="getAndInstall"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-
-
-
-
-</project>
-
diff --git a/releng.wtpbuilder/components/wtpcap/build.properties b/releng.wtpbuilder/components/wtpcap/build.properties
deleted file mode 100644
index 1232026..0000000
--- a/releng.wtpbuilder/components/wtpcap/build.properties
+++ /dev/null
@@ -1,45 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# This is a subdirectory of $buildDirectory
-# Set collectingFolder and archivePrefix to . if you want to create archives without
-# trailing eclipse in the paths of the included files
-collectingFolder=eclipse
-logExtension=.xml
-# The prefix that will be used in the generated archive.
-# Does not make sense to use a different archivePrefix than collectingFolder, 
-# because zip wouldn't find any files to include into the target zip otherwise
-archivePrefix=eclipse
-
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-##################################################
-# Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
-javacVerbose=true
-
-sign=true
-
-#############################################################
-
-# Properties introduced in 3.5 M3 (PDE base builder R35_M2). See
-# http://aniefer.blogspot.com/2008/10/sorting-bundles-and-parallel.html
-
-flattenDependencies=true
-parallelCompilation=true
diff --git a/releng.wtpbuilder/components/wtpcap/customTargets.xml b/releng.wtpbuilder/components/wtpcap/customTargets.xml
deleted file mode 100644
index ef0eaaa..0000000
--- a/releng.wtpbuilder/components/wtpcap/customTargets.xml
+++ /dev/null
@@ -1,319 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-    <!--
-        = = = standard properties pattern = = = 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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- let this project specify properties, if not already set -->
-    <property
-        file="build.properties"/>
-    <fail
-        message="dependency.properties must be specified by distribution script"
-        unless="dependency.properties"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set"/>
-    <echo
-        message="buildDirectory: ${buildDirectory}"/>
-    <!--
-        Run a given ${target} on all elements being built Add on <ant>
-        task for each top level element being built.
-    -->
-    <target
-        name="allElements">
-        <echo
-            level="info"
-            message="Target:${target} "/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="info"
-            message="component: ${component}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}"/>
-        <echo
-            level="debug"
-            message="generic target: ${genericTargets}"/>
-        <echo
-            message="compilerArg: ${compilerArg}"/>
-        <echo
-            message="individualSourceBundles: ${individualSourceBundles}"/>
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature"/>
-            <property
-                name="id"
-                value="org.eclipse.wtp.capabilities"/>
-        </ant>
-    </target>
-    <!--
-        Targets to assemble the built elements for particular
-        configurations These generally call the generated assemble
-        scripts (named in ${assembleScriptName}) but may also add pre
-        and post processing Add one target for each root element and
-        each configuration
-    -->
-    <target
-        name="assemble.org.eclipse.wtp.capabilities">
-        <property
-            name="archiveName"
-            value="wtpcap-${buildLabel}.zip"/>
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}"/>
-    </target>
-    <target
-        name="prePackage"/>
-    <target
-        name="postPackage">
-        <property
-            name="archiveName"
-            value="wtpcap-${buildLabel}.zip"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-            <property
-                name="buildLabel"
-                value="${buildLabel}"/>
-            <property
-                name="archiveName"
-                value="${archiveName}"/>
-        </ant>
-    </target>
-
-    <!-- 
-        Check out map files from repository
-    -->
-    <target
-        name="getMapFiles">
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENG}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENG}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-    </target>
-
-
-    <!-- 
-        Steps to do before setup
-    -->
-    <target
-        name="preSetup"></target>
-    <!--
-        Steps to do after setup but before starting the build proper
-    -->
-    <target
-        name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}"/>
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}"/>
-
-        <!-- Get the dependencies -->
-        <antcall
-            target="getDependencies"/>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Get the dependencies based on releng maps -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="getDependencies">
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-            <property
-                name="base.install.dir"
-                value="${buildRoot}"/>
-        </ant>
-    </target>
-
-    <!--
-      Steps to do before fetching the build elements
-    -->
-    <target
-        name="preFetch"></target>
-
-    <!-- 
-      Steps to do after fetching the build elements
-    -->
-    <target
-        name="postFetch"></target>
-
-    <!--
-      Steps to do before generating the build scripts.
-    -->
-    <target
-        name="preGenerate"></target>
-
-    <!--
-      Steps to do after generating the build scripts.
-    -->
-    <target
-        name="postGenerate">
-        <echo
-            message="buildDirectory: ${buildDirectory}"/>
-        <customizeAccessRules
-            bundleDirectory="${buildDirectory}/plugins"/>
-    </target>
-    <!--
-        Steps to do before running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include
-                name="**/about.mappings"/>
-        </replace>
-    </target>
-    <!--
-        Steps to do after running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="postProcess">
-        <condition
-            property="logsAvailable">
-            <istrue
-                value="${javacVerbose}"/>
-        </condition>
-        <antcall
-            target="gatherLogs"/>
-    </target>
-
-
-    <!--
-      Steps to do before running assemble. 
-    -->
-    <target
-        name="preAssemble"></target>
-
-    <!--
-      Steps to do after  running assemble.
-    -->
-    <target
-        name="postAssemble"></target>
-
-    <!--
-      Steps to do after the build is done.
-    -->
-    <target
-        name="postBuild"></target>
-
-    <!--
-      Steps to do to test the build results
-    -->
-    <target
-        name="test"></target>
-
-    <!--
-      Steps to do to publish the build results
-    -->
-    <target
-        name="publish"></target>
-
-    <!--
-      Helper targets
-    -->
-    <target
-        name="gatherLogs"
-        if="logsAvailable">
-        <mkdir
-            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
-        <echo
-            level="debug"
-            message="logExtension: ${logExtension}"/>
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="gatherLogs"/>
-            <param
-                name="logExtension"
-                value="${logExtension}"/>
-        </antcall>
-        <unzip
-            dest="${buildDirectory}/${buildLabel}/compilelogs"
-            overwrite="true">
-            <fileset
-                dir="${buildDirectory}/features/org.eclipse.wtp.capabilities">
-                <include
-                    name="**/*.log.zip"/>
-            </fileset>
-        </unzip>
-    </target>
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="cleanElement"/>
-        </antcall>
-    </target>
-
-    <!--
-      Default target 
-    -->
-    <target
-        name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/wtpcap/dependency.xml b/releng.wtpbuilder/components/wtpcap/dependency.xml
deleted file mode 100644
index 11ce1ec..0000000
--- a/releng.wtpbuilder/components/wtpcap/dependency.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-    <target
-        name="get">
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined, which we do later with
-            statements such if="${groupId}.url"
-        -->
-        <property
-            file="${dependency.properties}"/>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-        <!--
-            <antcall target="getAndInstall"> <param name="groupId"
-            value="dtp"/> </antcall>
-        -->
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wst"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstall"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/wtpjee/build.properties b/releng.wtpbuilder/components/wtpjee/build.properties
deleted file mode 100644
index 1232026..0000000
--- a/releng.wtpbuilder/components/wtpjee/build.properties
+++ /dev/null
@@ -1,45 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# This is a subdirectory of $buildDirectory
-# Set collectingFolder and archivePrefix to . if you want to create archives without
-# trailing eclipse in the paths of the included files
-collectingFolder=eclipse
-logExtension=.xml
-# The prefix that will be used in the generated archive.
-# Does not make sense to use a different archivePrefix than collectingFolder, 
-# because zip wouldn't find any files to include into the target zip otherwise
-archivePrefix=eclipse
-
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-##################################################
-# Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
-javacVerbose=true
-
-sign=true
-
-#############################################################
-
-# Properties introduced in 3.5 M3 (PDE base builder R35_M2). See
-# http://aniefer.blogspot.com/2008/10/sorting-bundles-and-parallel.html
-
-flattenDependencies=true
-parallelCompilation=true
diff --git a/releng.wtpbuilder/components/wtpjee/customTargets.xml b/releng.wtpbuilder/components/wtpjee/customTargets.xml
deleted file mode 100644
index 396ad88..0000000
--- a/releng.wtpbuilder/components/wtpjee/customTargets.xml
+++ /dev/null
@@ -1,319 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-    <!--
-        = = = standard properties pattern = = = 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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- let this project specify properties, if not already set -->
-    <property
-        file="build.properties"/>
-    <fail
-        message="dependency.properties must be specified by distribution script"
-        unless="dependency.properties"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set"/>
-    <echo
-        message="buildDirectory: ${buildDirectory}"/>
-    <!--
-        Run a given ${target} on all elements being built Add on <ant>
-        task for each top level element being built.
-    -->
-    <target
-        name="allElements">
-        <echo
-            level="info"
-            message="Target:${target} "/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="info"
-            message="component: ${component}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}"/>
-        <echo
-            level="debug"
-            message="generic target: ${genericTargets}"/>
-        <echo
-            message="compilerArg: ${compilerArg}"/>
-        <echo
-            message="individualSourceBundles: ${individualSourceBundles}"/>
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature"/>
-            <property
-                name="id"
-                value="org.eclipse.wtp.jee.feature"/>
-        </ant>
-    </target>
-    <!--
-        Targets to assemble the built elements for particular
-        configurations These generally call the generated assemble
-        scripts (named in ${assembleScriptName}) but may also add pre
-        and post processing Add one target for each root element and
-        each configuration
-    -->
-    <target
-        name="assemble.org.eclipse.wtp.jee.feature">
-        <property
-            name="archiveName"
-            value="wtpjee-${buildLabel}.zip"/>
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}"/>
-    </target>
-    <target
-        name="prePackage"/>
-    <target
-        name="postPackage">
-        <property
-            name="archiveName"
-            value="wtpjee-${buildLabel}.zip"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-            <property
-                name="buildLabel"
-                value="${buildLabel}"/>
-            <property
-                name="archiveName"
-                value="${archiveName}"/>
-        </ant>
-    </target>
-
-    <!-- 
-        Check out map files from repository
-    -->
-    <target
-        name="getMapFiles">
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENG}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENG}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-    </target>
-
-
-    <!-- 
-        Steps to do before setup
-    -->
-    <target
-        name="preSetup"></target>
-    <!--
-        Steps to do after setup but before starting the build proper
-    -->
-    <target
-        name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}"/>
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}"/>
-
-        <!-- Get the dependencies -->
-        <antcall
-            target="getDependencies"/>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Get the dependencies based on releng maps -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="getDependencies">
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-            <property
-                name="base.install.dir"
-                value="${buildRoot}"/>
-        </ant>
-    </target>
-
-    <!--
-      Steps to do before fetching the build elements
-    -->
-    <target
-        name="preFetch"></target>
-
-    <!-- 
-      Steps to do after fetching the build elements
-    -->
-    <target
-        name="postFetch"></target>
-
-    <!--
-      Steps to do before generating the build scripts.
-    -->
-    <target
-        name="preGenerate"></target>
-
-    <!--
-      Steps to do after generating the build scripts.
-    -->
-    <target
-        name="postGenerate">
-        <echo
-            message="buildDirectory: ${buildDirectory}"/>
-        <customizeAccessRules
-            bundleDirectory="${buildDirectory}/plugins"/>
-    </target>
-    <!--
-        Steps to do before running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include
-                name="**/about.mappings"/>
-        </replace>
-    </target>
-    <!--
-        Steps to do after running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="postProcess">
-        <condition
-            property="logsAvailable">
-            <istrue
-                value="${javacVerbose}"/>
-        </condition>
-        <antcall
-            target="gatherLogs"/>
-    </target>
-
-
-    <!--
-      Steps to do before running assemble. 
-    -->
-    <target
-        name="preAssemble"></target>
-
-    <!--
-      Steps to do after  running assemble.
-    -->
-    <target
-        name="postAssemble"></target>
-
-    <!--
-      Steps to do after the build is done.
-    -->
-    <target
-        name="postBuild"></target>
-
-    <!--
-      Steps to do to test the build results
-    -->
-    <target
-        name="test"></target>
-
-    <!--
-      Steps to do to publish the build results
-    -->
-    <target
-        name="publish"></target>
-
-    <!--
-      Helper targets
-    -->
-    <target
-        name="gatherLogs"
-        if="logsAvailable">
-        <mkdir
-            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
-        <echo
-            level="debug"
-            message="logExtension: ${logExtension}"/>
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="gatherLogs"/>
-            <param
-                name="logExtension"
-                value="${logExtension}"/>
-        </antcall>
-        <unzip
-            dest="${buildDirectory}/${buildLabel}/compilelogs"
-            overwrite="true">
-            <fileset
-                dir="${buildDirectory}/features/org.eclipse.wtp.jee.feature">
-                <include
-                    name="**/*.log.zip"/>
-            </fileset>
-        </unzip>
-    </target>
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="cleanElement"/>
-        </antcall>
-    </target>
-
-    <!--
-      Default target 
-    -->
-    <target
-        name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/wtpjee/dependency.xml b/releng.wtpbuilder/components/wtpjee/dependency.xml
deleted file mode 100644
index 350dbac..0000000
--- a/releng.wtpbuilder/components/wtpjee/dependency.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-    <target
-        name="get">
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined, which we do later with
-            statements such if="${groupId}.url"
-        -->
-        <property
-            file="${dependency.properties}"/>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-        <!--
-            <antcall target="getAndInstall"> <param name="groupId"
-            value="dtp"/> </antcall>
-        -->
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value=""/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstall"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/xml/build.properties b/releng.wtpbuilder/components/xml/build.properties
deleted file mode 100644
index 5bed879..0000000
--- a/releng.wtpbuilder/components/xml/build.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# This is a subdirectory of $buildDirectory
-# Set collectingFolder and archivePrefix to . if you want to create archives without
-# trailing eclipse in the paths of the included files
-collectingFolder=eclipse
-logExtension=.xml
-# The prefix that will be used in the generated archive.
-# Does not make sense to use a different archivePrefix than collectingFolder, 
-# because zip wouldn't find any files to include into the target zip otherwise
-archivePrefix=eclipse
-
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-##################################################
-# Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
-javacVerbose=true
-
-sign=true
-
-#############################################################
-
-# Properties introduced in 3.5 M3 (PDE base builder R35_M2). See
-# http://aniefer.blogspot.com/2008/10/sorting-bundles-and-parallel.html
-
-flattenDependencies=true
-parallelCompilation=true
-
-
diff --git a/releng.wtpbuilder/components/xml/customTargets.xml b/releng.wtpbuilder/components/xml/customTargets.xml
deleted file mode 100644
index 32116ae..0000000
--- a/releng.wtpbuilder/components/xml/customTargets.xml
+++ /dev/null
@@ -1,356 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-    <!--
-        = = = standard properties pattern = = = 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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- let this project specify properties, if not already set -->
-    <property
-        file="build.properties"/>
-    <fail
-        message="dependency.properties must be specified by distribution script"
-        unless="dependency.properties"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set"/>
-    <echo
-        message="buildDirectory: ${buildDirectory}"/>
-    <!--
-        Run a given ${target} on all elements being built Add on <ant>
-        task for each top level element being built.
-    -->
-    <target
-        name="allElements">
-        <echo
-            level="info"
-            message="Target:${target} "/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="info"
-            message="component: ${component}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}"/>
-        <echo
-            level="debug"
-            message="generic target: ${genericTargets}"/>
-        <echo
-            message="compilerArg: ${compilerArg}"/>
-        <echo
-            message="individualSourceBundles: ${individualSourceBundles}"/>
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature"/>
-            <property
-                name="id"
-                value="org.eclipse.wst.xml_ui.feature"/>
-        </ant>
-    </target>
-    <!--
-        Targets to assemble the built elements for particular
-        configurations These generally call the generated assemble
-        scripts (named in ${assembleScriptName}) but may also add pre
-        and post processing Add one target for each root element and
-        each configuration
-    -->
-    <target
-        name="assemble.org.eclipse.wst.xml_ui.feature">
-        <property
-            name="archiveName"
-            value="wtp-xml-${buildLabel}.zip"/>
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}"/>
-    </target>
-    <target
-        name="prePackage"/>
-    <target
-        name="postPackage">
-        <property
-            name="archiveName"
-            value="wtp-xml-${buildLabel}.zip"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-            <property
-                name="buildLabel"
-                value="${buildLabel}"/>
-            <property
-                name="archiveName"
-                value="${archiveName}"/>
-        </ant>
-    </target>
-
-    <!-- 
-        Check out map files from repository
-    -->
-    <target
-        name="getMapFiles">
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENG}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENGSOURCEEDITING}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-    </target>
-
-
-    <!-- 
-        Steps to do before setup
-    -->
-    <target
-        name="preSetup"></target>
-    <!--
-        Steps to do after setup but before starting the build proper
-    -->
-    <target
-        name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}"/>
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}"/>
-
-        <!-- Get the dependencies -->
-        <antcall
-            target="getDependencies"/>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Get the dependencies based on releng maps -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="getDependencies">
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-            <property
-                name="base.install.dir"
-                value="${buildRoot}"/>
-        </ant>
-    </target>
-
-    <!--
-      Steps to do before fetching the build elements
-    -->
-    <target
-        name="preFetch"></target>
-
-    <!-- 
-      Steps to do after fetching the build elements
-    -->
-    <target
-        name="postFetch"></target>
-
-    <!--
-      Steps to do before generating the build scripts.
-    -->
-    <target
-        name="preGenerate"></target>
-
-    <!--
-      Steps to do after generating the build scripts.
-    -->
-    <target
-        name="postGenerate">
-        <echo
-            message="buildDirectory: ${buildDirectory}"/>
-        <customizeAccessRules
-            bundleDirectory="${buildDirectory}/plugins"/>
-    </target>
-    <!--
-        Steps to do before running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include
-                name="**/about.mappings"/>
-        </replace>
-    </target>
-    <!--
-        Steps to do after running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="postProcess">
-        <condition
-            property="logsAvailable">
-            <istrue
-                value="${javacVerbose}"/>
-        </condition>
-        <antcall
-            target="gatherLogs"/>
-    </target>
-
-
-    <!--
-      Steps to do before running assemble. 
-    -->
-    <target
-        name="preAssemble"></target>
-
-    <!--
-      Steps to do after  running assemble.
-    -->
-    <target
-        name="postAssemble"></target>
-
-    <!--
-      Steps to do after the build is done.
-    -->
-    <target
-        name="postBuild"></target>
-
-    <!--
-      Steps to do to test the build results
-    -->
-    <target
-        name="test"></target>
-
-    <!--
-      Steps to do to publish the build results
-    -->
-    <target
-        name="publish"></target>
-
-    <!--
-      Helper targets
-    -->
-	    <target
-	        name="gatherLogs"
-	        if="logsAvailable">
-	        <mkdir
-	            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
-	        <echo
-	            level="debug"
-	            message="logExtension: ${logExtension}"/>
-	        <antcall
-	            target="allElements">
-	            <param
-	                name="target"
-	                value="gatherLogs"/>
-	            <param
-	                name="logExtension"
-	                value="${logExtension}"/>
-	        </antcall>
-	        <unzip
-	            dest="${buildDirectory}/${buildLabel}/compilelogs"
-	            overwrite="true">
-	            <fileset
-                dir="${buildDirectory}/features/org.eclipse.wst.xml_ui.feature">
-	                <include
-	                    name="**/*.log.zip"/>
-	            </fileset>
-	        </unzip>
-	        <!--
-	            TODO: it is unclear if the above "gather" and unzip do
-	            anything constructive. I think not and should be removed
-	            (after experimental run, of course.
-	        -->
-	        <!--
-	            workaround: see
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-	        -->
-	        <copy
-	            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
-	            overwrite="true">
-	            <!--
-	                we want all @dot.xml files, but assumes a certain
-	                structure, to include directory for name of plugin
-	            -->
-	            <fileset
-	                dir="${buildDirectory}/features/">
-	                <include
-	                    name="**/feature.temp.folder/"/>
-	                <exclude
-	                    name="**/*tests*feature*/feature.temp.folder/" />
-	                     
-	            </fileset>
-	            <compositemapper>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/@dot.xml"
-	                    to="/\2/@dot.xml"/>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-	                    to="/\2/\3bin.xml"/>
-	            </compositemapper>
-	        </copy>
-	    </target>
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="cleanElement"/>
-        </antcall>
-    </target>
-
-    <!--
-      Default target 
-    -->
-    <target
-        name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/xml/dependency.xml b/releng.wtpbuilder/components/xml/dependency.xml
deleted file mode 100644
index 6a3c909..0000000
--- a/releng.wtpbuilder/components/xml/dependency.xml
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-        <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-        
-    <condition
-        property="getprereq.eclipse">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.eclipseplatform">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.emf">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.emfxsd">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.emfvalidation">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.gef">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.dtp">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.wst">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.jst">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.wtp">
-        <istrue
-            value="false"/>
-    </condition>
-    <target
-        name="get">
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined, which we do later with
-            statements such if="${groupId}.url"
-        -->
-        <property
-            file="${dependency.properties}"/>
-        <antcall
-            target="prereq.eclipse"/>
-        <antcall
-            target="prereq.eclipseplatform"/>
-        <antcall
-            target="prereq.emf"/>
-        <antcall
-            target="prereq.emfxsd"/>
-        <antcall
-            target="prereq.emfvalidation"/>
-        <antcall
-            target="prereq.gef"/>
-        <antcall
-            target="prereq.dtp"/>
-        <antcall
-            target="prereq.wst"/>
-        <antcall
-            target="prereq.jst"/>
-        <antcall
-            target="prereq.wtp"/>
-    </target>
-    <target
-        name="prereq.eclipse"
-        if="getprereq.eclipse">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.eclipseplatform"
-        if="getprereq.eclipseplatform">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipseplatform"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emf"
-        if="getprereq.emf">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfxsd"
-        if="getprereq.emfxsd">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfvalidation"
-        if="getprereq.emfvalidation">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfvalidation"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.gef"
-        if="getprereq.gef">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.dtp"
-        if="getprereq.dtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="dtp"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wst"
-        if="getprereq.wst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.jst"
-        if="getprereq.jst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="jst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wtp"
-        if="getprereq.wtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstall"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/xml_sdk/build.properties b/releng.wtpbuilder/components/xml_sdk/build.properties
deleted file mode 100644
index 5bed879..0000000
--- a/releng.wtpbuilder/components/xml_sdk/build.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# This is a subdirectory of $buildDirectory
-# Set collectingFolder and archivePrefix to . if you want to create archives without
-# trailing eclipse in the paths of the included files
-collectingFolder=eclipse
-logExtension=.xml
-# The prefix that will be used in the generated archive.
-# Does not make sense to use a different archivePrefix than collectingFolder, 
-# because zip wouldn't find any files to include into the target zip otherwise
-archivePrefix=eclipse
-
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-##################################################
-# Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
-javacVerbose=true
-
-sign=true
-
-#############################################################
-
-# Properties introduced in 3.5 M3 (PDE base builder R35_M2). See
-# http://aniefer.blogspot.com/2008/10/sorting-bundles-and-parallel.html
-
-flattenDependencies=true
-parallelCompilation=true
-
-
diff --git a/releng.wtpbuilder/components/xml_sdk/customTargets.xml b/releng.wtpbuilder/components/xml_sdk/customTargets.xml
deleted file mode 100644
index 4f29c6d..0000000
--- a/releng.wtpbuilder/components/xml_sdk/customTargets.xml
+++ /dev/null
@@ -1,356 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-    <!--
-        = = = standard properties pattern = = = 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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- let this project specify properties, if not already set -->
-    <property
-        file="build.properties"/>
-    <fail
-        message="dependency.properties must be specified by distribution script"
-        unless="dependency.properties"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set"/>
-    <echo
-        message="buildDirectory: ${buildDirectory}"/>
-    <!--
-        Run a given ${target} on all elements being built Add on <ant>
-        task for each top level element being built.
-    -->
-    <target
-        name="allElements">
-        <echo
-            level="info"
-            message="Target:${target} "/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="info"
-            message="component: ${component}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}"/>
-        <echo
-            level="debug"
-            message="generic target: ${genericTargets}"/>
-        <echo
-            message="compilerArg: ${compilerArg}"/>
-        <echo
-            message="individualSourceBundles: ${individualSourceBundles}"/>
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature"/>
-            <property
-                name="id"
-                value="org.eclipse.wst.xml_sdk.feature"/>
-        </ant>
-    </target>
-    <!--
-        Targets to assemble the built elements for particular
-        configurations These generally call the generated assemble
-        scripts (named in ${assembleScriptName}) but may also add pre
-        and post processing Add one target for each root element and
-        each configuration
-    -->
-    <target
-        name="assemble.org.eclipse.wst.xml_sdk.feature">
-        <property
-            name="archiveName"
-            value="wtp-xml-sdk-${buildLabel}.zip"/>
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}"/>
-    </target>
-    <target
-        name="prePackage"/>
-    <target
-        name="postPackage">
-        <property
-            name="archiveName"
-            value="wtp-xml-sdk-${buildLabel}.zip"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-            <property
-                name="buildLabel"
-                value="${buildLabel}"/>
-            <property
-                name="archiveName"
-                value="${archiveName}"/>
-        </ant>
-    </target>
-
-    <!--
-        Check out map files from repository
-        -->
-    <target
-        name="getMapFiles">
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENG}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENGSOURCEEDITING}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-    </target>
-
-
-    <!-- 
-        Steps to do before setup
-    -->
-    <target
-        name="preSetup"></target>
-    <!--
-        Steps to do after setup but before starting the build proper
-    -->
-    <target
-        name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}"/>
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}"/>
-
-        <!-- Get the dependencies -->
-        <antcall
-            target="getDependencies"/>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Get the dependencies based on releng maps -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="getDependencies">
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-            <property
-                name="base.install.dir"
-                value="${buildRoot}"/>
-        </ant>
-    </target>
-
-    <!--
-      Steps to do before fetching the build elements
-    -->
-    <target
-        name="preFetch"></target>
-
-    <!-- 
-      Steps to do after fetching the build elements
-    -->
-    <target
-        name="postFetch"></target>
-
-    <!--
-      Steps to do before generating the build scripts.
-    -->
-    <target
-        name="preGenerate"></target>
-
-    <!--
-      Steps to do after generating the build scripts.
-    -->
-    <target
-        name="postGenerate">
-        <echo
-            message="buildDirectory: ${buildDirectory}"/>
-        <customizeAccessRules
-            bundleDirectory="${buildDirectory}/plugins"/>
-    </target>
-    <!--
-        Steps to do before running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include
-                name="**/about.mappings"/>
-        </replace>
-    </target>
-    <!--
-        Steps to do after running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="postProcess">
-        <condition
-            property="logsAvailable">
-            <istrue
-                value="${javacVerbose}"/>
-        </condition>
-        <antcall
-            target="gatherLogs"/>
-    </target>
-
-
-    <!--
-      Steps to do before running assemble. 
-        -->
-    <target
-        name="preAssemble"></target>
-
-    <!--
-      Steps to do after  running assemble.
-    -->
-    <target
-        name="postAssemble"></target>
-
-    <!--
-      Steps to do after the build is done.
-    -->
-    <target
-        name="postBuild"></target>
-
-    <!--
-      Steps to do to test the build results
-    -->
-    <target
-        name="test"></target>
-
-    <!--
-      Steps to do to publish the build results
-    -->
-    <target
-        name="publish"></target>
-
-    <!--
-      Helper targets
-    -->
-	    <target
-	        name="gatherLogs"
-	        if="logsAvailable">
-	        <mkdir
-	            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
-	        <echo
-	            level="debug"
-	            message="logExtension: ${logExtension}"/>
-	        <antcall
-	            target="allElements">
-	            <param
-	                name="target"
-	                value="gatherLogs"/>
-	            <param
-	                name="logExtension"
-	                value="${logExtension}"/>
-	        </antcall>
-	        <unzip
-	            dest="${buildDirectory}/${buildLabel}/compilelogs"
-	            overwrite="true">
-	            <fileset
-                dir="${buildDirectory}/features/org.eclipse.wst.xml_sdk.feature">
-	                <include
-	                    name="**/*.log.zip"/>
-	            </fileset>
-	        </unzip>
-	        <!--
-	            TODO: it is unclear if the above "gather" and unzip do
-	            anything constructive. I think not and should be removed
-	            (after experimental run, of course.
-	        -->
-	        <!--
-	            workaround: see
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-	        -->
-	        <copy
-	            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
-	            overwrite="true">
-	            <!--
-	                we want all @dot.xml files, but assumes a certain
-	                structure, to include directory for name of plugin
-	            -->
-	            <fileset
-	                dir="${buildDirectory}/features/">
-	                <include
-	                    name="**/feature.temp.folder/"/>
-	                <exclude
-	                    name="**/*tests*feature*/feature.temp.folder/" />
-	                     
-	            </fileset>
-	            <compositemapper>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/@dot.xml"
-	                    to="/\2/@dot.xml"/>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-	                    to="/\2/\3bin.xml"/>
-	            </compositemapper>
-	        </copy>
-	    </target>
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="cleanElement"/>
-        </antcall>
-    </target>
-
-    <!--
-      Default target 
-    -->
-    <target
-        name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/xml_sdk/dependency.xml b/releng.wtpbuilder/components/xml_sdk/dependency.xml
deleted file mode 100644
index 3bd8587..0000000
--- a/releng.wtpbuilder/components/xml_sdk/dependency.xml
+++ /dev/null
@@ -1,225 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-        <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-        
-	    <condition
-	        property="getprereq.eclipse">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.eclipseplatform">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emf">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfxsd">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfvalidation">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.gef">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.dtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.jst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	            	
-    <target
-        name="get">
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined, which we do later with
-            statements such if="${groupId}.url"
-        -->
-        <property
-            file="${dependency.properties}"/>
-        <antcall
-            target="prereq.eclipse"/>
-        <antcall
-            target="prereq.eclipseplatform"/>
-        <antcall
-            target="prereq.emf"/>
-        <antcall
-            target="prereq.emfxsd"/>
-        <antcall
-            target="prereq.emfvalidation"/>
-        <antcall
-            target="prereq.gef"/>
-        <antcall
-            target="prereq.dtp"/>
-        <antcall
-            target="prereq.wst"/>
-        <antcall
-            target="prereq.jst"/>
-        <antcall
-            target="prereq.wtp"/>
-    </target>
-    <target
-        name="prereq.eclipse"
-        if="getprereq.eclipse">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.eclipseplatform"
-        if="getprereq.eclipseplatform">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipseplatform"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emf"
-        if="getprereq.emf">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfxsd"
-        if="getprereq.emfxsd">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfvalidation"
-        if="getprereq.emfvalidation">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfvalidation"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.gef"
-        if="getprereq.gef">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.dtp"
-        if="getprereq.dtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="dtp"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wst"
-        if="getprereq.wst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.jst"
-        if="getprereq.jst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="jst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wtp"
-        if="getprereq.wtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstall"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/xml_tests/build.properties b/releng.wtpbuilder/components/xml_tests/build.properties
deleted file mode 100644
index 4d26330..0000000
--- a/releng.wtpbuilder/components/xml_tests/build.properties
+++ /dev/null
@@ -1,46 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# This is a subdirectory of $buildDirectory
-# Set collectingFolder and archivePrefix to . if you want to create archives without
-# trailing eclipse in the paths of the included files
-collectingFolder=eclipse
-logExtension=.xml
-# The prefix that will be used in the generated archive.
-# Does not make sense to use a different archivePrefix than collectingFolder, 
-# because zip wouldn't find any files to include into the target zip otherwise
-archivePrefix=eclipse
-
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-##################################################
-# Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
-javacVerbose=true
-
-sign=false
-
-#############################################################
-
-# Properties introduced in 3.5 M3 (PDE base builder R35_M2). See
-# http://aniefer.blogspot.com/2008/10/sorting-bundles-and-parallel.html
-
-flattenDependencies=true
-parallelCompilation=true
-
diff --git a/releng.wtpbuilder/components/xml_tests/customTargets.xml b/releng.wtpbuilder/components/xml_tests/customTargets.xml
deleted file mode 100644
index 63deb40..0000000
--- a/releng.wtpbuilder/components/xml_tests/customTargets.xml
+++ /dev/null
@@ -1,356 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-    <!--
-        = = = standard properties pattern = = = 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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- let this project specify properties, if not already set -->
-    <property
-        file="build.properties"/>
-    <fail
-        message="dependency.properties must be specified by distribution script"
-        unless="dependency.properties"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set"/>
-    <echo
-        message="buildDirectory: ${buildDirectory}"/>
-    <!--
-        Run a given ${target} on all elements being built Add on <ant>
-        task for each top level element being built.
-    -->
-    <target
-        name="allElements">
-        <echo
-            level="info"
-            message="Target:${target} "/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="info"
-            message="component: ${component}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}"/>
-        <echo
-            level="debug"
-            message="generic target: ${genericTargets}"/>
-        <echo
-            message="compilerArg: ${compilerArg}"/>
-        <echo
-            message="individualSourceBundles: ${individualSourceBundles}"/>
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature"/>
-            <property
-                name="id"
-                value="org.eclipse.wst.xml_tests_ui.feature"/>
-        </ant>
-    </target>
-    <!--
-        Targets to assemble the built elements for particular
-        configurations These generally call the generated assemble
-        scripts (named in ${assembleScriptName}) but may also add pre
-        and post processing Add one target for each root element and
-        each configuration
-    -->
-    <target
-        name="assemble.org.eclipse.wst.xml_tests_ui.feature">
-        <property
-            name="archiveName"
-            value="wtp-xml-tests-${buildLabel}.zip"/>
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}"/>
-    </target>
-    <target
-        name="prePackage"/>
-    <target
-        name="postPackage">
-        <property
-            name="archiveName"
-            value="wtp-xml-tests-${buildLabel}.zip"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-            <property
-                name="buildLabel"
-                value="${buildLabel}"/>
-            <property
-                name="archiveName"
-                value="${archiveName}"/>
-        </ant>
-    </target>
-
-    <!-- 
-        Check out map files from repository
-    -->
-    <target
-        name="getMapFiles">
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENG}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENGSOURCEEDITING}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-    </target>
-
-
-    <!-- 
-        Steps to do before setup
-    -->
-    <target
-        name="preSetup"></target>
-    <!--
-        Steps to do after setup but before starting the build proper
-    -->
-    <target
-        name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}"/>
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}"/>
-
-        <!-- Get the dependencies -->
-        <antcall
-            target="getDependencies"/>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Get the dependencies based on releng maps -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="getDependencies">
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-            <property
-                name="base.install.dir"
-                value="${buildRoot}"/>
-        </ant>
-    </target>
-
-    <!--
-      Steps to do before fetching the build elements
-    -->
-    <target
-        name="preFetch"></target>
-
-    <!-- 
-      Steps to do after fetching the build elements
-    -->
-    <target
-        name="postFetch"></target>
-
-    <!--
-      Steps to do before generating the build scripts.
-    -->
-    <target
-        name="preGenerate"></target>
-
-    <!--
-      Steps to do after generating the build scripts.
-    -->
-    <target
-        name="postGenerate">
-        <echo
-            message="buildDirectory: ${buildDirectory}"/>
-        <customizeAccessRules
-            bundleDirectory="${buildDirectory}/plugins"/>
-    </target>
-    <!--
-        Steps to do before running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include
-                name="**/about.mappings"/>
-        </replace>
-    </target>
-    <!--
-        Steps to do after running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="postProcess">
-        <condition
-            property="logsAvailable">
-            <istrue
-                value="${javacVerbose}"/>
-        </condition>
-        <antcall
-            target="gatherLogs"/>
-    </target>
-
-
-    <!--
-      Steps to do before running assemble. 
-        -->
-    <target
-        name="preAssemble"></target>
-
-    <!--
-      Steps to do after  running assemble.
-    -->
-    <target
-        name="postAssemble"></target>
-
-    <!--
-      Steps to do after the build is done.
-    -->
-    <target
-        name="postBuild"></target>
-
-    <!--
-      Steps to do to test the build results
-    -->
-    <target
-        name="test"></target>
-
-    <!--
-      Steps to do to publish the build results
-    -->
-    <target
-        name="publish"></target>
-
-    <!--
-      Helper targets
-    -->
-	    <target
-	        name="gatherLogs"
-	        if="logsAvailable">
-	        <mkdir
-            dir="${buildDirectory}/${buildLabel}/testcompilelogs"/>
-	        <echo
-	            level="debug"
-	            message="logExtension: ${logExtension}"/>
-	        <antcall
-	            target="allElements">
-	            <param
-	                name="target"
-	                value="gatherLogs"/>
-	            <param
-	                name="logExtension"
-	                value="${logExtension}"/>
-	        </antcall>
-	        <unzip
-            dest="${buildDirectory}/${buildLabel}/testcompilelogs"
-            overwrite="true">
-	            <fileset
-                dir="${buildDirectory}/features/org.eclipse.wst.xml_tests_ui.feature">
-	                <include
-	                    name="**/*.log.zip"/>
-	            </fileset>
-	        </unzip>
-	        <!--
-	            TODO: it is unclear if the above "gather" and unzip do
-	            anything constructive. I think not and should be removed
-	            (after experimental run, of course.
-	        -->
-	        <!--
-	            workaround: see
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-	        -->
-	        <copy
-	            todir="${buildDirectory}/${buildLabel}/testcompilelogs/plugins"
-	            overwrite="true">
-	            <!--
-	                we want all @dot.xml files, but assumes a certain
-	                structure, to include directory for name of plugin
-	            -->
-	            <fileset
-	                dir="${buildDirectory}/features/">
-	                <include
-	                    name="**/feature.temp.folder/"/>
-	                <exclude
-	                    name="**/*tests*feature*/feature.temp.folder/" />
-	                     
-	            </fileset>
-	            <compositemapper>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/@dot.xml"
-	                    to="/\2/@dot.xml"/>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-	                    to="/\2/\3bin.xml"/>
-	            </compositemapper>
-	        </copy>
-	    </target>
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="cleanElement"/>
-        </antcall>
-    </target>
-
-    <!--
-      Default target 
-    -->
-    <target
-        name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/xml_tests/dependency.xml b/releng.wtpbuilder/components/xml_tests/dependency.xml
deleted file mode 100644
index 3c7e543..0000000
--- a/releng.wtpbuilder/components/xml_tests/dependency.xml
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-        <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-        
-	    <condition
-	        property="getprereq.eclipse">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.eclipseplatform">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emf">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfxsd">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfvalidation">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.gef">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.dtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.jst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
-    <target
-        name="get">
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined, which we do later with
-            statements such if="${groupId}.url"
-        -->
-        <property
-            file="${dependency.properties}"/>
-        <antcall
-            target="prereq.eclipse"/>
-        <antcall
-            target="prereq.eclipseplatform"/>
-        <antcall
-            target="prereq.emf"/>
-        <antcall
-            target="prereq.emfxsd"/>
-        <antcall
-            target="prereq.emfvalidation"/>
-        <antcall
-            target="prereq.gef"/>
-        <antcall
-            target="prereq.dtp"/>
-        <antcall
-            target="prereq.wst"/>
-        <antcall
-            target="prereq.jst"/>
-        <antcall
-            target="prereq.wtp"/>
-       <antcall
-           target="getAndInstall">
-           <param
-               name="groupId"
-               value="eclipseTestFramework"/>    
-       	</antcall>
-    </target>
-    <target
-        name="prereq.eclipse"
-        if="getprereq.eclipse">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.eclipseplatform"
-        if="getprereq.eclipseplatform">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipseplatform"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emf"
-        if="getprereq.emf">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfxsd"
-        if="getprereq.emfxsd">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfvalidation"
-        if="getprereq.emfvalidation">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfvalidation"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.gef"
-        if="getprereq.gef">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.dtp"
-        if="getprereq.dtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="dtp"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wst"
-        if="getprereq.wst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.jst"
-        if="getprereq.jst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="jst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wtp"
-        if="getprereq.wtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstall"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/xmlsec/build.properties b/releng.wtpbuilder/components/xmlsec/build.properties
deleted file mode 100644
index 5bed879..0000000
--- a/releng.wtpbuilder/components/xmlsec/build.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# This is a subdirectory of $buildDirectory
-# Set collectingFolder and archivePrefix to . if you want to create archives without
-# trailing eclipse in the paths of the included files
-collectingFolder=eclipse
-logExtension=.xml
-# The prefix that will be used in the generated archive.
-# Does not make sense to use a different archivePrefix than collectingFolder, 
-# because zip wouldn't find any files to include into the target zip otherwise
-archivePrefix=eclipse
-
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-##################################################
-# Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
-javacVerbose=true
-
-sign=true
-
-#############################################################
-
-# Properties introduced in 3.5 M3 (PDE base builder R35_M2). See
-# http://aniefer.blogspot.com/2008/10/sorting-bundles-and-parallel.html
-
-flattenDependencies=true
-parallelCompilation=true
-
-
diff --git a/releng.wtpbuilder/components/xmlsec/customTargets.xml b/releng.wtpbuilder/components/xmlsec/customTargets.xml
deleted file mode 100644
index 8ffb65a..0000000
--- a/releng.wtpbuilder/components/xmlsec/customTargets.xml
+++ /dev/null
@@ -1,356 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-    <!--
-        = = = standard properties pattern = = = 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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- let this project specify properties, if not already set -->
-    <property
-        file="build.properties"/>
-    <fail
-        message="dependency.properties must be specified by distribution script"
-        unless="dependency.properties"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set"/>
-    <echo
-        message="buildDirectory: ${buildDirectory}"/>
-    <!--
-        Run a given ${target} on all elements being built Add on <ant>
-        task for each top level element being built.
-    -->
-    <target
-        name="allElements">
-        <echo
-            level="info"
-            message="Target:${target} "/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="info"
-            message="component: ${component}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}"/>
-        <echo
-            level="debug"
-            message="generic target: ${genericTargets}"/>
-        <echo
-            message="compilerArg: ${compilerArg}"/>
-        <echo
-            message="individualSourceBundles: ${individualSourceBundles}"/>
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature"/>
-            <property
-                name="id"
-                value="org.eclipse.wst.xml.security.feature"/>
-        </ant>
-    </target>
-    <!--
-        Targets to assemble the built elements for particular
-        configurations These generally call the generated assemble
-        scripts (named in ${assembleScriptName}) but may also add pre
-        and post processing Add one target for each root element and
-        each configuration
-    -->
-    <target
-        name="assemble.org.eclipse.wst.xml.security.feature">
-        <property
-            name="archiveName"
-            value="wtp-incubator-xmlsecurity-${buildLabel}.zip"/>
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}"/>
-    </target>
-    <target
-        name="prePackage"/>
-    <target
-        name="postPackage">
-        <property
-            name="archiveName"
-            value="wtp-incubator-xmlsecurity-${buildLabel}.zip"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-            <property
-                name="buildLabel"
-                value="${buildLabel}"/>
-            <property
-                name="archiveName"
-                value="${archiveName}"/>
-        </ant>
-    </target>
-
-    <!-- 
-        Check out map files from repository
-    -->
-    <target
-        name="getMapFiles">
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENG}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENGXMLSEC}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-    </target>
-
-
-    <!-- 
-        Steps to do before setup
-    -->
-    <target
-        name="preSetup"></target>
-    <!--
-        Steps to do after setup but before starting the build proper
-    -->
-    <target
-        name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}"/>
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}"/>
-
-        <!-- Get the dependencies -->
-        <antcall
-            target="getDependencies"/>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Get the dependencies based on releng maps -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="getDependencies">
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-            <property
-                name="base.install.dir"
-                value="${buildRoot}"/>
-        </ant>
-    </target>
-
-    <!--
-      Steps to do before fetching the build elements
-    -->
-    <target
-        name="preFetch"></target>
-
-    <!-- 
-      Steps to do after fetching the build elements
-    -->
-    <target
-        name="postFetch"></target>
-
-    <!--
-      Steps to do before generating the build scripts.
-    -->
-    <target
-        name="preGenerate"></target>
-
-    <!--
-      Steps to do after generating the build scripts.
-    -->
-    <target
-        name="postGenerate">
-        <echo
-            message="buildDirectory: ${buildDirectory}"/>
-        <customizeAccessRules
-            bundleDirectory="${buildDirectory}/plugins"/>
-    </target>
-    <!--
-        Steps to do before running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include
-                name="**/about.mappings"/>
-        </replace>
-    </target>
-    <!--
-        Steps to do after running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="postProcess">
-        <condition
-            property="logsAvailable">
-            <istrue
-                value="${javacVerbose}"/>
-        </condition>
-        <antcall
-            target="gatherLogs"/>
-    </target>
-
-
-    <!--
-      Steps to do before running assemble. 
-    -->
-    <target
-        name="preAssemble"></target>
-
-    <!--
-      Steps to do after  running assemble.
-    -->
-    <target
-        name="postAssemble"></target>
-
-    <!--
-      Steps to do after the build is done.
-    -->
-    <target
-        name="postBuild"></target>
-
-    <!--
-      Steps to do to test the build results
-    -->
-    <target
-        name="test"></target>
-
-    <!--
-      Steps to do to publish the build results
-    -->
-    <target
-        name="publish"></target>
-
-    <!--
-      Helper targets
-    -->
-	    <target
-	        name="gatherLogs"
-	        if="logsAvailable">
-	        <mkdir
-	            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
-	        <echo
-	            level="debug"
-	            message="logExtension: ${logExtension}"/>
-	        <antcall
-	            target="allElements">
-	            <param
-	                name="target"
-	                value="gatherLogs"/>
-	            <param
-	                name="logExtension"
-	                value="${logExtension}"/>
-	        </antcall>
-	        <unzip
-	            dest="${buildDirectory}/${buildLabel}/compilelogs"
-	            overwrite="true">
-	            <fileset
-                dir="${buildDirectory}/features/org.eclipse.wst.xml.security.feature">
-	                <include
-	                    name="**/*.log.zip"/>
-	            </fileset>
-	        </unzip>
-	        <!--
-	            TODO: it is unclear if the above "gather" and unzip do
-	            anything constructive. I think not and should be removed
-	            (after experimental run, of course.
-	        -->
-	        <!--
-	            workaround: see
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-	        -->
-	        <copy
-	            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
-	            overwrite="true">
-	            <!--
-	                we want all @dot.xml files, but assumes a certain
-	                structure, to include directory for name of plugin
-	            -->
-	            <fileset
-	                dir="${buildDirectory}/features/">
-	                <include
-	                    name="**/feature.temp.folder/"/>
-	                <exclude
-	                    name="**/*tests*feature*/feature.temp.folder/" />
-	                     
-	            </fileset>
-	            <compositemapper>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/@dot.xml"
-	                    to="/\2/@dot.xml"/>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-	                    to="/\2/\3bin.xml"/>
-	            </compositemapper>
-	        </copy>
-	    </target>
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="cleanElement"/>
-        </antcall>
-    </target>
-
-    <!--
-      Default target 
-    -->
-    <target
-        name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/xmlsec/dependency.xml b/releng.wtpbuilder/components/xmlsec/dependency.xml
deleted file mode 100644
index caafe1f..0000000
--- a/releng.wtpbuilder/components/xmlsec/dependency.xml
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-        <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-        
-    <condition
-        property="getprereq.eclipse">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.eclipseplatform">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.emf">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.emfxsd">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.emfvalidation">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.gef">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.dtp">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.wst">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.jst">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.wtp">
-        <istrue
-            value="false"/>
-    </condition>
-    <target
-        name="get">
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined, which we do later with
-            statements such if="${groupId}.url"
-        -->
-        <property
-            file="${dependency.properties}"/>
-        <antcall
-            target="prereq.eclipse"/>
-        <antcall
-            target="prereq.eclipseplatform"/>
-        <antcall
-            target="prereq.emf"/>
-        <antcall
-            target="prereq.emfxsd"/>
-        <antcall
-            target="prereq.emfvalidation"/>
-        <antcall
-            target="prereq.gef"/>
-        <antcall
-            target="prereq.dtp"/>
-        <antcall
-            target="prereq.wst"/>
-        <antcall
-            target="prereq.jst"/>
-        <antcall
-            target="prereq.wtp"/>
-    </target>
-    <target
-        name="prereq.eclipse"
-        if="getprereq.eclipse">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.eclipseplatform"
-        if="getprereq.eclipseplatform">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipseplatform"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emf"
-        if="getprereq.emf">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfxsd"
-        if="getprereq.emfxsd">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfvalidation"
-        if="getprereq.emfvalidation">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfvalidation"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.gef"
-        if="getprereq.gef">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.dtp"
-        if="getprereq.dtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="dtp"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wst"
-        if="getprereq.wst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.jst"
-        if="getprereq.jst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="jst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wtp"
-        if="getprereq.wtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstall"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/xmlsec_sdk/build.properties b/releng.wtpbuilder/components/xmlsec_sdk/build.properties
deleted file mode 100644
index 5bed879..0000000
--- a/releng.wtpbuilder/components/xmlsec_sdk/build.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# This is a subdirectory of $buildDirectory
-# Set collectingFolder and archivePrefix to . if you want to create archives without
-# trailing eclipse in the paths of the included files
-collectingFolder=eclipse
-logExtension=.xml
-# The prefix that will be used in the generated archive.
-# Does not make sense to use a different archivePrefix than collectingFolder, 
-# because zip wouldn't find any files to include into the target zip otherwise
-archivePrefix=eclipse
-
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-##################################################
-# Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
-javacVerbose=true
-
-sign=true
-
-#############################################################
-
-# Properties introduced in 3.5 M3 (PDE base builder R35_M2). See
-# http://aniefer.blogspot.com/2008/10/sorting-bundles-and-parallel.html
-
-flattenDependencies=true
-parallelCompilation=true
-
-
diff --git a/releng.wtpbuilder/components/xmlsec_sdk/customTargets.xml b/releng.wtpbuilder/components/xmlsec_sdk/customTargets.xml
deleted file mode 100644
index d09f1b8..0000000
--- a/releng.wtpbuilder/components/xmlsec_sdk/customTargets.xml
+++ /dev/null
@@ -1,356 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-    <!--
-        = = = standard properties pattern = = = 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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- let this project specify properties, if not already set -->
-    <property
-        file="build.properties"/>
-    <fail
-        message="dependency.properties must be specified by distribution script"
-        unless="dependency.properties"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set"/>
-    <echo
-        message="buildDirectory: ${buildDirectory}"/>
-    <!--
-        Run a given ${target} on all elements being built Add on <ant>
-        task for each top level element being built.
-    -->
-    <target
-        name="allElements">
-        <echo
-            level="info"
-            message="Target:${target} "/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="info"
-            message="component: ${component}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}"/>
-        <echo
-            level="debug"
-            message="generic target: ${genericTargets}"/>
-        <echo
-            message="compilerArg: ${compilerArg}"/>
-        <echo
-            message="individualSourceBundles: ${individualSourceBundles}"/>
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature"/>
-            <property
-                name="id"
-                value="org.eclipse.wst.xml.security_sdk.feature"/>
-        </ant>
-    </target>
-    <!--
-        Targets to assemble the built elements for particular
-        configurations These generally call the generated assemble
-        scripts (named in ${assembleScriptName}) but may also add pre
-        and post processing Add one target for each root element and
-        each configuration
-    -->
-    <target
-        name="assemble.org.eclipse.wst.xml.security_sdk.feature">
-        <property
-            name="archiveName"
-            value="wtp-incubator-xmlsecurity-sdk-${buildLabel}.zip"/>
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}"/>
-    </target>
-    <target
-        name="prePackage"/>
-    <target
-        name="postPackage">
-        <property
-            name="archiveName"
-            value="wtp-incubator-xmlsecurity-sdk-${buildLabel}.zip"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-            <property
-                name="buildLabel"
-                value="${buildLabel}"/>
-            <property
-                name="archiveName"
-                value="${archiveName}"/>
-        </ant>
-    </target>
-
-    <!--
-        Check out map files from repository
-        -->
-    <target
-        name="getMapFiles">
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENG}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENGXMLSEC}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-    </target>
-
-
-    <!-- 
-        Steps to do before setup
-    -->
-    <target
-        name="preSetup"></target>
-    <!--
-        Steps to do after setup but before starting the build proper
-    -->
-    <target
-        name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}"/>
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}"/>
-
-        <!-- Get the dependencies -->
-        <antcall
-            target="getDependencies"/>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Get the dependencies based on releng maps -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="getDependencies">
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-            <property
-                name="base.install.dir"
-                value="${buildRoot}"/>
-        </ant>
-    </target>
-
-    <!--
-      Steps to do before fetching the build elements
-    -->
-    <target
-        name="preFetch"></target>
-
-    <!-- 
-      Steps to do after fetching the build elements
-    -->
-    <target
-        name="postFetch"></target>
-
-    <!--
-      Steps to do before generating the build scripts.
-    -->
-    <target
-        name="preGenerate"></target>
-
-    <!--
-      Steps to do after generating the build scripts.
-    -->
-    <target
-        name="postGenerate">
-        <echo
-            message="buildDirectory: ${buildDirectory}"/>
-        <customizeAccessRules
-            bundleDirectory="${buildDirectory}/plugins"/>
-    </target>
-    <!--
-        Steps to do before running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include
-                name="**/about.mappings"/>
-        </replace>
-    </target>
-    <!--
-        Steps to do after running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="postProcess">
-        <condition
-            property="logsAvailable">
-            <istrue
-                value="${javacVerbose}"/>
-        </condition>
-        <antcall
-            target="gatherLogs"/>
-    </target>
-
-
-    <!--
-      Steps to do before running assemble. 
-        -->
-    <target
-        name="preAssemble"></target>
-
-    <!--
-      Steps to do after  running assemble.
-    -->
-    <target
-        name="postAssemble"></target>
-
-    <!--
-      Steps to do after the build is done.
-    -->
-    <target
-        name="postBuild"></target>
-
-    <!--
-      Steps to do to test the build results
-    -->
-    <target
-        name="test"></target>
-
-    <!--
-      Steps to do to publish the build results
-    -->
-    <target
-        name="publish"></target>
-
-    <!--
-      Helper targets
-    -->
-	    <target
-	        name="gatherLogs"
-	        if="logsAvailable">
-	        <mkdir
-	            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
-	        <echo
-	            level="debug"
-	            message="logExtension: ${logExtension}"/>
-	        <antcall
-	            target="allElements">
-	            <param
-	                name="target"
-	                value="gatherLogs"/>
-	            <param
-	                name="logExtension"
-	                value="${logExtension}"/>
-	        </antcall>
-	        <unzip
-	            dest="${buildDirectory}/${buildLabel}/compilelogs"
-	            overwrite="true">
-	            <fileset
-                dir="${buildDirectory}/features/org.eclipse.wst.xml.security_sdk.feature">
-	                <include
-	                    name="**/*.log.zip"/>
-	            </fileset>
-	        </unzip>
-	        <!--
-	            TODO: it is unclear if the above "gather" and unzip do
-	            anything constructive. I think not and should be removed
-	            (after experimental run, of course.
-	        -->
-	        <!--
-	            workaround: see
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-	        -->
-	        <copy
-	            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
-	            overwrite="true">
-	            <!--
-	                we want all @dot.xml files, but assumes a certain
-	                structure, to include directory for name of plugin
-	            -->
-	            <fileset
-	                dir="${buildDirectory}/features/">
-	                <include
-	                    name="**/feature.temp.folder/"/>
-	                <exclude
-	                    name="**/*tests*feature*/feature.temp.folder/" />
-	                     
-	            </fileset>
-	            <compositemapper>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/@dot.xml"
-	                    to="/\2/@dot.xml"/>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-	                    to="/\2/\3bin.xml"/>
-	            </compositemapper>
-	        </copy>
-	    </target>
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="cleanElement"/>
-        </antcall>
-    </target>
-
-    <!--
-      Default target 
-    -->
-    <target
-        name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/xmlsec_sdk/dependency.xml b/releng.wtpbuilder/components/xmlsec_sdk/dependency.xml
deleted file mode 100644
index 20bc365..0000000
--- a/releng.wtpbuilder/components/xmlsec_sdk/dependency.xml
+++ /dev/null
@@ -1,225 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-        <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-        
-	    <condition
-	        property="getprereq.eclipse">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.eclipseplatform">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emf">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfxsd">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfvalidation">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.gef">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.dtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wst">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.jst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	            	
-    <target
-        name="get">
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined, which we do later with
-            statements such if="${groupId}.url"
-        -->
-        <property
-            file="${dependency.properties}"/>
-        <antcall
-            target="prereq.eclipse"/>
-        <antcall
-            target="prereq.eclipseplatform"/>
-        <antcall
-            target="prereq.emf"/>
-        <antcall
-            target="prereq.emfxsd"/>
-        <antcall
-            target="prereq.emfvalidation"/>
-        <antcall
-            target="prereq.gef"/>
-        <antcall
-            target="prereq.dtp"/>
-        <antcall
-            target="prereq.wst"/>
-        <antcall
-            target="prereq.jst"/>
-        <antcall
-            target="prereq.wtp"/>
-    </target>
-    <target
-        name="prereq.eclipse"
-        if="getprereq.eclipse">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.eclipseplatform"
-        if="getprereq.eclipseplatform">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipseplatform"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emf"
-        if="getprereq.emf">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfxsd"
-        if="getprereq.emfxsd">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfvalidation"
-        if="getprereq.emfvalidation">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfvalidation"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.gef"
-        if="getprereq.gef">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.dtp"
-        if="getprereq.dtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="dtp"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wst"
-        if="getprereq.wst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.jst"
-        if="getprereq.jst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="jst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wtp"
-        if="getprereq.wtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstall"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/xmlsec_tests/build.properties b/releng.wtpbuilder/components/xmlsec_tests/build.properties
deleted file mode 100644
index 4d26330..0000000
--- a/releng.wtpbuilder/components/xmlsec_tests/build.properties
+++ /dev/null
@@ -1,46 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# This property file is used automatically by the PDE build process
-
-runPackager=true
-
-# This is a subdirectory of $buildDirectory
-# Set collectingFolder and archivePrefix to . if you want to create archives without
-# trailing eclipse in the paths of the included files
-collectingFolder=eclipse
-logExtension=.xml
-# The prefix that will be used in the generated archive.
-# Does not make sense to use a different archivePrefix than collectingFolder, 
-# because zip wouldn't find any files to include into the target zip otherwise
-archivePrefix=eclipse
-
-# Whether or not to include debug info in the output jars
-javacDebugInfo=true 
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=false
-
-##################################################
-# Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
-javacVerbose=true
-
-sign=false
-
-#############################################################
-
-# Properties introduced in 3.5 M3 (PDE base builder R35_M2). See
-# http://aniefer.blogspot.com/2008/10/sorting-bundles-and-parallel.html
-
-flattenDependencies=true
-parallelCompilation=true
-
diff --git a/releng.wtpbuilder/components/xmlsec_tests/customTargets.xml b/releng.wtpbuilder/components/xmlsec_tests/customTargets.xml
deleted file mode 100644
index d1d4683..0000000
--- a/releng.wtpbuilder/components/xmlsec_tests/customTargets.xml
+++ /dev/null
@@ -1,356 +0,0 @@
-<project
-    name="PDECustomTargets"
-    default="noDefault"
-    basedir=".">
-    <!--
-        = = = standard properties pattern = = = 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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- let this project specify properties, if not already set -->
-    <property
-        file="build.properties"/>
-    <fail
-        message="dependency.properties must be specified by distribution script"
-        unless="dependency.properties"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be set"/>
-    <echo
-        message="buildDirectory: ${buildDirectory}"/>
-    <!--
-        Run a given ${target} on all elements being built Add on <ant>
-        task for each top level element being built.
-    -->
-    <target
-        name="allElements">
-        <echo
-            level="info"
-            message="Target:${target} "/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="info"
-            message="component: ${component}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="baseLocation: ${baseLocation}"/>
-        <echo
-            level="debug"
-            message="generic target: ${genericTargets}"/>
-        <echo
-            message="compilerArg: ${compilerArg}"/>
-        <echo
-            message="individualSourceBundles: ${individualSourceBundles}"/>
-        <ant
-            antfile="${genericTargets}"
-            target="${target}">
-            <property
-                name="type"
-                value="feature"/>
-            <property
-                name="id"
-                value="org.eclipse.wst.xml.security_tests.feature"/>
-        </ant>
-    </target>
-    <!--
-        Targets to assemble the built elements for particular
-        configurations These generally call the generated assemble
-        scripts (named in ${assembleScriptName}) but may also add pre
-        and post processing Add one target for each root element and
-        each configuration
-    -->
-    <target
-        name="assemble.org.eclipse.wst.xml.security_tests.feature">
-        <property
-            name="archiveName"
-            value="wtp-incubator-xmlsecurity-tests-${buildLabel}.zip"/>
-        <ant
-            antfile="${assembleScriptName}"
-            dir="${buildDirectory}"/>
-    </target>
-    <target
-        name="prePackage"/>
-    <target
-        name="postPackage">
-        <property
-            name="archiveName"
-            value="wtp-incubator-xmlsecurity-tests-${buildLabel}.zip"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="unpackUpdateJarsAndCreateZippedPackages">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-            <property
-                name="buildLabel"
-                value="${buildLabel}"/>
-            <property
-                name="archiveName"
-                value="${archiveName}"/>
-        </ant>
-    </target>
-
-    <!-- 
-        Check out map files from repository
-    -->
-    <target
-        name="getMapFiles">
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENG}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENGXMLSEC}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-    </target>
-
-
-    <!-- 
-        Steps to do before setup
-    -->
-    <target
-        name="preSetup"></target>
-    <!--
-        Steps to do after setup but before starting the build proper
-    -->
-    <target
-        name="postSetup">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <echo
-            level="debug"
-            message="ant.file: ${ant.file}"/>
-        <echo
-            level="debug"
-            message="component.dir: ${component.dir}"/>
-
-        <!-- Get the dependencies -->
-        <antcall
-            target="getDependencies"/>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Get the dependencies based on releng maps -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="getDependencies">
-        <ant
-            antfile="${component.dir}/dependency.xml"
-            target="get">
-            <property
-                name="base.install.dir"
-                value="${buildRoot}"/>
-        </ant>
-    </target>
-
-    <!--
-      Steps to do before fetching the build elements
-    -->
-    <target
-        name="preFetch"></target>
-
-    <!-- 
-      Steps to do after fetching the build elements
-    -->
-    <target
-        name="postFetch"></target>
-
-    <!--
-      Steps to do before generating the build scripts.
-    -->
-    <target
-        name="preGenerate"></target>
-
-    <!--
-      Steps to do after generating the build scripts.
-    -->
-    <target
-        name="postGenerate">
-        <echo
-            message="buildDirectory: ${buildDirectory}"/>
-        <customizeAccessRules
-            bundleDirectory="${buildDirectory}/plugins"/>
-    </target>
-    <!--
-        Steps to do before running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="preProcess">
-        <replace
-            dir="${buildDirectory}/plugins"
-            value="${timestamp}"
-            token="@build@">
-            <include
-                name="**/about.mappings"/>
-        </replace>
-    </target>
-    <!--
-        Steps to do after running the build.xmls for the elements being
-        built.
-    -->
-    <target
-        name="postProcess">
-        <condition
-            property="logsAvailable">
-            <istrue
-                value="${javacVerbose}"/>
-        </condition>
-        <antcall
-            target="gatherLogs"/>
-    </target>
-
-
-    <!--
-      Steps to do before running assemble. 
-        -->
-    <target
-        name="preAssemble"></target>
-
-    <!--
-      Steps to do after  running assemble.
-    -->
-    <target
-        name="postAssemble"></target>
-
-    <!--
-      Steps to do after the build is done.
-    -->
-    <target
-        name="postBuild"></target>
-
-    <!--
-      Steps to do to test the build results
-    -->
-    <target
-        name="test"></target>
-
-    <!--
-      Steps to do to publish the build results
-    -->
-    <target
-        name="publish"></target>
-
-    <!--
-      Helper targets
-    -->
-	    <target
-	        name="gatherLogs"
-	        if="logsAvailable">
-	        <mkdir
-            dir="${buildDirectory}/${buildLabel}/testcompilelogs"/>
-	        <echo
-	            level="debug"
-	            message="logExtension: ${logExtension}"/>
-	        <antcall
-	            target="allElements">
-	            <param
-	                name="target"
-	                value="gatherLogs"/>
-	            <param
-	                name="logExtension"
-	                value="${logExtension}"/>
-	        </antcall>
-	        <unzip
-            dest="${buildDirectory}/${buildLabel}/testcompilelogs"
-            overwrite="true">
-	            <fileset
-                dir="${buildDirectory}/features/org.eclipse.wst.xml.security_tests.feature">
-	                <include
-	                    name="**/*.log.zip"/>
-	            </fileset>
-	        </unzip>
-	        <!--
-	            TODO: it is unclear if the above "gather" and unzip do
-	            anything constructive. I think not and should be removed
-	            (after experimental run, of course.
-	        -->
-	        <!--
-	            workaround: see
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-	        -->
-	        <copy
-	            todir="${buildDirectory}/${buildLabel}/testcompilelogs/plugins"
-	            overwrite="true">
-	            <!--
-	                we want all @dot.xml files, but assumes a certain
-	                structure, to include directory for name of plugin
-	            -->
-	            <fileset
-	                dir="${buildDirectory}/features/">
-	                <include
-	                    name="**/feature.temp.folder/"/>
-	                <exclude
-	                    name="**/*tests*feature*/feature.temp.folder/" />
-	                     
-	            </fileset>
-	            <compositemapper>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/@dot.xml"
-	                    to="/\2/@dot.xml"/>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-	                    to="/\2/\3bin.xml"/>
-	            </compositemapper>
-	        </copy>
-	    </target>
-    <target
-        name="clean"
-        unless="noclean">
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="cleanElement"/>
-        </antcall>
-    </target>
-
-    <!--
-      Default target 
-    -->
-    <target
-        name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/xmlsec_tests/dependency.xml b/releng.wtpbuilder/components/xmlsec_tests/dependency.xml
deleted file mode 100644
index 2b856ef..0000000
--- a/releng.wtpbuilder/components/xmlsec_tests/dependency.xml
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-        <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-        
-	    <condition
-	        property="getprereq.eclipse">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.eclipseplatform">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emf">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfxsd">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfvalidation">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.gef">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.dtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wst">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.jst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
-    <target
-        name="get">
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined, which we do later with
-            statements such if="${groupId}.url"
-        -->
-        <property
-            file="${dependency.properties}"/>
-        <antcall
-            target="prereq.eclipse"/>
-        <antcall
-            target="prereq.eclipseplatform"/>
-        <antcall
-            target="prereq.emf"/>
-        <antcall
-            target="prereq.emfxsd"/>
-        <antcall
-            target="prereq.emfvalidation"/>
-        <antcall
-            target="prereq.gef"/>
-        <antcall
-            target="prereq.dtp"/>
-        <antcall
-            target="prereq.wst"/>
-        <antcall
-            target="prereq.jst"/>
-        <antcall
-            target="prereq.wtp"/>
-       <antcall
-           target="getAndInstall">
-           <param
-               name="groupId"
-               value="eclipseTestFramework"/>    
-       	</antcall>
-    </target>
-    <target
-        name="prereq.eclipse"
-        if="getprereq.eclipse">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.eclipseplatform"
-        if="getprereq.eclipseplatform">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipseplatform"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emf"
-        if="getprereq.emf">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfxsd"
-        if="getprereq.emfxsd">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfvalidation"
-        if="getprereq.emfvalidation">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfvalidation"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.gef"
-        if="getprereq.gef">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.dtp"
-        if="getprereq.dtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="dtp"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wst"
-        if="getprereq.wst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.jst"
-        if="getprereq.jst">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="jst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wtp"
-        if="getprereq.wtp">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstall"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/dali.build/build.xml b/releng.wtpbuilder/distribution/dali.build/build.xml
deleted file mode 100644
index d9f434d..0000000
--- a/releng.wtpbuilder/distribution/dali.build/build.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<project
-    default="build"
-    basedir=".">
-    <fail
-        unless="wtp.builder.home"/>
-    <property
-        file="${wtp.builder.home}/build.properties"/>
-    <target
-        name="build"
-        depends="getBaseBuilder">
-        <dirname
-            file="${ant.file}"
-            property="distribution.wtp.build.dir"/>
-        <property
-            name="buildTargets"
-            value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-
-        <!-- for this distribution, dependencies come from dali.releng -->
-        <property
-            name="dependency.properties"
-            value="${buildDirectory}/maps/${env.RELENGDALI}/maps/dependencies.properties"/>
-
-
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="dali"/>
-        </ant>
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="dali-sdk"/>
-        </ant>
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="dali.tests"/>
-            <property
-                name="eclipseBuildFailOnError"
-                value="false"/>
-        </ant>
-        <antcall
-            target="package"/>
-    </target>
-    <target
-        name="getBaseBuilder"
-        if="eclipse.builder.fetch">
-        <dirname
-            file="${ant.file}"
-            property="wtbuilder.dir"/>
-        <property
-            name="buildTargets"
-            value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
-        <ant
-            antfile="${buildTargets}"
-            target="getBaseBuilder"/>
-    </target>
-    <target
-        name="package">
-        <!--
-            post, post packaging, for WTP ... "manually" assemble the
-            desired zips
-        -->
-        <!-- nothing to assemble right now -->
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/dali.site/build.xml b/releng.wtpbuilder/distribution/dali.site/build.xml
deleted file mode 100644
index 7c7d077..0000000
--- a/releng.wtpbuilder/distribution/dali.site/build.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<project
-    name="Build specific targets and properties"
-    default="build"
-    basedir=".">
-
-    <!-- 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" />
-    <!-- 
-        Let users override standard properties, if desired.
-        If directory, file, or some properties do not exist,  
-        then standard properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties" />
-
-    <!-- = = = end standard properties pattern = = = -->
-
-    <echo message="ant.file: ${ant.file}" />
-    <target name="build">
-        <java
-            jar="${eclipse.launcher}"
-            fork="true"
-            failonerror="true">
-            <jvmarg value="-Dosgi.ws=${env.BASEWS}" />
-            <jvmarg value="-Dosgi.os=${env.BASEOS}" />
-            <jvmarg value="-Dosgi.arch=${env.BASEARCH}" />
-            <jvmarg value="-Dbuild.donottagmaps=${build.donottagmaps}" />
-            <jvmarg value="-DbuildBranch=${buildBranch}" />
-            <jvmarg value="-DbuildType=${buildType}" />
-            <jvmarg value="-DbuildId=${buildId}" />
-            <jvmarg value="-DmapVersionTag=${mapVersionTag}" />
-            <jvmarg value="-Dbuild.distribution=${build.distribution}" />
-            <jvmarg value="-DbuildDirectory=${buildDirectory}" />
-            <jvmarg value="-Dwtp.builder.home=${wtp.builder.home}" />
-            <jvmarg value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}" />
-            <jvmarg
-                value="-Dprojectname=${projectname}" />
-            <arg value="-data" />
-            <arg value="${basedir}/workspace" />
-            <arg value="-application" />
-            <arg value="org.eclipse.ant.core.antRunner" />
-            <arg value="-buildfile" />
-            <arg value="${ant.file}" />
-            <arg value="publish" />
-        </java>
-    </target>
-
-    <!-- ===================================================================== -->
-    <!-- Steps to do to publish the build results -->
-    <!-- ===================================================================== -->
-    <target name="publish">
-        <dirname
-            file="${ant.file}"
-            property="component.dir" />
-        <ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
-        <property file="${buildDirectory}/label.properties" />
-
-        <property
-            name="publish.xml"
-            value="${component.dir}/publish.xml" />
-
-        <property
-            name="indexFileName"
-            value="index.php" />
-        <property
-            name="result"
-            value="${buildDirectory}/${buildLabel}" />
-        <property
-            name="indexTemplateFilename"
-            value="index.html.template.php" />
-
-        <copy
-            file="${wtp.builder.home}/distribution/wtp.site/templateFiles/${indexTemplateFilename}"
-            tofile="${buildDirectory}/${indexFileName}" />
-
-        <condition
-            property="isBuildTested"
-            value="true">
-            <available
-                file="${buildDirectory}/${buildLabel}/testResults/html" />
-        </condition>
-
-        <ant
-            antfile="${publish.xml}"
-            dir="${component.dir}">
-            <property
-                name="dropTokenList"
-                value="%wtpruntime%,%wtpsdk%,%wtptest%,%wst%,%wst-sdk%,%wst-tests%,%jst-tests%,%wst-perf-tests%,%jst-perf-tests%,%jpt-runtime%,%jpt-sdk%,%jpt-tests%" />
-            <property
-                name="webtoolsDownloadURL"
-                value="http://www.eclipse.org/downloads/download.php?file=/webtools/committers/drops" />
-
-            <property
-                name="buildBranch"
-                value="${buildBranch}" />
-            <property
-                name="isBuildTested"
-                value="${isBuildTested}" />
-            <property
-                name="indexTemplateFilename"
-                value="${indexTemplateFilename}" />
-        </ant>
-
-        <!--  Get the build map over for the results to point to. -->
-        <copy
-            file="${buildDirectory}/directory.txt"
-            tofile="${result}/directory.txt" />
-
-        <!-- Copy info for build identification -->
-        <copy
-            file="${buildDirectory}/buildmachineinfo.properties"
-            tofile="${result}/buildmachineinfo.properties" />
-
-        <!-- final count files -->
-        <countBuildFiles
-            sourceDirectory="${buildDirectory}/${buildLabel}"
-            filterString=".zip,.tar.gz"
-            outputFile="${buildDirectory}/${buildLabel}/files.count" />
-
-    </target>
-
-
-</project>
diff --git a/releng.wtpbuilder/distribution/dali.site/compilerXMLOutputToHTML.xsl b/releng.wtpbuilder/distribution/dali.site/compilerXMLOutputToHTML.xsl
deleted file mode 100644
index 4f6809e..0000000
--- a/releng.wtpbuilder/distribution/dali.site/compilerXMLOutputToHTML.xsl
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet
-    version="1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-    <xsl:output
-        method="html"
-        indent="yes" />
-
-    <xsl:template match="/">
-        <html>
-            <body>
-                <xsl:apply-templates select="compiler" />
-            </body>
-        </html>
-    </xsl:template>
-
-    <xsl:template match="compiler">
-        <h2>Compiler Report</h2>
-        <p>
-            Compiler:
-            <xsl:value-of select="@name" />
-            <xsl:text>   </xsl:text>
-            Version:
-            <xsl:value-of select="@version" />
-        </p>
-
-        <xsl:apply-templates select="stats" />
-
-        <xsl:apply-templates select="sources" />
-    </xsl:template>
-
-    <xsl:template
-        name="stats"
-        match="stats">
-
-        <p>
-            Number of source files:
-            <xsl:value-of select="count(..//source)" />
-            Number of classfiles:
-            <xsl:value-of select="number_of_classfiles/@value" />
-        </p>
-        <p>
-            Problems:
-            <xsl:value-of select="problem_summary/@problems" />
-            (Errors:
-            <xsl:value-of select="problem_summary/@errors" />
-            Warnings:
-            <xsl:value-of select="problem_summary/@warnings" />
-            )
-        </p>
-    </xsl:template>
-
-
-    <xsl:template
-        name="sources"
-        match="sources">
-
-        <xsl:if test="count(source) > 0">
-
-            <dl>
-                <xsl:for-each select="source">
-
-                    <xsl:variable
-                        name="package"
-                        select="normalize-space(@package)">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="path"
-                        select="normalize-space(@path)">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="classname"
-                        select="substring-after($path, $package)">
-                    </xsl:variable>
-                    <xsl:if test="count(problems) > 0">
-                        <dt style="font-weight: bold; color: black">
-                            Source File:
-                            <xsl:value-of select="$package" />
-                            <xsl:value-of select="$classname" />
-                        </dt>
-                        <xsl:apply-templates select="problems">
-                            <xsl:with-param name="classname">
-                                <xsl:value-of select="$classname" />
-                            </xsl:with-param>
-                        </xsl:apply-templates>
-                    </xsl:if>
-                </xsl:for-each>
-            </dl>
-
-        </xsl:if>
-
-    </xsl:template>
-
-    <xsl:template match="problems">
-        <xsl:param name="classname" />
-        <xsl:for-each select="problem">
-
-            <dd style="font-weight: normal; color: black">
-                <xsl:value-of select="position()" />
-                <xsl:text>.  </xsl:text>
-                <xsl:value-of select="@severity" />
-                <xsl:text>:  </xsl:text>
-                <xsl:value-of select="@id" />
-                <xsl:variable
-                    name="lineNumber"
-                    select="@line">
-                </xsl:variable>
-                <xsl:for-each select="message">
-                    <p
-                        style="margin-left: +.5in; font-size: -1; margin-top: 0;margin-bottom:0;">
-                        <small>
-                            <xsl:value-of select="@value" />
-                        </small>
-                    </p>
-                </xsl:for-each>
-                <xsl:for-each select="source_context">
-                    <xsl:variable
-                        name="pre"
-                        select="substring(@value,0,(@sourceStart + 1))">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="main"
-                        select="substring(@value,(@sourceStart + 1),(((@sourceEnd + 1) - (@sourceStart + 1)) + 1))">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="end"
-                        select="substring(@value,(@sourceEnd + 2))">
-                    </xsl:variable>
-
-                    <p
-                        style="margin-left: +.5in; font-size: -2; margin-top: 0;margin-bottom:0;">
-                        <xsl:value-of select="substring($classname,2)" />
-                        :
-                    </p>
-                    <p
-                        style="margin-left: +.5in; font-size: -2;font-family: monospace; margin-top: 0;margin-bottom:0;">
-                        <xsl:value-of select="$lineNumber" />
-                        :
-                        <xsl:value-of select="$pre" />
-                        <b>
-                            <u>
-                                <xsl:value-of select="$main" />
-                            </u>
-                        </b>
-                        <xsl:value-of select="$end" />
-                    </p>
-                </xsl:for-each>
-            </dd>
-        </xsl:for-each>
-
-
-    </xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/dali.site/publish.xml b/releng.wtpbuilder/distribution/dali.site/publish.xml
deleted file mode 100644
index cb84480..0000000
--- a/releng.wtpbuilder/distribution/dali.site/publish.xml
+++ /dev/null
@@ -1,569 +0,0 @@
-<project
-    name="Publish Build"
-    default="default"
-    basedir=".">
-
-	<!-- Properties that must be passed to this script:
-        buildDirectory: Path to perform the build in.  (A working directory)
-        buildType:		Type of build (nightly, integration etc.)
-        buildId:		Build name
-        buildLabel:		<buildType>-<buildName>-<timestamp>
-    -->
-
-    <property environment="env" />
-
-    <property
-        name="resultDir"
-        value="${buildDirectory}/${buildLabel}" />
-	<!--name of generated index page-->
-    <property
-        name="indexFileName"
-        value="index.php" />
-    <property
-        name="templateDir"
-        value="${wtp.builder.home}/distribution/${build.distribution}.site" />
-    <property
-        name="resultingIndex"
-        value="${resultDir}/${indexFileName}" />
-    <echo
-        level="debug"
-        message="resultDir: ${resultDir}" />
-    <echo
-        level="debug"
-        message="templateDir: ${templateDir}" />
-    <echo
-        level="debug"
-        message="resultingIndex: ${resultingIndex}" />
-
-
-
-    <target name="default">
-        <copy
-            overwrite="true"
-            file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/${indexTemplateFilename}"
-            tofile="${resultingIndex}" />
-        <antcall target="countFiles" />
-        <antcall target="generateCompileIndex" />
-        <antcall target="generateJUnitTestsIndex" />
-        <antcall target="getStaticFiles" />
-    </target>
-
-    <target name="generateCompileIndex">
-
-
-		<!--
-            <taskdef name="indexResults" classname="org.eclipse.wtp.releng.tools.ResultsSummaryGenerator" />
-        -->
-
-		<!--
-            isBuildTested:  true|false  should JUnit plugin test results be used to generate index page
-            dropTokenList:  comma separated list of strings which should be replaced by the fileName attribute settings in the testManifest.xml.
-            xmlDirectoryName:  path to directory containing JUnit plugin test results in xml format (see doc is org.eclipse.test).
-            dropDirectoryName: path to directory containing the result of the build.
-            testResultsTemplateFileName:  path to template file used to generate page with links to JUnit test results	
-            testResultsHtmlFileName:  name of file which will be generated with links to JUnit test results
-            dropHtmlFileName:  name of generated index page
-            hrefTestResultsTargetPath:  relative path from index page to directory containing JUnit html test results
-            hrefCompileLogsTargetPath:  relative path from index page directory containing compilelogs
-            testManifestFileName:	name of xml file containing descriptions of zip types and log files
-            
-            
-            
-        -->
-        <property
-            file="${buildDirectory}/maps/${env.RELENGDALI}/maps/dependencies.properties" />
-
-		<!-- create tables of test plugin compiles first -->
-        <antcall
-            target="generateCompileOutput">
-            <param
-                name="outputDirectory"
-                value="${resultDir}/testcompilelogs" />
-        </antcall>
-
-		<!-- create table of code plugins compiles -->
-        <summarizeResults
-            isBuildTested="false"
-            includeAll="true"
-            dropTokenList="${dropTokenList}"
-            xmlDirectoryName=""
-            dropDirectoryName="${resultDir}"
-            testResultsTemplateFileName="${templateDir}/templateFiles/compileResults.php.template"
-            testResultsHtmlFileName="compileResults.php"
-            hrefTestResultsTargetPath="testResults/html"
-            hrefCompileLogsTargetPath="compilelogs"
-            compileLogsDirectoryName="${resultDir}/compilelogs" />
-        <xslt
-            basedir="${resultDir}/compilelogs"
-            destdir="${resultDir}/compilelogs"
-            includes="**/*.bin.xml"
-            scanincludeddirectories="true"
-            style="compilerXMLOutputToHTML.xsl"
-            force="true" />
-        <tstamp>
-            <format
-                property="TODAY"
-                pattern="MMMM d, yyyy" />
-        </tstamp>
-
-		<!--  Insert Build Type descriptor  -->
-        <antcall
-            target="${buildType}" />
-        <antcall
-            target="writeData" />
-
-		<!--  Update timestamp on file to permit overwrite through Ant copy task  -->
-        <touch
-            file="${resultingIndex}" />
-    </target>
-    <target
-        name="generateCompileOutput"
-        depends="checkIfCompileLogs"
-        if="doCompileLogs">
-        <summarizeResults
-            isBuildTested="false"
-            includeAll="true"
-            dropTokenList="${dropTokenList}"
-            xmlDirectoryName=""
-            dropDirectoryName="${resultDir}"
-            testResultsTemplateFileName="${templateDir}/templateFiles/testCompileResults.php.template"
-            testResultsHtmlFileName="testCompileResults.php"
-            hrefTestResultsTargetPath=""
-            hrefCompileLogsTargetPath="testcompilelogs"
-            compileLogsDirectoryName="${outputDirectory}" />
-        <xslt
-            basedir="${outputDirectory}"
-            destdir="${outputDirectory}"
-            includes="**/*.bin.xml"
-            scanincludeddirectories="true"
-            style="compilerXMLOutputToHTML.xsl"
-            force="true" />
-    </target>
-    <target
-        name="generateJUnitTestsIndex"
-        depends="checkIfTested"
-        if="doTests">
-
-		<!--
-            isBuildTested:  true|false  should JUnit plugin test results be used to generate index page
-            dropTokenList:  comma separated list of strings which should be replaced by the fileName attribute settings in the testManifest.xml.
-            xmlDirectoryName:  path to directory containing JUnit plugin test results in xml format (see doc is org.eclipse.test).
-            dropDirectoryName: path to directory containing the result of the build.
-            testResultsTemplateFileName:  path to template file used to generate page with links to JUnit test results	
-            testResultsHtmlFileName:  name of file which will be generated with links to JUnit test results
-            dropHtmlFileName:  name of generated index page
-            hrefTestResultsTargetPath:  relative path from index page to directory containing JUnit html test results
-            hrefCompileLogsTargetPath:  relative path from index page directory containing compilelogs
-            testManifestFileName:	name of xml file containing descriptions of zip types and log files
-            
-            
-            
-        -->
-        <property
-            file="${buildDirectory}/maps/${env.RELENGDALI}/maps/dependencies.properties" />
-
-		<!-- create table of test plugin compiles first -->
-		<!-- set isBuildTested to true for the "compile only" results -->
-        <summarizeResults
-            isBuildTested="true"
-            dropTokenList="${dropTokenList}"
-            dropDirectoryName="${resultDir}"
-            xmlDirectoryName="${resultDir}/testResults/xml"
-            testResultsTemplateFileName="${templateDir}/templateFiles/testResults.php.template"
-            testResultsHtmlFileName="testResults.php"
-            hrefTestResultsTargetPath="testResults/html"
-            compileLogsDirectoryName="" />
-        <tstamp>
-            <format
-                property="TODAY"
-                pattern="MMMM d, yyyy" />
-        </tstamp>
-
-		<!--  Insert Build Type descriptor  -->
-        <antcall
-            target="${buildType}" />
-        <antcall
-            target="writeData" />
-
-		<!--  Update timestamp on file to permit overwrite through Ant copy task  -->
-        <touch
-            file="${resultingIndex}" />
-    </target>
-    <target
-        name="getStaticFiles">
-		<!--get static files required in the buildLabel directory-->
-        <copy
-            todir="${resultDir}">
-            <fileset
-                dir="${templateDir}/staticDropFiles" />
-        </copy>
-
-		<!--copy buildnotes from plugin directories-->
-        <mkdir
-            dir="${resultDir}/buildnotes" />
-        <copy
-            todir="${resultDir}/buildnotes"
-            flatten="true">
-            <fileset
-                dir="${buildDirectory}/plugins"
-                includes="**/buildnotes_*.html" />
-            <fileset
-                dir="${buildDirectory}/features"
-                includes="**/buildnotes_*.html" />
-        </copy>
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/full/logIndex.php" />
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/testLogs/logIndex.php" />
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/testSysErrorLogs/logIndex.php" />
-    </target>
-    <target
-        name="updateSite">
-
-
-		<!-- get our authored, tokenized site.xml file -->
-        <copy
-            file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/siteWTP.xml"
-            tofile="${buildDirectory}/${buildLabel}/updateSite/site.xml"
-            overwrite="true"
-            failonerror="true" />
-		<!-- get the ${buildDirectory}/finalPluginsVersions.properties, and 
-            read as properties -->
-		<!-- substitute property value for tokens -->
-        <replace
-            file="${buildDirectory}/${buildLabel}/updateSite/site.xml"
-            propertyfile="${buildDirectory}/finalFeaturesVersions.properties">
-            <replacefilter
-                token="@org.eclipse.wst@"
-                property="org.eclipse.wst" />
-            <replacefilter
-                token="@org.eclipse.wst.sdk@"
-                property="org.eclipse.wst.sdk" />
-            <replacefilter
-                token="@org.eclipse.jst@"
-                property="org.eclipse.jst" />
-            <replacefilter
-                token="@org.eclipse.jst.sdk@"
-                property="org.eclipse.jst.sdk" />
-            <replacefilter
-                token="@org.eclipse.jpt.feature@"
-                property="org.eclipse.jpt.feature" />
-            <replacefilter
-                token="@org.eclipse.jpt_sdk.feature@"
-                property="org.eclipse.jpt_sdk.feature" />
-        </replace>
-    </target>
-    <target
-        name="countFiles">
-		<!--	
-            files.count is a file that should exist in the drop directory with a count of the zip files in the same directory.
-            It is required to generate a link to the build on the downloads page.
-        -->
-        <countBuildFiles
-            sourceDirectory="${resultDir}"
-            filterString=".zip,.tar.gz"
-            outputFile="${resultDir}/files.count" />
-    </target>
-
-	<!--Build type descriptors-->
-    <target
-        name="I">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" " />
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Integration" />
-    </target>
-    <target
-        name="S">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" " />
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Stable" />
-    </target>
-    <target
-        name="N">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" " />
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Nightly" />
-    </target>
-    <target
-        name="M">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" " />
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Maintenance" />
-    </target>
-    <target
-        name="R">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" " />
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Release" />
-    </target>
-    <target
-        name="T">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" " />
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Test" />
-    </target>
-    <target
-        name="P">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" " />
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Patches" />
-    </target>
-    <target
-        name="checkIfTested">
-        <echo
-            level="debug"
-            message="isBuildTested: ${isBuildTested}" />
-        <condition
-            property="doTests">
-            <equals
-                arg1="${isBuildTested}"
-                arg2="true"
-                trim="true"
-                casesensitive="false" />
-        </condition>
-    </target>
-    <target
-        name="checkIfCompileLogs">
-        <condition
-            property="doCompileLogs">
-            <available
-                file="${outputDirectory}" />
-        </condition>
-    </target>
-    <target
-        name="writeData">
-		<!--  Insert Build Date  -->
-        <replace
-            file="${resultingIndex}"
-            token="@date@"
-            value="${TODAY}" />
-
-		<!--  Insert Build Name  -->
-        <replace
-            file="${resultingIndex}"
-            token="@build@"
-            value="${buildLabel}" />
-        <replace
-            file="${resultingIndex}"
-            token="@buildBranch@"
-            value="${buildBranch}" />
-
-		<!--  Insert PreRequsites  -->
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseFile@"
-            value="${eclipse.file.linux-gtk-x86}" />
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseURL@"
-            value="${eclipse.url}/${eclipse.file.linux-gtk-x86}" />
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseBuildURL@"
-            value="${eclipse.url}" />
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilelinux@"
-            value="${eclipse.file.linux-gtk-x86}" />
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilewindows@"
-            value="${eclipse.file.win32-win32-x86}" />
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilemacos@"
-            value="${eclipse.file.macosx-carbon-ppc}" />
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseBuildHome@"
-            value="${eclipse.build.home}" />
-        <replace
-            file="${resultingIndex}"
-            token="@eclipse.mirror.prefixuri@"
-            value="${eclipse.mirror.prefixuri}" />
-        <replace
-            file="${resultingIndex}"
-            token="@eclipse.fspath.prefix@"
-            value="${eclipse.fspath.prefix}" />
-        <replace
-            file="${resultingIndex}"
-            token="@testURL@"
-            value="${eclipseTestFramework.url}/${eclipseTestFramework.file}" />
-        <replace
-            file="${resultingIndex}"
-            token="@testFile@"
-            value="${eclipseTestFramework.file}" />
-            
-        <replace
-            file="${resultingIndex}"
-            token="@emfFile@"
-            value="${emf.file}" />
-        <replace
-            file="${resultingIndex}"
-            token="@emfURL@"
-            value="${emf.url}/${emf.file}" />
-        <replace
-            file="${resultingIndex}"
-            token="@emfBuildHome@"
-            value="${emf.build.home}" />
-        <replace
-            file="${resultingIndex}"
-            token="@emf.mirror.prefixuri@"
-            value="${emf.mirror.prefixuri}" />
-            
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdFile@"
-            value="${emfxsd.file}" />
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdURL@"
-            value="${emfxsd.url}/${emfxsd.file}" />
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdBuildHome@"
-            value="${emfxsd.build.home}" />
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsd.mirror.prefixuri@"
-            value="${emfxsd.mirror.prefixuri}" />
-          
-        <replace
-            file="${resultingIndex}"
-            token="@jstFile@"
-            value="${jst.file}" />
-        <replace
-            file="${resultingIndex}"
-            token="@jstURL@"
-            value="${jst.url}/${jst.file}" />
-        <replace
-            file="${resultingIndex}"
-            token="@jstBuildHome@"
-            value="${jst.build.home}" />
-        <replace
-            file="${resultingIndex}"
-            token="@jst.mirror.prefixuri@"
-            value="${jst.mirror.prefixuri}" />
-            
-        <replace
-            file="${resultingIndex}"
-            token="@gefFile@"
-            value="${gef.file}" />
-        <replace
-            file="${resultingIndex}"
-            token="@gefURL@"
-            value="${gef.url}/${gef.file}" />
-        <replace
-            file="${resultingIndex}"
-            token="@gefBuildHome@"
-            value="${gef.build.home}" />
-        <replace
-            file="${resultingIndex}"
-            token="@gef.mirror.prefixuri@"
-            value="${gef.mirror.prefixuri}" />
-            
-        <replace
-            file="${resultingIndex}"
-            token="@eclipserelengFile@"
-            value="${eclipsereleng.file}" />
-        <replace
-            file="${resultingIndex}"
-            token="@eclipserelengURL@"
-            value="${eclipsereleng.url}/${eclipsereleng.file}" />
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipFile@"
-            value="${orbitthirdpartyzip.file}" />
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipURL@"
-            value="${orbitthirdpartyzip.url}/${orbitthirdpartyzip.file}" />
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipBuildHome@"
-            value="${orbitthirdpartyzip.build.home}" />
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzip.mirror.prefixuri@"
-            value="${orbitthirdpartyzip.mirror.prefixuri}" />
-
-
-		<!-- no longer used. Post 1.5.5 -->
-        <replace
-            file="${resultingIndex}"
-            token="@jemFile@"
-            value="${jem.file}" />
-        <replace
-            file="${resultingIndex}"
-            token="@jemURL@"
-            value="${jem.url}/${jem.file}" />
-        <replace
-            file="${resultingIndex}"
-            token="@jemBuildHome@"
-            value="${jem.build.home}" />
-        <replace
-            file="${resultingIndex}"
-            token="@jem.mirror.prefixuri@"
-            value="${jem.mirror.prefixuri}" />
-		<!-- 
-            these token/s should not exist in maintenance stream, but 
-            do no harm done, so in the interests of keeping builder 
-            streams in sync, we'll leave them here as place hold
-        -->
-        <replace
-            file="${resultingIndex}"
-            token="@dtpFile@"
-            value="${dtp.file}" />
-        <replace
-            file="${resultingIndex}"
-            token="@dtpURL@"
-            value="${dtp.url}/${dtp.file}" />
-        <replace
-            file="${resultingIndex}"
-            token="@dtpBuildHome@"
-            value="${dtp.build.home}" />
-        <replace
-            file="${resultingIndex}"
-            token="@dtp.mirror.prefixuri@"
-            value="${dtp.mirror.prefixuri}" />
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/access_err.gif b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/access_err.gif
deleted file mode 100644
index 4f0748a..0000000
--- a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/access_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/access_warn.gif b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/access_warn.gif
deleted file mode 100644
index 8386e3e..0000000
--- a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/access_warn.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/buildNotes.php b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/buildNotes.php
deleted file mode 100644
index e843ecf..0000000
--- a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/buildNotes.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<html>
-<head>
-<?php
-$parts = explode("/", getcwd());
-$parts2 = explode("-", $parts[count($parts) - 1]);
-$buildName = $parts2[1];
-
-echo "<title>Build Notes for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Build Notes</font></b></p>
-
-<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"> Build Notes for <?php echo "$buildName"; ?></font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$hasNotes = false;
-$aDirectory = dir("buildnotes");
-while ($anEntry = $aDirectory->read()) {
-    if ($anEntry != "." && $anEntry != "..") {
-        //print_r($anEntry);
-        //echo "<br />";
-
-        $subject = $anEntry;
-        $pattern = '/^buildnotes_(.*)/i';
-        preg_match($pattern, $subject, $matches);
-        $subject = $matches[1];
-        //print_r($subject);
-        //echo "<br />";
-        $pattern = '/^(.*)\.html$/';
-        preg_match($pattern, $subject, $matches);
-        //print_r($matches);
-        //echo "<br />";
-
-        $component = $matches[1];
-
-        $line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
-        echo "<tr>";
-        echo "$line";
-        echo "</tr>";
-        $hasNotes = true;
-
-    }
-}
-$aDirectory.closedir();
-if (!$hasNotes) {
-    echo "<br>There are no build notes for this build.";
-}
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/compile_err.gif b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/compile_err.gif
deleted file mode 100644
index c2bfdd6..0000000
--- a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/compile_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/compile_warn.gif b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/compile_warn.gif
deleted file mode 100644
index cf4fdf9..0000000
--- a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/compile_warn.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/consoleLogs.php b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/consoleLogs.php
deleted file mode 100644
index 7dd5f42..0000000
--- a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/consoleLogs.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<html>
-<head>
-<?php
-$parts = explode("/", getcwd());
-$parts2 = explode("-", $parts[count($parts) - 1]);
-$buildName = $parts2[1];
-
-echo "<title>Test Console Output for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-<title>Console Logs from Running JUnit Plug-in Tests</title>
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b></p>
-
-<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">Console output from running
-		JUnit plugin tests for <?php echo "$buildName"; ?> </font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$rootDir = "testResults/consolelogs";
-$hasNotes = false;
-$aDirectory = dir($rootDir);
-$index = 0;
-$dirindex = 0;
-while ($anEntry = $aDirectory->read()) {
-    if ($anEntry != "." && $anEntry != "..") {
-        if (is_file("$rootDir/$anEntry")) {
-            $entries[$index] = $anEntry;
-            $index++;
-        } else if (is_dir("$rootDir/$anEntry")) {
-            $direntries[$dirindex] = $anEntry;
-            $dirindex++;
-        }
-    }
-}
-$aDirectory->close();
-
-
-sort($entries);
-sort($direntries);
-
-for ($i = 0; $i < $dirindex; $i++) {
-    $anEntry = $direntries[$i];
-    $line = "<td><a href=\"testResults/consolelogs/$anEntry/logIndex.php\">$anEntry</a></td>";
-    echo "<tr>";
-    echo "$line";
-    echo "</tr>";
-}
-for ($i = 0; $i < $index; $i++) {
-    $anEntry = $entries[$i];
-    $logsize = filesize("testResults/consolelogs/$anEntry");
-
-
-    $level = 0;
-    if ($logsize > 20000) {
-        $level = 2;
-    }
-    else if ($logsize > 2000) {
-        $level = 1;
-    }
-
-    if ($level == 0) {
-        $line = "<td><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-    }
-    else if ($level == 1) {
-        $line = "<td><em><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-    } else if ($level == 2) {
-        $line = "<td><strong><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-    }
-
-
-    echo "<tr>";
-    echo "$line";
-    echo "</tr>";
-    $hasNotes = true;
-}
-
-if (!$hasNotes) {
-    echo "<br>There are no test logs for this build.";
-}
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/junit_err.gif b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/junit_err.gif
deleted file mode 100644
index 1b7ff9d..0000000
--- a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/junit_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/logIndex.php b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/logIndex.php
deleted file mode 100644
index 0b36334..0000000
--- a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/logIndex.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<html>
-<head>
-<?php
-
-function endsWith( $str, $sub ) {
-
-   return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub );
-}
-
-        $parts = explode("/", getcwd());
-        $parts2 = explode("-", $parts[count($parts) - 1]);
-        $buildName = $parts2[1];
-
-        echo "<title>Test Console Output for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" type="text/css">
-<title>Console Logs from Running JUnit Plug-in Tests</title></head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b> </p>
-
-<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">Console
-      output from running JUnit plugin tests for
-      <?php echo "$buildName"; ?>
-      </font></b></td>
-  </tr>
-</table>
-<table border="0">
-
-<?php
-        $hasNotes = false;
-        $aDirectory = dir(".");
-        $index = 0;
-        while ($anEntry = $aDirectory->read()) {
-                if ($anEntry != "." && $anEntry != ".." && !endsWith(__FILE__, $anEntry)) {
-                        $entries[$index] = $anEntry;
-                        $index++;
-                }
-        }
-        aDirectory.closedir();
-
-
-        sort($entries);
-
-        for ($i = 0; $i < $index; $i++) {
-                $anEntry = $entries[$i];
-                $logsize = filesize("$anEntry");
-
-
-                $level = 0;
-                if ($logsize > 20000) {
-                        $level = 2;
-                }
-                else if ($logsize > 2000) {
-                        $level = 1;
-                }
-
-                if ($level == 0) {
-                        $line = "<td><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-                }
-                else if ($level == 1) {
-                        $line = "<td><em><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-                } else if ($level == 2) {
-                        $line = "<td><strong><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-                }
-
-
-                echo "<tr>";
-                echo "$line";
-                echo "</tr>";
-                $hasNotes = true;
-        }
-
-        if (!$hasNotes) {
-                echo "<br>There are no test logs for this build.";
-        }
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/miscUtil.php b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/miscUtil.php
deleted file mode 100644
index c83bdf6..0000000
--- a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/miscUtil.php
+++ /dev/null
@@ -1,214 +0,0 @@
-<?php
-
-// todo: unsure if can handle filenames that are URLs?
-// handy constant to compute file size in megabytes
-
-function fileSizeInMegs($filename) {
-	$onemeg=1024*1024;
-	$zipfilesize=filesize($filename);
-	$zipfilesize=round($zipfilesize/$onemeg, 0);
-	return $zipfilesize;
-}
-
-function fileSizeForDisplay($filename) {
-	$onekilo=1024;
-	$onemeg=$onekilo * $onekilo;
-	$criteria = 10 * $onemeg;
-	$scaleChar = "M";
-	$zipfilesize=filesize($filename);
-	if ($zipfilesize > $criteria) {
-		$zipfilesize=round($zipfilesize/$onemeg, 0);
-		$scaleChar = "M";
-	}
-	else {
-		$zipfilesize=round($zipfilesize/$onekilo, 0);
-		$scaleChar = "K";
-	}
-	$result =  "(" . $zipfilesize . $scaleChar . ")";
-	return $result;
-}
-
-
-function displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription) {
-	echo "<td align=\"right\" valign=\"top\" width=\"30%\">";
-	echo "<a href=\"$downloadprefix$filename\">" . $fileShortDescription . "</a>";
-	echo "</td><td align=\"right\" valign=\"top\" width=\"3%\">";
-	echo $zipfilesize;
-	echo "</td>";
-	echo "<td align=\"right\" valign=\"top\" width=\"2%\">";
-	echo "[<a href=\"checksum/$filename.md5\">md5</a>]";
-	echo "</td>";
-}
-
-function resourceExist($url, $mirrorPrefixuri, $prereqfilename, $eclipseFSpathPrefix)
-{
-	$result = false;
-
-	$allowURLopen = ini_get('allow_url_fopen');
-
-	if ($allowURLopen && stream_last_modified($url)) {
-		$result = true;
-	}
-	else {
-		// TODO: for now, we'll do a raw check on the whole file name, since enable_url_open
-		// is off. better would be to check if we are on build.eclipse.org or download.eclipse.org?
-    $wholePath = trim($eclipseFSpathPrefix) . "/" . trim($mirrorPrefixuri) . "/" . trim($prereqfilename);
-    if (file_exists($wholePath)) {
-    	$result = true;
-    }
-	}
-	return $result;
-}
-
-function stream_last_modified($url)
-{
-	if (function_exists('version_compare') && version_compare(phpversion(), '4.3.0') > 0)
-	{
-		if (!($fp = @fopen($url, 'r')))
-		return NULL;
-
-		$meta = stream_get_meta_data($fp);
-		for ($j = 0; isset($meta['wrapper_data'][$j]); $j++)
-		{
-			if (strstr(strtolower($meta['wrapper_data'][$j]), 'last-modified'))
-			{
-				$modtime = substr($meta['wrapper_data'][$j], 15);
-				break;
-			}
-		}
-		fclose($fp);
-	}
-	else
-	{
-		$parts = parse_url($url);
-		$host  = $parts['host'];
-		$path  = $parts['path'];
-
-		if (!($fp = @fsockopen($host, 80)))
-		return NULL;
-
-		$req = "HEAD $path HTTP/1.0\r\nUser-Agent: PHP/".phpversion()."\r\nHost: $host:80\r\nAccept: */*\r\n\r\n";
-		fputs($fp, $req);
-
-		while (!feof($fp))
-		{
-			$str = fgets($fp, 4096);
-			if (strstr(strtolower($str), 'last-modified'))
-			{
-				$modtime = substr($str, 15);
-				break;
-			}
-		}
-		fclose($fp);
-	}
-	return isset($modtime) ? strtotime($modtime) : time();
-}
-
-function isMirrored($uriToCheck) {
-	global $debugScript;
-	global $debugFunctions;
-	$localuri = $uriToCheck;
-
-	$debugMirrorList = false;
-	if ($debugScript) {
-		echo "uriToCheck: " . $localuri . "<br />";
-	}
-
-	$xmlcount = 0;
-
-	/* This method true and accurate method of parsing mirror results
-	 * may be expensive, and would
-	 * likely cause artificially high counts of "downloads".
-	 * Could maybe use if somehow only checked once ever 5 minutes or something.
-
-
-	 // turn off warnings, as sometimes HTML is returned, which causes lots of warnings
-	 $holdLevel = error_reporting(E_ERROR);
-	 $mirrorsxml=simplexml_load_file(rawurlencode($localuri) . urlencode("&format=xml"));
-	 error_reporting($holdLevel);
-
-
-	 if ($mirrorsxml) {
-	 if ($debugFunctions) {
-	 echo "root node: " . $mirrorsxml->getName() . "<br />";
-	 }
-	 if (strcmp($mirrorsxml->getName(), "mirrors") == 0) {
-	 foreach ($mirrorsxml->children() as $mirror) {
-	 if (strcmp($mirror->getName(),"mirror") == 0) {
-	 $xmlcount=$xmlcount+1;
-	 }
-	 if ($debugMirrorList) {
-	 print_r($mirror);
-	 echo "<br />";
-	 }
-	 }
-	 }
-	 if ($debugFunctions) {
-	 echo "Mirror count: " . $xmlcount . "<br />";
-	 }
-	 }
-	 */
-	/*
-	 * Use simple heuristic based on pattern
-	 * in the URI ... if it contains "/downloads/" then assume it's mirrored
-	 */
-	if (strpos($uriToCheck, "webtools/downloads/") > 0) {
-		$xmlcount = 1;
-	}
-	return ($xmlcount > 0);
-
-}
-
-// TODO: replace with Phoenix variables
-function getPlatform () {
-	global $debugScript;
-	global $debugFunctions;
-	// getBrowser is expensive, so cache the data
-	static $browser;
-	$platform = "unknown";
-
-
-	if(ini_get("browscap")) {
-		if(!isset($browser)){
-			$browser = get_browser(null, true);
-		}
-
-		if ($browser) {
-			$rawPlatform = $browser['platform'];
-			if ($debugFunctions) {
-				echo "browser platfrom: " . $rawPlatform . "<br />" ;
-			}
-
-			if ($debugFunctions) {
-				$browserKeys = array_keys($browser);
-				foreach ($browserKeys as $key) {
-					echo $key . ": " . $browser[$key] . "<br />";
-				}
-			}
-		}
-		if (strpos($rawPlatform, "Win") === 0) {
-			$platform="windows";
-		} else if (strpos($rawPlatform, "Linux") === 0) {
-			$platform="linux";
-		} else if (strpos($rawPlatform, "Mac") === 0) {
-			$platform="mac";
-		}
-	}
-	return $platform;
-}
-
-
-function getPrereqReferenceOrName($eclipseMirrorScript, $mirrorPrefixuri, $prerequrl, $prereqfilename, $eclipseFSpathPrefix) {
-	// todo: we really only need "if exists" so could make a bit more efficient
-	// I tried "file_exists" but is didn't seem to work on my test server
-	// For these pre-reqs, we assume if they exist, they are mirrored. This is true
-	// 99% of the time.
-
-	if (resourceExist($prerequrl, $mirrorPrefixuri, $prereqfilename, $eclipseFSpathPrefix)) {
-		$reflink="<a href=\"" . $eclipseMirrorScript . $mirrorPrefixuri . "/" . $prereqfilename . "\">" . $prereqfilename . "</a>";
-	} else {
-		$reflink=$prereqfilename;
-	}
-	return $reflink;
-}
-?>
diff --git a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/pending.gif b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/pending.gif
deleted file mode 100644
index 66db2a6..0000000
--- a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/pending.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/pending1.gif b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/pending1.gif
deleted file mode 100644
index 1b2ea6e..0000000
--- a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/pending1.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/report2.php b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/report2.php
deleted file mode 100644
index 52d2284..0000000
--- a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/report2.php
+++ /dev/null
@@ -1,45 +0,0 @@
-
-        <?php
-
-function parse_testResults($filename)
-{
-        $junitFailures = 0;
-        if (is_file($filename)) {
-                $handle = @fopen($filename, "r");
-                if ($handle)
-                {
-                        $size = filesize($filename);
-                        $content = fread($handle, $size);
-                        fclose($handle);
-                        $junitStart = strpos($content, "Errors &amp; Failures");
-                        $junitEnd = strpos($content, "</table>", $junitStart);
-                        $junitInfo = substr($content, $junitStart, $junitEnd - $junitStart);
-                        $start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">");
-                        while ($start !== false)
-                        {
-                                $start += 29;
-                                $stop = strpos($junitInfo, "</font></b></td>", $start);
-                                if ($stop !== false)
-                                {
-                                        $result = substr($junitInfo, $start, $stop - $start);
-                                        if (is_numeric($result))
-                                        {
-                                                $junitFailures += $result;
-                                        }
-                                        else if (strcmp($result, "DNF") == 0)
-                                        {
-                                                $junitFailures++;
-                                        }
-                                }
-                                $start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">", $stop);
-                        }
-                        $results = array($junitFailures);
-                        return $results;
-                }
-        }
-}
-
-
-?>
-
-
diff --git a/releng.wtpbuilder/distribution/dali.site/templateFiles/compileResults.php.template b/releng.wtpbuilder/distribution/dali.site/templateFiles/compileResults.php.template
deleted file mode 100644
index c854e2b..0000000
--- a/releng.wtpbuilder/distribution/dali.site/templateFiles/compileResults.php.template
+++ /dev/null
@@ -1,76 +0,0 @@
-<html>

-<head>

-

-<?php

-        $parts = explode("/", getcwd());

-        $parts2 = explode("-", $parts[count($parts) - 1]);

-        $buildName = $parts2[1];

-

-        echo "<title>Compile Logs: Code Bundles for $buildName</title>";

-?>

-

-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">

-

-<style>

-.bold, .bold TD, .bold TH, .bold TR

-{

-font-weight:bold;

-}

-.numeric, .numeric TD

-{

-text-align:right;

-padding-right:2%;

-}

-.normaltable, .normaltable TD, .normaltable TH

-{

-font-family:Bitstream Vera Sans Mono, monospace;

-font-size:0.9em;

-color:Black;

-background-color:White;

-}

-.errorltable, .errortable TD, .errortable TH

-{

-font-family:Bitstream Vera Sans Mono, monospace;

-font-size:0.9em;

-color:Black;

-background-color:Red;

-font-weight:bold;

-}

-.warningtable, .warningtable TD, .warningtable TH

-{

-font-family:Bitstream Vera Sans Mono, monospace;

-font-size:0.9em;

-color:Black;

-background-color:khaki;

-}

-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH

-{

-font-family:Bitstream Vera Sans Mono, monospace;

-font-size:0.9em;

-color:Black;

-background-color:Yellow;

-}

-</style>

-</head>

-<body>

-

-<?php

-        echo "<h1>Compile Logs: Code Bundles for $buildName</h1>";

-?>

-

-

-<table id=tabledata align = "center" width="75%" border="1">

-  <tr>

-    <td class="bold" align="center">Compile Logs</td>

-    <td class="bold" align="center">Compile Errors</td>

-    <td class="bold" align="center">Compiler Warnings</td>

-    <td class="bold" align="center">Access Violations</td>

-    <td class="bold" align="center">Access Warnings</td>

-  </tr>

-

-  %compilelogs%

-

-</table>

-

-</body>

-</html>

diff --git a/releng.wtpbuilder/distribution/dali.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/dali.site/templateFiles/index.html.template.php
deleted file mode 100644
index ac14950..0000000
--- a/releng.wtpbuilder/distribution/dali.site/templateFiles/index.html.template.php
+++ /dev/null
@@ -1,537 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<title>Dali Downloads</title>
-
-
-<?php
-
-$buildBranch="@buildBranch@";
-$build="@build@";
-$type="@type@";
-$builddate="@date@";
-
-$eclipseMirrorPrefixuri="@eclipse.mirror.prefixuri@";
-$eclipseFSpathPrefix="@eclipse.fspath.prefix@";
-
-$eclipsefilelinux="@eclipsefilelinux@";
-$eclipsefilewindows="@eclipsefilewindows@";
-$eclipsefilemacosx="@eclipsefilemacos@";
-
-$eclipseURL="@eclipseURL@";
-$eclipseFile="@eclipseFile@";
-$eclipseBuildURL="@eclipseBuildURL@";
-$eclipseBuildHome="@eclipseBuildHome@";
-$testURL="@testURL@";
-$testFile="@testFile@";
-
-$jstURL="@jstURL@";
-$jstFile="@jstFile@";
-$jstMirrorPrefixuri="@jst.mirror.prefixuri@";
-$jstBuildHome="@jstBuildHome@";
-
-
-$gefURL="@gefURL@";
-$gefFile="@gefFile@";
-$gefMirrorPrefixuri="@gef.mirror.prefixuri@";
-$gefBuildHome="@gefBuildHome@";
-
-$emfURL="@emfURL@";
-$emfFile="@emfFile@";
-$emfMirrorPrefixuri="@emf.mirror.prefixuri@";
-$emfBuildHome="@emfBuildHome@";
-
-$emfxsdURL="@emfxsdURL@";
-$emfxsdFile="@emfxsdFile@";
-$emfxsdMirrorPrefixuri="@emfxsd.mirror.prefixuri@";
-$emfxsdBuildHome="@emfxsdBuildHome@";
-
-$dtpURL="@dtpURL@";
-$dtpFile="@dtpFile@";
-$dtpMirrorPrefixuri="@dtp.mirror.prefixuri@";
-$dtpBuildHome="@dtpBuildHome@";
-
-
-$eclipserelengFile="@eclipserelengFile@";
-$eclipserelengURL="@eclipserelengURL@";
-$orbitthirdpartyzipFile="@orbitthirdpartyzipFile@";
-$orbitthirdpartyzipURL="@orbitthirdpartyzipURL@";
-$orbitthirdpartyzipBuildHome="@orbitthirdpartyzipBuildHome@";
-$orbitthirdpartyzipMirrorPrefixuri="@orbitthirdpartyzip.mirror.prefixuri@";
-
-
-
-
-include("miscUtil.php");
-
-
-
-ini_set("display_errors", "true");
-error_reporting (E_ALL);
-
-
-$debugScript = false;
-$debugFunctions = false;
-
-$defaultMirrorScript="";
-$defaultWTPMirrorPrefix="./";
-
-$eclipseMirrorScript="http://www.eclipse.org/downloads/download.php?file=";
-
-// TODO: improve so this hard coding isn't required.
-// This depends on the declare script changing webtools/committers to webtools/downloads
-// And, the logic is such that if it is not mirrored, this URI is not used at all, just
-// a relative reference only
-$eclipseWTPMirrorPrefix="/webtools/committers/drops/$buildBranch/$build/";
-
-
-$mirrorScript=$defaultMirrorScript;
-$downloadprefix=$defaultWTPMirrorPrefix;
-
-
-$keytestMirrorString=$eclipseMirrorScript . "$eclipseWTPMirrorPrefix/dali-sdk-$build.zip";
-if (isMirrored($keytestMirrorString) ) {
-	$mirrorScript=$eclipseMirrorScript;
-	$downloadprefix="${mirrorScript}${eclipseWTPMirrorPrefix}";
-}
-
-if ($debugScript)  {
-	echo "inferred platform: " . getPlatform();
-}
-
-
-// our summary results handling requires php 5 (for simple xml file loading)
-// so, if not php 5, just don't display any summary results
-// This was found to be required, since some mirror our whole site (e.g. IBM)
-// and not all mirrors use PHP 5
-$displayTestSummary=false;
-if (phpversion() >= 5) {
-
-	$displayTestSummary=true;
-	// expecting grandTotalErrors and grandTotalTests
-	$filename = "unitTestsSummary.xml";
-	if (file_exists($filename)) {
-		$prefix = "unitTests_";
-		$unitTestsSummary = simplexml_load_file($filename);
-		foreach ($unitTestsSummary->summaryItem as $summaryItem) {
-			$name = $summaryItem->name;
-			$value = $summaryItem->value;
-			$code= "\$" . $prefix . $name . " = " . $value . ";";
-			//echo "<br />code: " . $code;
-			eval($code);
-		}
-	}
-
-	$filename = "compilelogsSummary.xml";
-	$prefix = "code_";
-	$compileSummary = simplexml_load_file($filename);
-	foreach ($compileSummary->summaryItem as $summaryItem) {
-		$name = $summaryItem->name;
-		$value = $summaryItem->value;
-		$code= "\$" . $prefix . $name . " = " . $value . ";";
-		//echo "<br />code: " . $code;
-		eval($code);
-	}
-
-	$filename = "testcompilelogsSummary.xml";
-	$prefix = "test_";
-	$compileSummary = simplexml_load_file($filename);
-	foreach ($compileSummary->summaryItem as $summaryItem) {
-		$name = $summaryItem->name;
-		$value = $summaryItem->value;
-		$code= "\$" . $prefix . $name . " = " . $value . ";";
-		//echo "<br />code: " . $code;
-		eval($code);
-	}
-}
-
-
-?>
-
-
-</head>
-
-<body>
-
-
-<?php
-
-// tiny banner to remind when looking at "local" machine results
-$serverName = $_SERVER["SERVER_NAME"];
-
-if (!stristr($serverName, "eclipse.org") && !stristr($serverName,"you.are.at.eclipsecon.org")) {
-	echo '<center>
-          <p>
-          Reminder: this is <font color="#FF0000">' . 
-	$serverName .
-	'</font>
-          See also 
-          <a href="http://download.eclipse.org/webtools/downloads" target="_top">the live public Eclipse site</a>.
-          </p>
-          <hr />
-          </center>';
-
-}
-?>
-<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH="100%">
-	<tr>
-		<td ALIGN=left><font face="'Bitstream Vera',Helvetica,Arial" size="+2"><b><?php echo "$type";?>
-		Build: <?php echo "$build";?></b></font></td>
-	
-	
-	<tr valign="top">
-		<td><font size="-1"><?php echo "$builddate";?></font></td>
-	</tr>
-	<tr valign="top">
-		<td>
-		<p>These are some special, standalone build for Dali.</p>
-		</td>
-	</tr>
-</table>
-
-<!-- ***********  Required Prerequisites **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-	<tr>
-		<td align="left" valign="top" bgcolor="#0080C0"><font
-			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Required
-		Prerequisites and Handy Extras</font></td>
-	</tr>
-	<tr>
-		<td>
-		<p>These are the prerequisites to install and run the Web Tools
-		Platform. Also listed are some frequently needed links for
-		committer-required packages when creating new development
-		environments, or targets to run against.</p>
-		<p>Note that WTP requires Java 5 or higher (and, for some things,
-		actually requires a JDK rather than only a JRE) even though many other
-		<a href="http://www.eclipse.org/downloads/">Eclipse Projects</a> can
-		run with <a href="http://www.eclipse.org/downloads/moreinfo/jre.php">other
-		JRE levels</a>.</p>
-		<p></p>
-		</td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=1 cellpadding=1 width="90%" align="center">
-			<tr valign="top">
-				<td width="10%"></td>
-				<td width="40%">Eclipse Platform (Platform, JDT)</td>
-				<?php
-				//customize page depending on user's browser/platform, if we can detect it
-				$usersPlatform = getPlatform();
-				// assume windows by default, since likely most frequent, even for cases where
-				// platform is "unknown". I've noticed Opera reports 'unknown' :(
-				$recommendedFile=$eclipsefilewindows;
-				if (strcmp($usersPlatform,"linux")== 0) {
-					$recommendedFile=$eclipsefilelinux;
-				} else if (strcmp($usersPlatform,"mac") == 0) {
-					$recommendedFile=$eclipsefilemacosx;
-				}
-				?>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $eclipseBuildURL . "\">appropriate platform</a>";
-				echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>J2EE Standard Tools (JST)</td>
-				<td align="right"><?php
-				// debug
-				// echo "debug: full path: " . $eclipseFSpathPrefix . "/" . $jstMirrorPrefixuri . "/" . $jstFile;
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $jstMirrorPrefixuri, $jstURL, $jstFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $jstBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>EMF v2.4 Runtime Minimum executable code.</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfMirrorPrefixuri, $emfURL, $emfFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $emfBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>EMF XSD v2.4 Runtime Minimum executable code.</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdMirrorPrefixuri, $emfxsdURL, $emfxsdFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $emfxsdBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>Graphical Editing Framework (GEF)</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $gefMirrorPrefixuri, $gefURL, $gefFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $gefBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>Data Tools Platform (DTP)</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $dtpMirrorPrefixuri, $dtpURL, $dtpFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $dtpBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-			<tr valign="middle">
-				<td width="10%"></td>
-				<td colspan="2">
-				<hr />
-				</td>
-			</tr>
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>Eclipse Test Framework (required only for Automated JUnit tests)</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $testURL, $testFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>Eclipse releng tool (required only for committers to more easily
-				"release" code to a build)</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipserelengURL, $eclipserelengFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>Third Party code from Orbit (currently much more than needed for
-				WTP, but some committers like having the whole heap in their target)</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $orbitthirdpartyzipMirrorPrefixuri, $orbitthirdpartyzipURL, $orbitthirdpartyzipFile,$eclipseFSpathPrefix);
-				echo " or <a href=\"" . $orbitthirdpartyzipBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-		</table>
-		</td>
-	</tr>
-</table>
-
-<!-- ***********  WTP **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-	<tr>
-		<td align=left valign=top colspan="5" bgcolor="#0080C0"><font
-			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF"> Web Tools
-		Incubating Components</font></td>
-	</tr>
-
-	<tr>
-		<td align="left" valign="top" colspan="5">
-		<p>The Zip files includes the features and plugins for the Dali
-		Component.</p>
-		</td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
-
-
-			<tr>
-				<td align="left" valign="top" width="10%"><b>Minimal</b></td>
-				<td align="left" valign="top">
-				<p>Executable code only.</p>
-				</td>
-				<?php
-				$zipfilename="wtp-jpt-${build}";
-				$filename=$zipfilename.".zip";
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription="dali";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-				?>
-			</tr>
-
-			<tr>
-				<td align="left" valign="top" width="10%"><b>SDK</b></td>
-				<td align="left" valign="top">
-				<p>Executable code and source code.</p>
-				</td>
-				<?php
-				$zipfilename="wtp-jpt-sdk-${build}";
-				$filename=$zipfilename.".zip";
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription="dali sdk";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-				?>
-			</tr>
-			<tr>
-				<td align="left" valign="top" width="10%"><b>Tests</b></td>
-				<td align="left" valign="top">
-				<p>Unit tests.</p>
-				</td>
-				<?php
-				$zipfilename="wtp-jpt-Automated-Tests-${build}";
-				$filename=$zipfilename.".zip";
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription="dali tests";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-				?>
-			</tr>
-		</table>
-		</td>
-	
-	
-	<tr>
-
-</table>
-
-
-
-
-
-
-
-<!-- ***********  Build Status **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-	<tr>
-		<td align=left valign=top bgcolor="#0080C0"><font
-			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Status, tests
-		and other interesting details</font></td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
-
-			<tr>
-				<td><a href="buildNotes.php">Build notes</a> <br />
-				<a href="directory.txt">map files</a> <br />
-				<?php
-
-				if ($displayTestSummary) {
-
-
-					if (isset($unitTests_grandTotalErrors)) {
-						$errorColor="green";
-						if ($unitTests_grandTotalErrors > 0) {
-							$errorColor="red";
-						}
-						echo "<a href=\"testResults.php\">Unit test results</a>&nbsp;";
-						echo "<img src=\"junit_err.gif\"/><font color=\"" . $errorColor . "\">" . $unitTests_grandTotalErrors . "</font>&nbsp;&nbsp;Total: " . $unitTests_grandTotalTests;
-					}
-					else {
-						echo "<br /><font color=\"orange\">Unit tests are pending</font>&nbsp;&nbsp;<img src=\"pending.gif\"/>";
-					}
-
-					echo "<br />";
-					echo "<a href=\"compileResults.php\">Compile logs: Code Bundles</a>";
-
-					echo "&nbsp;&nbsp;($code_totalBundles)&nbsp;&nbsp;";
-					echo "<img src=\"compile_err.gif\"/><font color=red>$code_totalErrors</font>&nbsp;";
-					echo "<img src=\"compile_warn.gif\"/><font color=orange>$code_totalWarnings</font>&nbsp;";
-					echo "<img src=\"access_err.gif\"/><font color=red>$code_totalforbiddenAccessWarningCount</font>&nbsp;";
-					echo "<img src=\"access_warn.gif\"/><font color=orange>$code_totaldiscouragedAccessWarningCount</font>&nbsp;";
-
-					echo "<br />";
-					echo "<a href=\"testCompileResults.php\">Compile logs: Test Bundles</a>";
-
-					echo "&nbsp;&nbsp;($test_totalBundles)&nbsp;&nbsp;";
-					echo "<img src=\"compile_err.gif\"/><font color=red>$test_totalErrors</font>&nbsp;";
-					echo "<img src=\"compile_warn.gif\"/><font color=orange>$test_totalWarnings</font>&nbsp;";
-					echo "<img src=\"access_err.gif\"/><font color=red>$test_totalforbiddenAccessWarningCount</font>&nbsp;";
-					echo "<img src=\"access_warn.gif\"/><font color=orange>$test_totaldiscouragedAccessWarningCount</font>&nbsp;";
-				}
-
-				?> <br />
-
-				<?php
-				if (file_exists("versioningReportName.php")) {
-					include "versioningReportName.php";
-					$fname="${versionReportFilename}.html";
-					if (file_exists($fname)) {
-						echo "<br /> <a href='$fname'>Versioning Information</a>";
-					}
-}
-?> <?php
-echo "<br />";
-if (file_exists("./apiresults/api-progress.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-progress.html\">API Progress Report</a>";
-}
-if (file_exists("./apiresults/api-info-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-info-summary.html\">APIs Defined by Each Component</a>";
-}
-if (file_exists("./apiresults/api-ref-compatibility.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-ref-compatibility.html\">Adopter Breakage Report</a>";
-}
-if (file_exists("./apiresults/api-violation-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-violation-summary.html\">API Violations</a>";
-}
-if (file_exists("./apiresults/component-api-violation-all.html"))
-{
-	echo "<br /> <a href=\"apiresults/component-api-violation-all.html\">Non-API dependencies</a>";
-}
-if (file_exists("./apiresults/api-tc-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-tc-summary.html\">API Test Coverage</a>";
-}
-if (file_exists("./apiresults/api-javadoc-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-javadoc-summary.html\">API Javadoc Coverage</a>";
-}
-if (file_exists("./apiresults/api-tc-summary.html"))
-{
-	echo "<br /><br /> <a href=\"apiresults/full_test_coverage/api-tc-summary.html\">Test Coverage for All Classes and Methods</a>";
-}
-?> <?php
-if (file_exists("./perfresults/graph/performance.php"))
-{
-	echo "<br />";
-	echo "<br /> <a href=\"perfresults/graph/performance.php\">Performance Results</a>";
-	echo "<br />";
-}
-?></td>
-			</tr>
-
-
-		</table>
-		</td>
-	</tr>
-</table>
-
-
-
-<!-- footer -->
-<center>
-<hr>
-<p>All downloads are provided under the terms and conditions of the <a
-	href="http://www.eclipse.org/legal/notice.html">Eclipse.org Software
-User Agreement</a> unless otherwise specified.</p>
-
-<p>If you have problems downloading the drops, contact the <font
-	face="'Bitstream Vera',Helvetica,Arial" size="-1"><a
-	href="mailto:webmaster@eclipse.org">webmaster</a></font>.</p>
-
-</center>
-<!-- end footer -->
-
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/dali.site/templateFiles/siteEnablingFeatures.xml b/releng.wtpbuilder/distribution/dali.site/templateFiles/siteEnablingFeatures.xml
deleted file mode 100644
index e4ace4d..0000000
--- a/releng.wtpbuilder/distribution/dali.site/templateFiles/siteEnablingFeatures.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-
-    <description>
-        The update site contains the enabling features.
-    </description>
-
-
-
-
-
-
-
-    <category-def
-        name="Enabling Features"
-        label="Enabling Features">
-        <description>
-            This category contains features used by several projects
-            that enable some functionality, but which by themselves are
-            not very interesting.
-        </description>
-    </category-def>
-
-
-
-</site>
diff --git a/releng.wtpbuilder/distribution/dali.site/templateFiles/siteWTP.xml b/releng.wtpbuilder/distribution/dali.site/templateFiles/siteWTP.xml
deleted file mode 100644
index e3a86fa..0000000
--- a/releng.wtpbuilder/distribution/dali.site/templateFiles/siteWTP.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site
-    pack200="true"
-    mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/webtools/testUpdates/site.xml&amp;format=xml"
-    digestURL="http://download.eclipse.org/webtools/testUpdates/">
-
-    <description
-        url="http://download.eclipse.org/webtools/declaredUpdates/index.html">
-        The update site contains the features of the of Eclipse Web
-        Tools Project (WTP)
-    </description>
-
-    <feature
-        url="features/org.eclipse.wst_@org.eclipse.wst@.jar"
-        id="org.eclipse.wst"
-        version="@org.eclipse.wst@">
-        <category name="Web Tools Platform (WTP)" />
-    </feature>
-
-    <feature
-        url="features/org.eclipse.wst.sdk_@org.eclipse.wst.sdk@.jar"
-        id="org.eclipse.wst.sdk"
-        version="@org.eclipse.wst.sdk@">
-        <category name="Web Tools Platform (WTP)" />
-    </feature>
-
-    <feature
-        url="features/org.eclipse.jst_@org.eclipse.jst@.jar"
-        id="org.eclipse.jst"
-        version="@org.eclipse.jst@">
-        <category name="Web Tools Platform (WTP)" />
-    </feature>
-
-    <feature
-        url="features/org.eclipse.jst.sdk_@org.eclipse.jst.sdk@.jar"
-        id="org.eclipse.jst.sdk"
-        version="@org.eclipse.jst.sdk@">
-        <category name="Web Tools Platform (WTP)" />
-    </feature>
-
-
-
-
-    <feature
-        url="features/org.eclipse.jpt.feature_@org.eclipse.jpt.feature@.jar"
-        id="org.eclipse.jpt.feature"
-        version="@org.eclipse.jpt.feature@">
-        <category name="Web Tools Platform (WTP)" />
-    </feature>
-
-    <feature
-        url="features/org.eclipse.jpt_sdk.feature_@org.eclipse.jpt_sdk.feature@.jar"
-        id="org.eclipse.jpt_sdk.feature"
-        version="@org.eclipse.jpt_sdk.feature@">
-        <category name="Web Tools Platform (WTP)" />
-    </feature>
-
-
-    <category-def
-        name="Web Tools Platform (WTP)"
-        label="Web Tools Platform (WTP)">
-        <description>
-            This category contains the features of the Eclipse Web Tools
-            Project (WTP).
-        </description>
-    </category-def>
-
-
-</site>
diff --git a/releng.wtpbuilder/distribution/dali.site/templateFiles/testCompileResults.php.template b/releng.wtpbuilder/distribution/dali.site/templateFiles/testCompileResults.php.template
deleted file mode 100644
index 48c5085..0000000
--- a/releng.wtpbuilder/distribution/dali.site/templateFiles/testCompileResults.php.template
+++ /dev/null
@@ -1,76 +0,0 @@
-<html>

-<head>

-

-<?php

-        $parts = explode("/", getcwd());

-        $parts2 = explode("-", $parts[count($parts) - 1]);

-        $buildName = $parts2[1];

-

-        echo "<title>Compile Logs: Test Bundles for $buildName</title>";

-?>

-

-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">

-

-<style>

-.bold, .bold TD, .bold TH, .bold TR

-{

-font-weight:bold;

-}

-.numeric, .numeric TD

-{

-text-align:right;

-padding-right:2em;

-}

-.normaltable, .normaltable TD, .normaltable TH

-{

-font-family:Bitstream Vera Sans Mono, monospace;

-font-size:0.9em;

-color:Black;

-background-color:White;

-}

-.errorltable, .errortable TD, .errortable TH

-{

-font-family:Bitstream Vera Sans Mono, monospace;

-font-size:0.9em;

-color:Black;

-background-color:Red;

-font-weight:Bold;

-}

-.warningtable, .warningtable TD, .warningtable TH

-{

-font-family:Bitstream Vera Sans Mono, monospace;

-font-size:0.9em;

-color:Black;

-background-color:khaki;

-}

-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH

-{

-font-family:Bitstream Vera Sans Mono, monospace;

-font-size:0.9em;

-color:Black;

-background-color:Yellow;

-}

-</style>

-</head>

-<body>

-

-<?php

-        echo "<h1>Compile Logs: Test Bundles for $buildName</h1>";

-?>

-

-

-<table id=tabledata align = "center" width="75%" border="1">

-  <tr>

-    <td class="bold" align="center">Compile Logs</td>

-    <td class="bold" align="center">Compile Errors</td>

-    <td class="bold" align="center">Compiler Warnings</td>

-    <td class="bold" align="center">Access Violations</td>

-    <td class="bold" align="center">Access Warnings</td>

-  </tr>

-

-  %compilelogs%

-

-</table>

-

-</body>

-</html>

diff --git a/releng.wtpbuilder/distribution/dali.site/templateFiles/testResults.php.template b/releng.wtpbuilder/distribution/dali.site/templateFiles/testResults.php.template
deleted file mode 100644
index ddad0b7..0000000
--- a/releng.wtpbuilder/distribution/dali.site/templateFiles/testResults.php.template
+++ /dev/null
@@ -1,119 +0,0 @@
-<html>
-<head>
-
-<?php
-	$parts = explode("/", getcwd());
-	$parts2 = explode("-", $parts[count($parts) - 1]);
-	$buildName = $parts2[1];
-	
-	echo "<title>Test Results for $buildName </title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2em;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:Bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-
-}
-</style>
-
-
-</head>
-<body>
-<p><b><font face="Verdana" size="+3">Test Results</font></b> </p>
-
-<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">
-    Unit Test Results for <?php echo "$buildName"; ?> on Various Platforms and JRE</font></b></td>
-  </tr>
-</table>
-
-<?php
-if (file_exists("testResults"))
-{
-$dir = dir("testResults");
-while ($anEntry = $dir->read())
-{
-  if ($anEntry != "." && $anEntry != ".." && $anEntry != "consolelogs" && $anEntry != "html" && $anEntry != "xml")
-  {
-    $link = "testResults/".$anEntry."/results/index.php";
-    echo "<p><a href=\"$link\">$anEntry</a></p>";
-  }
-}
-}
-?>
-
-<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">Unit 
-      Test Results for <?php echo "$buildName"; ?> </font></b></td>
-  </tr>
-</table>
-
-<table id=tableunittestdata align = "center" width="75%" border="1">
-  <tr> 
-    <td class="bold" align="center" width="70%">Test Suite</td>
-    <td class="bold" align="center" width="10%">Errors &amp; Failures</td>
-    <td class="bold" align="center" width="10%">Total Tests</td>
-    <td class="bold" align="center" width="10%">Total Time (s)</td>
-  </tr>
-  
-  
-  %testresults%
-  
-</table>
-<p></p>
-<br>
-<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"> 
-      Console output logs 
-      <?php echo "$buildName"; ?>
-      </font></b></td>
-  </tr>
-</table>
-<br>
-These <a href="consoleLogs.php">logs</a> contain the console output captured while 
-running the JUnit automated tests. <br>
-<br>
-
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/dali.site/transformReportToHTML.xml b/releng.wtpbuilder/distribution/dali.site/transformReportToHTML.xml
deleted file mode 100644
index f5a70cd..0000000
--- a/releng.wtpbuilder/distribution/dali.site/transformReportToHTML.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-    name="xsl-conversion"
-    default="main"
-    basedir=".">
-
-    <target
-        name="main"
-        description="example.bin.xml to produce example.html">
-        <xslt
-            basedir="."
-            destdir="."
-            includes="*.bin.xml"
-            scanincludeddirectories="true"
-            style="compilerXMLOutputToHTML.xsl"
-            force="true" />
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/dali.tests/build.xml b/releng.wtpbuilder/distribution/dali.tests/build.xml
deleted file mode 100644
index e23bcb3..0000000
--- a/releng.wtpbuilder/distribution/dali.tests/build.xml
+++ /dev/null
@@ -1,352 +0,0 @@
-<project
-    name="Build specific targets and properties"
-    default="runTest">
-    <!--
-        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"/>
-    <fail
-        message="testRoot must be set for this task"
-        unless="testRoot" />
-  <!-- required to get proper value of dropinsFolder --> 
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-
-    <!-- if not otherwise set, assume 'all' tests -->
-    <property
-        name="testTarget"
-        value="all"/>
-    <!--
-        typcially already set, but in case of standalone tests, may not
-        be
-    -->
-    <property
-        name="buildLabel"
-        value="${buildType}-${buildId}-${timestamp}"/>
-
-
-    <!-- 
-      Steps to do after the build is done. 
-    -->
-    <target
-        name="test">
-        <dirname
-            file="${ant.file}"
-            property="currentDirectory"/>
-        <ant
-            antfile="${ant.file}"
-            target="runTest"
-            dir="${currentDirectory}"/>
-    </target>
-
-    <!-- 
-        Steps to do to test the build results
-    -->
-    <target
-        name="runTest">
-        <dirname
-            file="${ant.file}"
-            property="test.component.dir"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-        <property
-            file="${buildDirectory}/label.properties"/>
-        <property
-            file="${wtp.builder.home}/build.properties"/>
-        <fail
-            message="testRoot must be set for this task"
-            unless="testRoot"/>
-        <mkdir
-            dir="${testRoot}"/>
-
-        <!-- if results already exist, delete them -->
-        <delete
-            dir="${testRoot}/results"
-            failOnError="false"/>
-        <mkdir
-            dir="${testRoot}/results"/>
-        <mkdir
-            dir="${testRoot}/results/consolelogs"/>
-
-        <copy
-            todir="${testRoot}"
-            overwrite="true">
-            <fileset
-                dir="${test.component.dir}/testScripts"/>
-        </copy>
-        <echo
-            message="BASEOS: ${env.BASEOS}   BASEWS: ${env.BASEWS}   BASEARCH: ${env.BASEARCH} "/>
-        <ant
-            antfile="${test.component.dir}/testdependency.xml"
-            target="get">
-            <property
-                name="dependency.properties"
-                value="${buildDirectory}/maps/${env.RELENGDALI}/maps/dependencies.properties"/>
-            <property
-                name="base.install.dir"
-                value="${testRoot}"/>
-        </ant>
-        <antcall
-            target="unzipTests"/>
-        <antcall
-            target="runTestEclipse">
-        </antcall>
-        <antcall
-            target="postRunTestEclipse">
-        </antcall>
-    </target>
-    <target
-        name="unzipTests">
-        <!--
-            unzip the builds and junit tests we use 'unzip' here, so we
-            can continue on error, if desired. (such as if zip was not
-            created, due to other failures or options).
-        -->
-        <echo 
-        	message="installing dali sdk" />
-        <exec
-            dir="${buildDirectory}/${buildLabel}"
-            executable="unzip"
-            failonerror="true">
-            <arg
-                line="-o -qq wtp-jpt-sdk-${buildLabel}.zip -d ${testRoot}${dropinsFolder}"/>
-        </exec>
-        <echo
-            message="installing dali tests" />
-        <exec
-            dir="${buildDirectory}/${buildLabel}"
-            executable="unzip"
-            failonerror="true">
-            <arg
-                line="-o -qq wtp-jpt-Automated-Tests-${buildLabel}.zip -d ${testRoot}${dropinsFolder}"/>
-        </exec>
-    </target>
-    <!--
-        time out may need to be set/adjust for api or performance tests?
-        This testTimeLimit is the whole, overall limit on tests. There's
-        a shorter one for individual suites. some common values, of
-        milliseconds to more recognizable units: 
-        14400000: 4 hours
-        7200000: 2 hours 
-        3600000: 1 hour  
-        1800000: 30 minutes 
-        600000: 10 minutes
-    -->
-    <property
-        name="testTimeLimit"
-        value="14400000"/>
-    <property
-        name="testFailOnError"
-        value="false"/>
-    <target
-        name="runTestEclipse"
-        description="Run our JUnit's within an instance of antRunner">
-        <property
-            name="test-vm"
-            value="${env.JAVA_6_HOME}/bin/java"/>
-        <property
-            name="plugin-path"
-            value="${testRoot}${dropinsFolder}/eclipse/plugins"/>
-        <property
-            name="vmargs"
-            value="-Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH}  -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm}  -Dperf.buildId=${buildType}${date}-${time}"/>
-        <!--
-            set path to eclipse folder. If local folder, use '.';
-            otherwise, use c:\path\to\eclipse or /path/to/eclipse/
-        -->
-        <property
-            name="eclipse.home"
-            value="${testRoot}"/>
-        <echo
-            message="testTarget: ${testTarget}"/>
-        <echo
-            message="plugin-path: ${plugin-path}"/>
-        <echo
-            message="Running junits"/>
-        <!--
-            If there is not exactly one launcher in the stack, we'd best
-            fail fast, since we are not expecting that, and may indicate
-            an installation that would produce unpredictable results
-        -->
-        <!--
-            requires ant 1.7, and at this point, we're running 1.6 from
-            eclipse ... <condition property="expectedNumberOfLaunchers">
-            <resourcecount when="equal" count="1" > <fileset
-            dir="${testRoot}/eclipse/plugins"> <include
-            name="org.eclipse.equinox.launcher_*.jar" /> </fileset>
-            </resourcecount> </condition> <fail message="Did not find
-            expected number of launcher jars. Check installation."
-            unless="expectedNumberOfLaunchers" />
-        -->
-        <!--
-            Remember: using -debug for org.eclipse.ant.core.antRunner
-            produces ant debug info to be output ... which is a TON of
-            stuff
-        -->
-        <java
-            taskname="unit-test-masterprocess"
-            fork="true"
-            resultProperty="wtpmasterjunitresult"
-            failonerror="false"
-            timeout="${testTimeLimit}"
-            dir="${testRoot}/eclipse"
-            jvm="${env.JAVA_6_HOME}/bin/java"
-            classname="org.eclipse.equinox.launcher.Main">
-            <classpath>
-                <fileset
-                    dir="${testRoot}/eclipse/plugins">
-                    <include
-                        name="org.eclipse.equinox.launcher_*.jar"/>
-                </fileset>
-            </classpath>
-            <jvmarg
-                value="-Xverify"/>
-            <jvmarg
-                value="-Dosgi.ws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dosgi.os=${env.BASEOS}"/>
-            <jvmarg
-                value="-Dosgi.arch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-Dws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dos=${env.BASEOS}"/>
-            <jvmarg
-                value="-Darch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-Dnoclean=true"/>
-            <jvmarg
-                value="-DbuildBranch=${buildBranch}"/>
-            <jvmarg
-                value="-DbuildType=${buildType}"/>
-            <jvmarg
-                value="-DbuildId=${buildId}"/>
-            <jvmarg
-                value="-Dprojectname=${projectname}"/>
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <arg
-                value="-nosplash"/>
-            <arg
-                value="-consolelog"/>
-            <arg
-                value="-data"/>
-            <arg
-                value="${testRoot}/overallTestWorkspace"/>
-            <arg
-                value="-application"/>
-            <arg
-                value="org.eclipse.ant.core.antRunner"/>
-<!--        	
-            <arg
-                value="-verbose"/>
--->                
-            <arg
-                value="-logger"/>
-            <arg
-                value="org.apache.tools.ant.DefaultLogger"/>
-            <arg
-                value="-file"/>
-            <arg
-                value="${testRoot}/test.xml"/>
-            <arg
-                value="${testTarget}"/>
-
-            <!--  make sure our forked env has a DISPLAY -->
-            <env
-                key="DISPLAY"
-                value="${env.DISPLAY}"/>
-            <redirector
-                output="${testRoot}/results/fullOutput.txt"
-                error="${testRoot}/results/fullErrorLog.txt"/>
-            <jvmarg
-                value="-Dbuild.home=${env.BUILD_HOME}"/>
-            <jvmarg
-                value="-DbuildDirectory=${buildDirectory}"/>
-            <jvmarg
-                value="-DbuildLabel=${buildLabel}"/>
-            <jvmarg
-                value="-DbaseLocation=${baseLocation}"/>
-            <jvmarg
-                value="-DtestRoot=${testRoot}"/>
-            <jvmarg
-                value="-DtestDir=${testRoot}"/>
-            <jvmarg
-                value="-Dperf.buildId=${buildType}${date}-${time}"/>
-            <jvmarg
-                value="-DeclipseBuilderDirectory=${pde.builder.path}"/>
-            <jvmarg
-                value="-DbuildLabel=${buildLabel}"/>
-            <jvmarg
-                value="-Dplugin-path=${plugin-path}"/>
-        </java>
-        <echo
-            message="wtpmasterjunitresult ${wtpmasterjunitresult}"/>
-    </target>
-    <target
-        name="postRunTestEclipse">
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/consolelogs/testLogs"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results">
-                <include
-                    name="*output.txt"/>
-            </fileset>
-        </copy>
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/consolelogs/testSysErrorLogs"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results">
-                <include
-                    name="*error.txt"/>
-            </fileset>
-        </copy>
-        <copy
-            file="${testRoot}/results/fullOutput.txt"
-            toDir="${buildDirectory}/${buildLabel}/testResults/consolelogs/full"
-            overwrite="true"
-            failonerror="false">
-        </copy>
-        <copy
-            file="${testRoot}/results/fullErrorLog.txt"
-            toDir="${buildDirectory}/${buildLabel}/testResults/consolelogs/full"
-            overwrite="true"
-            failonerror="false">
-        </copy>
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/xml"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results/xml">
-                <include
-                    name="*.xml"/>
-            </fileset>
-        </copy>
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/html"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results/html">
-                <include
-                    name="*.html"/>
-            </fileset>
-        </copy>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/dali.tests/runDaliTests.bat b/releng.wtpbuilder/distribution/dali.tests/runDaliTests.bat
deleted file mode 100644
index 619c180..0000000
--- a/releng.wtpbuilder/distribution/dali.tests/runDaliTests.bat
+++ /dev/null
@@ -1,74 +0,0 @@
-REM Example script to run standalone Dali tests for a given local build
-REM
-@echo off
-SETLOCAL
-
-REM These "home" directories must be accurate for your machine.
-set BUILD_HOME=T:\work\runDaliTests
-set ANT_HOME=C:\bin\ant-1.7.0
-set JAVA_HOME=J:\jdk1.6.0_13
-set JAVA_6_HOME=J:\jdk1.6.0_13
-
-REM standard for windows. Linux or other platforms would need to change these.
-set BASEOS=win32
-set BASEWS=win32
-set BASEARCH=x86
-
-REM These 'set' commands should rarely, if ever have to be changed
-REM Some are not actually used, but values are provided
-REM to prevent spurious "warnings" in logs.
-REM In other cases, the directory must exist before this script runs.
-set PATH=%ANT_HOME%\bin;%JAVA_HOME%\bin;%PATH%
-set BASE_BUILDERS=%BUILD_HOME%\basebuilders
-set LOCAL_PREREQS_CACHE=%BUILD_HOME%\prereqcache
-set RELENG=webtools.maps/releng
-set RELENG_BUILDER=webtools.releng/releng.wtpbuilder
-set DISPLAY=localhost:0
-set BASE_BUILDERS=%BUILD_HOME%/basebuilders
-set PROJECT_BUILDERS=%BUILD_HOME%/projectBuilders
-set PROJECT_PROJECTS=%BUILD_HOME%/projects
-set PROJECT_TESTS=%BUILD_HOME%/project-tests
-set RECOMMENDED_TMP_DIR=%BUILD_HOME%/temp
-
-REM Distribution specific properties
-set DISTRIBUTION_NAME=dali
-set PROJECT_NAME=Dali-Build
-set RELENGDALI=webtools.maps/releng.dali
-
-REM the following comments apply to the -D variables provided to the ant command
-REM projectname: what ever the project would is called in cruisecontrol (even though CC isn't used here)
-REM build.distribution: the name of the distribution as it appears in releng.wtpbuilder
-REM build.committers: should be true if you want to download and reproduce a build from 'committers' area.
-REM                   If working from a build on 'downloads' area, omit the variable (do not just set to false).
-REM DbuildDirectory: location of the local build to test.
-REM DtestRoot: location where the tests will be installed and run.
-REM DkeyCfgFile: path of the releng build.cfg file.
-REM Dwtp.builder.home: location of the releng.wtpbuilder.
-REM buildType:        I, S, or R
-REM buildId:          Basically the "middle" part of a download zip or build name, such as the 3.2I in wtp-sdk-I-3.2I-20090722042933.zip
-REM timestamp         Basically the "end" part of a download zip or build name, such as 20090722042933 in wtp-sdk-I-3.2I-20090722042933.zip
-REM build.stream      (not sure if needed)
-REM buildBranch       Build branch used in various scripts ... usually the "middle" part of projectname, such as R3.2 in wtp-R3.2-I
-REM testTarget        The specific test suite(s) to run. These target names are from the test.xml file. Omit or use 'all' to run all tests.
-REM -f antfile        The name or path should not have to be changed, but the "releng.wtpbuilder" project must already be checked out from CVS
-REM                   (or exported from Eclipse) into a directory named 'webtools.releng' which is immediately under the BUILD_HOME directory.
-REM                   It is assume this batch file, then, is in the BUILD_HOME directory.
-REM Note: the buildDirectory should have at least two folders, one named 'webtools.maps' which contains all the maps, 
-REM and another folder which contains the result of a build and which is named ${buildType}-${buildId}-${timestamp}.
-
-ant  -Dprojectname=%PROJECT_NAME% ^
-     -Dbuild.distribution=%DISTRIBUTION_NAME%   ^
-     -Dbuild.committers=true   ^
-     -DbuildDirectory=%PROJECT_BUILDERS%/%PROJECT_NAME% ^
-     -DtestRoot=%PROJECT_TESTS% ^
-     -DkeyCfgFile=%PROJECT_BUILDERS%/%PROJECT_NAME%/%RELENG%/maps/build.cfg ^
-     -Dwtp.builder.home=%BUILD_HOME%/%RELENG_BUILDER% ^
-     -DbuildType=I ^
-     -DbuildId=I200907231609 ^
-     -Dtimestamp=200907231609 ^
-     -Dbuild.stream=R3.2 ^
-     -DbuildBranch=R3.2 ^
-     -DtestTarget=dali-core-tests ^
-     -f webtools.releng\releng.wtpbuilder\build.xml test
-
-ENDLOCAL
diff --git a/releng.wtpbuilder/distribution/dali.tests/templateFiles/index.php b/releng.wtpbuilder/distribution/dali.tests/templateFiles/index.php
deleted file mode 100644
index 8d23693..0000000
--- a/releng.wtpbuilder/distribution/dali.tests/templateFiles/index.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<html>
-<head>
-
-<?php
-    $parts = explode("/", realpath(".."));
-    $label = $parts[count($parts) - 1];
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" type="text/css">
-</head>
-<body>
-<p><b><font face="Verdana" size="+3">Test Results</font></b> </p>
-<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">Unit 
-      Test Results for <?php echo "$label"; ?> </font></b></td>
-  </tr>
-</table>
-<p></p><table border="0">
-</table>
-
-<table width="77%" border="1">
-  <tr> 
-    <td width="81%"><b>Tests Performed</b></td>
-    <td width="19%"><b>Errors &amp; Failures</b></td>
-  </tr>
-
-  <?
-    $dir = dir("html");
-    while ($anEntry = $dir->read())
-    {
-      if ($anEntry != "." && $anEntry != "..")
-      {
-        $link = "html/".$anEntry;
-        $xml = "xml/".substr($anEntry, 0, strlen($anEntry)-4)."xml";
-        $count = 0;
-        $fileHandle = fopen($xml, "r");
-        while (!feof($fileHandle))
-        {
-          $aLine = fgets($fileHandle, 4096); // Length parameter only optional after 4.2.0
-          $count = $count + substr_count($aLine, '<error');
-        }
-        fclose($fileHandle);
-        if ($count > 0)
-        {
-          echo "<tr><td><a href=\"$link\"><b><font color=\"red\">";
-          echo "$anEntry";
-          echo "</font></b></a></td>";
-          echo "<td><b><font color=\"red\">$count</font></b></td></tr>";
-        }
-        else
-        {
-          echo "<tr><td><a href=\"$link\">";
-          echo "$anEntry";
-          echo "</a></td>";
-          echo "<td>$count</td></tr>";
-        }
-      }
-    }
-  ?>
-  
-</table>
-<p></p>
-<br>
-<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"> 
-      Console output logs 
-      <?php echo "$label"; ?>
-      </font></b></td>
-  </tr>
-</table>
-<br>
-These <a href="consolelogs/wtptestlog.txt">logs</a> contain the console output captured while 
-running the JUnit automated tests. <br>
-<br>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/dali.tests/testScripts/ComputePluginVersion.jar b/releng.wtpbuilder/distribution/dali.tests/testScripts/ComputePluginVersion.jar
deleted file mode 100644
index ad06a45..0000000
--- a/releng.wtpbuilder/distribution/dali.tests/testScripts/ComputePluginVersion.jar
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/dali.tests/testScripts/JUNIT.XSL b/releng.wtpbuilder/distribution/dali.tests/testScripts/JUNIT.XSL
deleted file mode 100644
index f57faaa..0000000
--- a/releng.wtpbuilder/distribution/dali.tests/testScripts/JUNIT.XSL
+++ /dev/null
@@ -1,580 +0,0 @@
-<xsl:stylesheet
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="1.0">
-    <xsl:output
-        method="html"
-        indent="yes" />
-    <xsl:decimal-format
-        decimal-separator="."
-        grouping-separator="," />
-
-    <xsl:template match="testsuites">
-        <HTML>
-            <HEAD>
-                <style type="text/css">
-                    body { font:normal 68% verdana,arial,helvetica;
-                    color:#000000; } table tr td, table tr th {
-                    font-size: 68%; } table.details tr th{ font-weight:
-                    bold; text-align:left; background:#a6caf0; }
-                    table.details tr td{ background:#eeeee0; }
-
-                    p { line-height:1.5em; margin-top:0.5em;
-                    margin-bottom:1.0em; } h1 { margin: 0px 0px 5px;
-                    font: 165% verdana,arial,helvetica } h2 {
-                    margin-top: 1em; margin-bottom: 0.5em; font: bold
-                    125% verdana,arial,helvetica } h3 { margin-bottom:
-                    0.5em; font: bold 115% verdana,arial,helvetica } h4
-                    { margin-bottom: 0.5em; font: bold 100%
-                    verdana,arial,helvetica } h5 { margin-bottom: 0.5em;
-                    font: bold 100% verdana,arial,helvetica } h6 {
-                    margin-bottom: 0.5em; font: bold 100%
-                    verdana,arial,helvetica } .Error { font-weight:bold;
-                    color:red; } .Failure { font-weight:bold;
-                    color:purple; } .Properties { text-align:right; }
-                </style>
-                <script language="JavaScript">
-                    var TestCases = new Array(); var cur;
-                    <xsl:for-each select="./testsuite">
-                        <xsl:apply-templates select="properties" />
-                    </xsl:for-each>
-
-                </script>
-                <script language="JavaScript"><![CDATA[
-        function displayProperties (name) {
-          var win = window.open('','JUnitSystemProperties','scrollbars=1,resizable=1');
-          var doc = win.document.open();
-          doc.write("<html><head><title>Properties of " + name + "</title>");
-          doc.write("<style>")
-          doc.write("body {font:normal 68% verdana,arial,helvetica;	color:#000000; }");
-          doc.write("table tr td, table tr th { font-size: 68%; }");
-          doc.write("table.properties { border-collapse:collapse; border-left:solid 1 #cccccc; border-top:solid 1 #cccccc; padding:5px; }");
-          doc.write("table.properties th { text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#eeeeee; }");
-          doc.write("table.properties td { font:normal; text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#fffffff; }");
-          doc.write("h3 { margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica }");
-          doc.write("</style>");
-          doc.write("</head><body>");
-          doc.write("<h3>Properties of " + name + "</h3>");
-          doc.write("<div align=\"right\"><a href=\"javascript:window.close();\">Close</a></div>");
-          doc.write("<table class='properties'>");
-          doc.write("<tr><th>Name</th><th>Value</th></tr>");
-          for (prop in TestCases[name]) {
-            doc.write("<tr><th>" + prop + "</th><td>" + TestCases[name][prop] + "</td></tr>");
-          }
-          doc.write("</table>");
-          doc.write("</body></html>");
-          doc.close();
-          win.focus();
-        }
-      ]]>
-                </script>
-            </HEAD>
-            <body>
-                <a name="top"></a>
-                <xsl:call-template name="pageHeader" />
-
-                <!-- Summary part -->
-                <xsl:call-template name="summary" />
-                <hr
-                    size="1"
-                    width="95%"
-                    align="left" />
-
-                <!-- Package List part -->
-                <xsl:call-template name="packagelist" />
-                <hr
-                    size="1"
-                    width="95%"
-                    align="left" />
-
-                <!-- For each package create its part -->
-                <xsl:call-template name="packages" />
-                <hr
-                    size="1"
-                    width="95%"
-                    align="left" />
-
-                <!-- For each class create the  part -->
-                <xsl:call-template name="classes" />
-
-            </body>
-        </HTML>
-    </xsl:template>
-
-
-
-    <!-- ================================================================== -->
-    <!-- Write a list of all packages with an hyperlink to the anchor of    -->
-    <!-- of the package name.                                               -->
-    <!-- ================================================================== -->
-    <xsl:template name="packagelist">
-        <h2>Packages</h2>
-        Note: package statistics are not computed recursively, they only
-        sum up all of its testsuites numbers.
-        <table
-            class="details"
-            border="0"
-            cellpadding="5"
-            cellspacing="2"
-            width="95%">
-            <xsl:call-template name="testsuite.test.header" />
-            <!-- list all packages recursively -->
-            <xsl:for-each
-                select="./testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
-                <xsl:sort select="@package" />
-                <xsl:variable
-                    name="testsuites-in-package"
-                    select="/testsuites/testsuite[./@package = current()/@package]" />
-                <xsl:variable
-                    name="testCount"
-                    select="sum($testsuites-in-package/@tests)" />
-                <xsl:variable
-                    name="errorCount"
-                    select="sum($testsuites-in-package/@errors)" />
-                <xsl:variable
-                    name="failureCount"
-                    select="sum($testsuites-in-package/@failures)" />
-                <xsl:variable
-                    name="timeCount"
-                    select="sum($testsuites-in-package/@time)" />
-
-                <!-- write a summary for the package -->
-                <tr valign="top">
-                    <!-- set a nice color depending if there is an error/failure -->
-                    <xsl:attribute name="class">
-						<xsl:choose>
-							<xsl:when test="$failureCount &gt; 0">Failure</xsl:when>
-							<xsl:when test="$errorCount &gt; 0">Error</xsl:when>
-						</xsl:choose>
-					</xsl:attribute>
-                    <td>
-                        <a href="#{@package}">
-                            <xsl:value-of select="@package" />
-                        </a>
-                    </td>
-                    <td>
-                        <xsl:value-of select="$testCount" />
-                    </td>
-                    <td>
-                        <xsl:value-of select="$errorCount" />
-                    </td>
-                    <td>
-                        <xsl:value-of select="$failureCount" />
-                    </td>
-                    <td>
-                        <xsl:call-template name="display-time">
-                            <xsl:with-param
-                                name="value"
-                                select="$timeCount" />
-                        </xsl:call-template>
-                    </td>
-                </tr>
-            </xsl:for-each>
-        </table>
-    </xsl:template>
-
-
-    <!-- ================================================================== -->
-    <!-- Write a package level report                                       -->
-    <!-- It creates a table with values from the document:                  -->
-    <!-- Name | Tests | Errors | Failures | Time                            -->
-    <!-- ================================================================== -->
-    <xsl:template name="packages">
-        <!-- create an anchor to this package name -->
-        <xsl:for-each
-            select="/testsuites/testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
-            <xsl:sort select="@package" />
-            <a name="{@package}"></a>
-            <h3>
-                Package
-                <xsl:value-of select="@package" />
-            </h3>
-
-            <table
-                class="details"
-                border="0"
-                cellpadding="5"
-                cellspacing="2"
-                width="95%">
-                <xsl:call-template name="testsuite.test.header" />
-
-                <!-- match the testsuites of this package -->
-                <xsl:apply-templates
-                    select="/testsuites/testsuite[./@package = current()/@package]"
-                    mode="print.test" />
-            </table>
-            <a href="#top">Back to top</a>
-            <p />
-            <p />
-        </xsl:for-each>
-    </xsl:template>
-
-    <xsl:template name="classes">
-        <xsl:for-each select="testsuite">
-            <xsl:sort select="@name" />
-            <!-- create an anchor to this class name -->
-            <a name="{@name}"></a>
-            <h3>
-                TestCase
-                <xsl:value-of select="@name" />
-            </h3>
-
-            <table
-                class="details"
-                border="0"
-                cellpadding="5"
-                cellspacing="2"
-                width="95%">
-                <xsl:call-template name="testcase.test.header" />
-                <!--
-                    test can even not be started at all (failure to load the class)
-                    so report the error directly
-                -->
-                <xsl:if test="./error">
-                    <tr class="Error">
-                        <td colspan="4">
-                            <xsl:apply-templates select="./error" />
-                        </td>
-                    </tr>
-                </xsl:if>
-                <xsl:apply-templates
-                    select="./testcase"
-                    mode="print.test" />
-            </table>
-            <div class="Properties">
-                <a>
-                    <xsl:attribute name="href">javascript:displayProperties('<xsl:value-of
-                            select="@package" />.<xsl:value-of
-                            select="@name" />');</xsl:attribute>
-                    Properties &gt;&gt;
-                </a>
-            </div>
-            <p />
-
-            <a href="#top">Back to top</a>
-        </xsl:for-each>
-    </xsl:template>
-
-    <xsl:template name="summary">
-        <h2>Summary</h2>
-        <xsl:variable
-            name="testCount"
-            select="sum(testsuite/@tests)" />
-        <xsl:variable
-            name="errorCount"
-            select="sum(testsuite/@errors)" />
-        <xsl:variable
-            name="failureCount"
-            select="sum(testsuite/@failures)" />
-        <xsl:variable
-            name="timeCount"
-            select="sum(testsuite/@time)" />
-        <xsl:variable
-            name="successRate"
-            select="($testCount - $failureCount - $errorCount) div $testCount" />
-        <table
-            class="details"
-            border="0"
-            cellpadding="5"
-            cellspacing="2"
-            width="95%">
-            <tr valign="top">
-                <th>Tests</th>
-                <th>Failures</th>
-                <th>Errors</th>
-                <th>Success rate</th>
-                <th>Time</th>
-            </tr>
-            <tr valign="top">
-                <xsl:attribute name="class">
-				<xsl:choose>
-					<xsl:when test="$failureCount &gt; 0">Failure</xsl:when>
-					<xsl:when test="$errorCount &gt; 0">Error</xsl:when>
-				</xsl:choose>
-			</xsl:attribute>
-                <td>
-                    <xsl:value-of select="$testCount" />
-                </td>
-                <td>
-                    <xsl:value-of select="$failureCount" />
-                </td>
-                <td>
-                    <xsl:value-of select="$errorCount" />
-                </td>
-                <td>
-                    <xsl:call-template name="display-percent">
-                        <xsl:with-param
-                            name="value"
-                            select="$successRate" />
-                    </xsl:call-template>
-                </td>
-                <td>
-                    <xsl:call-template name="display-time">
-                        <xsl:with-param
-                            name="value"
-                            select="$timeCount" />
-                    </xsl:call-template>
-                </td>
-
-            </tr>
-        </table>
-        <table
-            border="0"
-            width="95%">
-            <tr>
-                <td style="text-align: justify;">
-                    Note:
-                    <i>failures</i>
-                    are anticipated and checked for with assertions
-                    while
-                    <i>errors</i>
-                    are unanticipated.
-                </td>
-            </tr>
-        </table>
-    </xsl:template>
-
-    <!--
-        Write properties into a JavaScript data structure.
-        This is based on the original idea by Erik Hatcher (erik@hatcher.net)
-    -->
-    <xsl:template match="properties">
-        cur = TestCases['
-        <xsl:value-of select="../@package" />
-        .
-        <xsl:value-of select="../@name" />
-        '] = new Array();
-        <xsl:for-each select="property">
-            <xsl:sort select="@name" />
-            cur['
-            <xsl:value-of select="@name" />
-            '] = '
-            <xsl:call-template name="JS-escape">
-                <xsl:with-param
-                    name="string"
-                    select="@value" />
-            </xsl:call-template>
-            ';
-        </xsl:for-each>
-    </xsl:template>
-
-    <!-- Page HEADER -->
-    <xsl:template name="pageHeader">
-        <h1>Unit Test Results</h1>
-        <table width="100%">
-            <tr>
-                <td align="left"></td>
-                <td align="right">
-                    Designed for use with
-                    <a href='http://www.junit.org'>JUnit</a>
-                    and
-                    <a href='http://jakarta.apache.org/ant'>Ant</a>
-                    .
-                </td>
-            </tr>
-        </table>
-        <hr size="1" />
-    </xsl:template>
-
-    <xsl:template
-        match="testsuite"
-        mode="header">
-        <tr valign="top">
-            <th width="80%">Name</th>
-            <th>Tests</th>
-            <th>Errors</th>
-            <th>Failures</th>
-            <th nowrap="nowrap">Time(s)</th>
-        </tr>
-    </xsl:template>
-
-    <!-- class header -->
-    <xsl:template name="testsuite.test.header">
-        <tr valign="top">
-            <th width="80%">Name</th>
-            <th>Tests</th>
-            <th>Errors</th>
-            <th>Failures</th>
-            <th nowrap="nowrap">Time(s)</th>
-        </tr>
-    </xsl:template>
-
-    <!-- method header -->
-    <xsl:template name="testcase.test.header">
-        <tr valign="top">
-            <th>Name</th>
-            <th>Status</th>
-            <th width="80%">Type</th>
-            <th nowrap="nowrap">Time(s)</th>
-        </tr>
-    </xsl:template>
-
-
-    <!-- class information -->
-    <xsl:template
-        match="testsuite"
-        mode="print.test">
-        <tr valign="top">
-            <!-- set a nice color depending if there is an error/failure -->
-            <xsl:attribute name="class">
-			<xsl:choose>
-				<xsl:when test="@failures[.&gt; 0]">Failure</xsl:when>
-				<xsl:when test="@errors[.&gt; 0]">Error</xsl:when>
-			</xsl:choose>
-		</xsl:attribute>
-
-            <!-- print testsuite information -->
-            <td>
-                <a href="#{@name}">
-                    <xsl:value-of select="@name" />
-                </a>
-            </td>
-            <td>
-                <xsl:value-of select="@tests" />
-            </td>
-            <td>
-                <xsl:value-of select="@errors" />
-            </td>
-            <td>
-                <xsl:value-of select="@failures" />
-            </td>
-            <td>
-                <xsl:call-template name="display-time">
-                    <xsl:with-param
-                        name="value"
-                        select="@time" />
-                </xsl:call-template>
-            </td>
-        </tr>
-    </xsl:template>
-
-    <xsl:template
-        match="testcase"
-        mode="print.test">
-        <tr valign="top">
-            <xsl:attribute name="class">
-			<xsl:choose>
-				<xsl:when test="failure | error">Error</xsl:when>
-			</xsl:choose>
-		</xsl:attribute>
-            <td>
-                <xsl:value-of select="@name" />
-            </td>
-            <xsl:choose>
-                <xsl:when test="failure">
-                    <td>Failure</td>
-                    <td>
-                        <xsl:apply-templates select="failure" />
-                    </td>
-                </xsl:when>
-                <xsl:when test="error">
-                    <td>Error</td>
-                    <td>
-                        <xsl:apply-templates select="error" />
-                    </td>
-                </xsl:when>
-                <xsl:otherwise>
-                    <td>Success</td>
-                    <td></td>
-                </xsl:otherwise>
-            </xsl:choose>
-            <td>
-                <xsl:call-template name="display-time">
-                    <xsl:with-param
-                        name="value"
-                        select="@time" />
-                </xsl:call-template>
-            </td>
-        </tr>
-    </xsl:template>
-
-
-    <xsl:template match="failure">
-        <xsl:call-template name="display-failures" />
-    </xsl:template>
-
-    <xsl:template match="error">
-        <xsl:call-template name="display-failures" />
-    </xsl:template>
-
-    <!-- Style for the error and failure in the tescase template -->
-    <xsl:template name="display-failures">
-        <xsl:choose>
-            <xsl:when test="not(@message)">N/A</xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of select="@message" />
-            </xsl:otherwise>
-        </xsl:choose>
-        <!-- display the stacktrace -->
-        <code>
-            <p />
-            <xsl:call-template name="br-replace">
-                <xsl:with-param
-                    name="word"
-                    select="." />
-            </xsl:call-template>
-        </code>
-        <!-- the later is better but might be problematic for non-21" monitors... -->
-        <!--pre><xsl:value-of select="."/></pre-->
-    </xsl:template>
-
-    <xsl:template name="JS-escape">
-        <xsl:param name="string" />
-        <xsl:choose>
-            <!-- something isn't right here, basically all single quotes need to be replaced with backslash-single-quote
-                <xsl:when test="contains($string,'&apos;')">
-                <xsl:value-of select="substring-before($string,'&apos;')"/>
-                \&apos;
-                <xsl:call-template name="JS-escape">
-                <xsl:with-param name="string" select="substring-after($string,'&apos;')"/>
-                </xsl:call-template>
-                </xsl:when> -->
-            <xsl:when test="contains($string,'\')">
-                <xsl:value-of select="substring-before($string,'\')" />
-                \\
-                <xsl:call-template name="JS-escape">
-                    <xsl:with-param
-                        name="string"
-                        select="substring-after($string,'\')" />
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of select="$string" />
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-
-    <!--
-        template that will convert a carriage return into a br tag
-        @param word the text from which to convert CR to BR tag
-    -->
-    <xsl:template name="br-replace">
-        <xsl:param name="word" />
-        <xsl:choose>
-            <xsl:when test="contains($word,'&#xA;')">
-                <xsl:value-of select="substring-before($word,'&#xA;')" />
-                <br />
-                <xsl:call-template name="br-replace">
-                    <xsl:with-param
-                        name="word"
-                        select="substring-after($word,'&#xA;')" />
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of select="$word" />
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-    <xsl:template name="display-time">
-        <xsl:param name="value" />
-        <xsl:value-of select="format-number($value,'0.000')" />
-    </xsl:template>
-
-    <xsl:template name="display-percent">
-        <xsl:param name="value" />
-        <xsl:value-of select="format-number($value,'0.00%')" />
-    </xsl:template>
-
-</xsl:stylesheet>
-
diff --git a/releng.wtpbuilder/distribution/dali.tests/testScripts/dali-junit-tests.xml b/releng.wtpbuilder/distribution/dali.tests/testScripts/dali-junit-tests.xml
deleted file mode 100644
index ebfb9d0..0000000
--- a/releng.wtpbuilder/distribution/dali.tests/testScripts/dali-junit-tests.xml
+++ /dev/null
@@ -1,316 +0,0 @@
-<?xml version="1.0"?>
-<project
-    name="JUnit tests"
-    basedir=".">
-    <property
-        environment="env"/>
-
-  <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-	      level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-    <target
-        name="init">
-        <!--
-            Parameters: (Mandatory) data-dir - the workspace directory
-            for Eclipse to write its data plugin-name - directory name of plugin
-            (with version suffix) classname - the name of the test class
-            (Optional - overrides defaults set in script) extraVMargs -
-            allows separate setting of VM args from separate caller.
-            timeout - overrides default test timeout value (in
-            milliseconds).
-        -->
-        <property
-            name="junit-report-output"
-            value="${testRoot}/results"/>
-        <mkdir
-            dir="${junit-report-output}/raw"/>
-        <!--
-            if not otherwise set, be sure extraVMargs is at least empty
-            string
-        -->
-        <property
-            name="extraVMargs"
-            value=""/>
-
-		<!-- if not otherwise set, use a unique workspace name -->
-        <property
-            name="data-dir"
-            value="${testRoot}/junitworkspaces/workspace-${classname}"/>
-        <property
-            name="testRoot"
-            value="${testRoot}"/>
-    	  <!-- temporarily changed from 30 minutes to 1 hrs 
-    	  to help spot problematic tests -->
-      <!--
-        Some common values, of milliseconds to more recognizable units: 
-        14400000: 4 hours
-        7200000: 2 hours 
-        3600000: 1 hour  
-        1800000: 30 minutes 
-        600000: 10 minutes
-      -->
-
-        <property
-            name="timeout"
-            value="3600000"/>
-        <property
-            name="junit-report-output"
-            value="${junit-report-output}"/>
-        <property
-            name="plugin-path"
-            value="${testRoot}${dropinsFolder}/eclipse/plugins/${testPlugin}"/>
-        <property
-            name="formatter"
-            value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter"/>
-        <property
-            name="test-output"
-            value="${junit-report-output}/raw/${classname}.xml"/>
-        <property
-            name="jvm"
-            value="${env.JAVA_6_HOME}/bin/java"/>
-        <dirname
-            file="${ant.file}"
-            property="currentDir"/>
-        <echo
-            level="debug"
-            message="data-dir: ${data-dir}"/>
-        <echo
-            level="debug"
-            message="plugin-name: ${plugin-name}"/>
-        <echo
-            level="debug"
-            message="classname: ${classname}"/>
-        <echo
-            level="debug"
-            message="extraVMargs: ${extraVMargs}"/>
-        <echo
-            level="debug"
-            message="timeout: ${timeout}"/>
-        <echo
-            level="debug"
-            message="testRoot: ${testRoot}"/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="debug"
-            message="eclipse-home: ${eclipse-home}"/>
-        <echo
-            level="debug"
-            message="plugin-path: ${plugin-path}"/>
-        <echo
-            level="debug"
-            message="junit-report-output: ${junit-report-output}"/>
-        <echo
-            level="debug"
-            message="test-output: ${test-output}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="buildLabel: ${buildLabel}"/>
-        <echo
-            level="debug"
-            message="jvm: ${jvm}"/>
-    </target>
-    <target
-        name="core-test"
-        depends="init">
-        <echo
-            level="info"
-            message="test-type: core-test"/>
-        <ant
-            antfile="${ant.file}"
-            dir="${currentDir}"
-            target="eclipse-test">
-            <property
-                name="application"
-                value="org.eclipse.test.coretestapplication"/>
-        </ant>
-    </target>
-    <target
-        name="ui-test"
-        depends="init">
-        <echo
-            level="info"
-            message="test-type: ui-test"/>
-        <ant
-            antfile="${ant.file}"
-            dir="${currentDir}"
-            target="eclipse-test">
-            <property
-                name="application"
-                value="org.eclipse.test.uitestapplication"/>
-        </ant>
-    </target>
-    <target
-        name="eclipse-test"
-        description="Runs the specified classname as a plug-in test.">
-        <echo
-            level="info"
-            message="Running ${classname}"/>
-        <echo
-            level="debug"
-            message="Result file: ${junit-report-output}/${classname}.xml."/>
-        <echo
-            level="debug"
-            message="DISPLAY: ${env.DISPLAY}"/>
-        <!--
-            If there is not exactly one launcher in the stack, we'd best
-            fail fast, since we are not expecting that, and may indicate
-            an installation that would produce unpredictable results
-        -->
-        <!--
-            requires ant 1.7, and at this point, we're running 1.6 from
-            eclipse ... <condition property="expectedNumberOfLaunchers">
-            <resourcecount when="equal" count="1" > <fileset
-            dir="${testRoot}/eclipse/plugins"> <include
-            name="org.eclipse.equinox.launcher_*.jar" /> </fileset>
-            </resourcecount> </condition> <fail message="Did not find
-            expected number of launcher jars. Check installation."
-            unless="expectedNumberOfLaunchers" />
-        -->
-        <java
-            taskname="suiteUnitTest"
-            fork="true"
-            resultProperty="suitejunitresult"
-            failonerror="false"
-            timeout="${timeout}"
-            dir="${testRoot}/eclipse"
-            jvm="${jvm}"
-            classname="org.eclipse.equinox.launcher.Main">
-            <classpath>
-                <fileset
-                    dir="${testRoot}/eclipse/plugins">
-                    <include
-                        name="org.eclipse.equinox.launcher_*.jar"/>
-                </fileset>
-            </classpath>
-            <jvmarg
-                value="-Xmx758m"/>
-            <jvmarg
-                value="-Dosgi.ws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dosgi.os=${env.BASEOS}"/>
-            <jvmarg
-                value="-Dosgi.arch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-DbuildLabel=${buildLabel}"/>
-            <jvmarg
-                value="-DbuildDirectory=${buildDirectory}"/>
-            <jvmarg
-                value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
-            <jvmarg
-                value="-DurlLogLocation=${buildDirectory}/outgoinghttplogfromtests.log"/>
-            <jvmarg
-                value="-Dwtp.autotest.noninteractive=true"/>
-            <jvmarg
-                value="-DPLUGIN_PATH=${plugin-path}"/>
-            <jvmarg
-                line="${extraVMargs}"/>
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <jvmarg
-                value="-Dprojectname=${projectname}"/>
-            <arg
-                value="-nosplash"/>
-            <arg
-                value="-consolelog"/>
-            <arg
-                value="-debug"/>
-            <arg
-                value="-data"/>
-            <arg
-                value="${data-dir}"/>
-            <arg
-                value="-application"/>
-            <arg
-                value="${application}"/>
-            <arg
-                value="formatter=${formatter},${test-output}"/>
-            <arg
-                value="-testPluginName"/>
-            <arg
-                value="${plugin-name}"/>
-            <arg
-                value="-className"/>
-            <arg
-                value="${classname}"/>
-            <env
-                key="DISPLAY"
-                value="${env.DISPLAY}"/>
-            <redirector
-                output="${junit-report-output}/${classname}.output.txt"
-                error="${junit-report-output}/${classname}.error.txt"/>
-        </java>
-        <echo
-            level="info"
-            message="suitejunitresult: ${suitejunitresult}"/>
-        <antcall
-            target="summarizeFailure"/>
-        <antcall
-            target="collect-results"/>
-    </target>
-    <target
-        name="collect-results">
-        <dirname
-            property="output-dir"
-            file="${test-output}"/>
-        <basename
-            property="output-file-name"
-            file="${test-output}"/>
-        <mkdir
-            dir="${junit-report-output}/xml"/>
-        <junitreport
-            todir="${junit-report-output}/xml"
-            tofile="${classname}.xml">
-            <fileset
-                dir="${output-dir}">
-                <include
-                    name="${output-file-name}"/>
-            </fileset>
-        </junitreport>
-        <mkdir
-            dir="${junit-report-output}/html"/>
-        <xslt
-            style="${testRoot}/JUNIT.XSL"
-            basedir="${junit-report-output}"
-            includes="${classname}.xml"
-            destdir="${junit-report-output}/html"/>
-
-    </target>
-    <target
-        name="collect">
-        <!--
-            deprecated, each test.xml uses it, and we should remove,
-            eventually
-        -->
-    </target>
-    <target
-        name="summarizeFailure"
-        depends="checkFailure"
-        if="doFailure">
-        <echo
-            append="true"
-            file="${buildDirectory}/junitFailureList.log">${plugin-name}${line.separator}</echo>
-    </target>
-    <target
-        name="checkFailure">
-        <condition
-            property="doFailure">
-            <not>
-                <equals
-                    arg1="${suitejunitresult}"
-                    arg2="0"
-                    trim="true"/>
-            </not>
-        </condition>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/dali.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/dali.tests/testScripts/test.xml
deleted file mode 100644
index 29a08ed..0000000
--- a/releng.wtpbuilder/distribution/dali.tests/testScripts/test.xml
+++ /dev/null
@@ -1,1129 +0,0 @@
-<project
-    name="Automated Eclipse Testing"
-    default="all"
-    basedir=".">
-    <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <available 
-    	file="${keyCfgFile}" 
-    	property="keyCfgFile.exists"/>
-    <fail 
-    	message="${keyCfgFile} Not Found" 
-    	unless="keyCfgFile.exists"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-    <echo
-        level="debug"
-        message="starting Automated Eclipse Testing"/>
-    <echo
-        level="debug"
-        message="basedir: ${basedir}"/>
-    <echo
-        level="debug"
-        message="testRoot: ${testRoot}"/>
-    <fail
-        message="testRoot must be set"
-        unless="testRoot"/>
-
-    <!--properties file containing the some server name properties -->
-    <property
-        file="${testRoot}/testServer.properties"/>
-
-    <!--properties file containing the build information-->
-    <property
-        file="${buildDirectory}/label.properties"/>
-
-    <!--default directory where test-eclipse will be installed-->
-    <property
-        name="install"
-        value="${testRoot}"/>
-    <!--
-        name that can be added to report name to identify which platform
-        tests results come from
-    -->
-    <property
-        name="platform"
-        value=""/>
-
-    <!-- The root of the eclipse installation -->
-    <property
-        name="eclipse-home"
-        value="${testRoot}${dropinsFolder}/eclipse/"/>
-    <!--
-        The directory that will contain the xml and html results from
-        the tests that are run
-    -->
-    <property
-        name="results"
-        value="${testRoot}/results"/>
-
-    <!-- jonas install directory -->
-    <property
-        name="jonas432Dir"
-        value="${testRoot}/${jonas432DirName}"/>
-    <target
-        name="init">
-        <antcall
-            target="setPropertyJOnAS432Dir"/>
-        <antcall
-            target="computePluginVersion"/>
-        <property
-            file="${testRoot}/test2.properties"/>
-    </target>
-    <target
-        name="setPropertyJOnAS432Dir"
-        unless="jonas432Dir">
-        <property
-            name="jonas432Dir"
-            value="${testRoot}/${jonas432DirName}"/>
-    </target>
-    <target
-        name="runtests"
-        description="Runs ant on the test.xml for a specified plugin.">
-        <available
-            file="${eclipse-home}/plugins/${testPlugin}/test.xml"
-            property="test.xml.exists"/>
-        <fail
-            message="${eclipse-home}/plugins/${testPlugin}/test.xml Not Found"
-            unless="test.xml.exists"/>
-        <antcall
-            target="runtests2"/>
-    </target>
-    <target
-        name="runtests2"
-        if="test.xml.exists">
-        <antcall
-            target="runtests-normal"/>
-        <copy
-            file="${eclipse-home}/${report}.xml"
-            tofile="${results}/xml/${report}_${platform}.xml"
-            failonerror="false"/>
-        <antcall
-            target="genHtml"/>
-    </target>
-    <target
-        name="runtests-normal">
-        <ant
-            antfile="${eclipse-home}/plugins/${testPlugin}/test.xml"
-            dir="${eclipse-home}">
-            <property
-                name="library-file"
-                value="${testRoot}/dali-junit-tests.xml"/>
-        </ant>
-        <copy
-            file="${eclipse-home}/${report}.xml"
-            tofile="${results}/xml/${report}_${platform}.xml"
-            failonerror="false"/>
-        <antcall
-            target="genHtml"/>
-    </target>
-    <target
-        name="wst-server-tests"
-        depends="init"
-        description="Runs the org.eclipse.wst.server.*.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.server.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.server.core.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.server.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.server.ui.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="wst-monitor-tests"
-        depends="init"
-        description="Runs the org.eclipse.wst.internet.monitor.*.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.internet.monitor.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.internet.monitor.core.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.internet.monitor.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.internet.monitor.ui.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="wst-cache-tests"
-        depends="init"
-        description="Runs the org.eclipse.wst.internet.cache.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.internet.cache.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.internet.cache.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="jst-server-tests"
-        depends="init"
-        description="Runs the org.eclipse.jst.server.*.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.server.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.server.core.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.server.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.server.ui.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="jst-server-tomcat-tests"
-        depends="init"
-        description="Runs the org.eclipse.jst.server.tomcat.*.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.server.tomcat.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.server.tomcat.core.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.server.tomcat.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.server.tomcat.ui.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="jst-server-generic-tests"
-        depends="init"
-        description="Runs the org.eclipse.jst.server.generic.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.server.generic.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.server.generic.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="jst-server-geronimo-tests"
-        depends="init"
-        description="Runs the org.eclipse.jst.server.geronimo.*.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.server.geronimo.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.server.geronimo.core.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.server.geronimo.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.server.geronimo.ui.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="jst-jem-tests"
-        depends="init"
-        description="Runs the org.eclipse.jem.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jem.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jem.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="jst-j2ee-core-tests"
-        depends="init"
-        description="Runs the org.eclipse.jst.j2ee.core.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.j2ee.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.j2ee.core.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="jst-j2ee-tests"
-        depends="init"
-        description="Runs the org.eclipse.jst.j2ee.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.j2ee.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.j2ee.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="wst-common-tests"
-        depends="init"
-        description="Runs the org.eclipse.jst.j2ee.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.common.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.common.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="validation-framework-tests"
-        depends="init"
-        description="Runs the common validation tests">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.common.tests.validation}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.common.tests.validation"/>
-        </antcall>
-    </target>
-    <target
-        name="wst-common-snippets-tests"
-        depends="init">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.common.snippets.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.common.snippets.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="jst-servlet-tests"
-        depends="init"
-        description="Runs the org.eclipse.jst.servlet.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.servlet.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.servlet.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="jst-validation-framework-tests"
-        depends="init"
-        description="Runs the org.eclipse.jst.validation.test test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.validation.test}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.validation.test"/>
-        </antcall>
-    </target>
-
-    <!-- JSP TESTS -->
-    <target
-        name="jst-jsp-tests"
-        depends="init"
-        description="Runs test.xml for JSP tests">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.jsp.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.jsp.core.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.jsp.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.jsp.ui.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.jsp.tests.encoding}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.jsp.tests.encoding"/>
-        </antcall>
-    </target>
-
-    <!-- SSE TESTS -->
-    <target
-        name="wst-sse-tests"
-        depends="init"
-        description="Runs test.xml for SSE tests">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.sse.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.sse.core.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.sse.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.sse.ui.tests"/>
-        </antcall>
-    </target>
-
-    <!-- XML TESTS -->
-    <target
-        name="wst-xml-tests"
-        depends="init"
-        description="Runs test.xml for XML tests">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.xml.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.xml.core.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.xml.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.xml.ui.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.xml.tests.encoding}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.xml.tests.encoding"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.xml.validation.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.xml.validation.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.xml.catalog.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.xml.catalog.tests"/>
-        </antcall>
-    </target>
-
-    <!-- WSDL TESTS -->
-    <target
-        name="wst-wsdl-tests"
-        depends="init"
-        description="Runs test.xml for WSDL ">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.wsdl.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.wsdl.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.wsdl.validation.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.wsdl.validation.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.wsdl.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.wsdl.ui.tests"/>
-        </antcall>
-    </target>
-
-    <!-- WSI TESTS -->
-    <target
-        name="wst-wsi-tests"
-        depends="init"
-        description="Runs test.xml for WSI tests">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.wsi.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.wsi.tests"/>
-        </antcall>
-    </target>
-
-    <!-- XSD TESTS -->
-    <target
-        name="wst-xsd-tests"
-        depends="init"
-        description="Runs test.xml for XSD tests ">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.xsd.validation.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.xsd.validation.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.xsd.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.xsd.core.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.xsd.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.xsd.ui.tests"/>
-        </antcall>
-    </target>
-
-    <!-- HTML TESTS -->
-    <target
-        name="wst-html-tests"
-        depends="init"
-        description="Runs test.xml for HTML tests">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.html.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.html.core.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.html.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.html.ui.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.html.tests.encoding}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.html.tests.encoding"/>
-        </antcall>
-    </target>
-
-    <!-- DTD Tests -->
-    <target
-        name="wst-dtd-tests"
-        depends="init">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.dtd.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.dtd.ui.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.dtd.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.dtd.core.tests"/>
-        </antcall>
-    </target>
-
-    <!-- CSS TESTS -->
-    <target
-        name="wst-css-tests"
-        depends="init"
-        description="Runs test.xml for
-                                                                                                org.eclipse.wst.css.core.tests
-                                                                                                org.eclipse.wst.css.ui.tests
-                                                                                                org.eclipse.wst.css.tests.encoding">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.css.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.css.core.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.css.tests.encoding}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.css.tests.encoding"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.css.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.css.ui.tests"/>
-        </antcall>
-    </target>
-
-    <!-- JSF TESTS -->
-    <target
-        name="jsf-tests"
-        depends="init"
-        description="Runs test.xml for org.eclipse.jst.jsf.core.tests, org.eclipse.jst.jsf.ui.tests">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.jsf.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.jsf.core.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.jsf.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.jsf.ui.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.jsf.metadata.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.jsf.metadata.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.jsf.contentassist.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.jsf.contentassist.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.jsf.context.symbol.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.jsf.context.symbol.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.jsf.designtime.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.jsf.designtime.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.jsf.facesconfig.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.jsf.facesconfig.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.jsf.facesconfig.ui.test}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.jsf.facesconfig.ui.test"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.jsf.validation.el.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.jsf.validation.el.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.pagedesigner.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.pagedesigner.tests"/>
-        </antcall>
-    </target>
-
-    <!-- WS TESTS -->
-    <target
-        name="wst-ws-tests"
-        depends="init"
-        description="Runs the org.eclipse.wst.ws.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.ws.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.ws.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="jst-ws-tests"
-        depends="init"
-        description="Runs the org.eclipse.jst.ws.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.ws.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.ws.tests"/>
-        </antcall>
-    </target>
-
-    <!-- Faceted Project Framework Tests -->
-    <target
-        name="wst-facets-tests"
-        depends="init"
-        description="Runs the Faceted Project Framework tests.">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.common.project.facet.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.common.project.facet.core.tests"/>
-        </antcall>
-    </target>
-
-    <!-- Dali tests -->
-    <target
-        name="jpt-utility-tests"
-        depends="init"
-        description="Runs the org.eclipse.jpt.utility.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jpt.utility.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jpt.utility.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="dali-core-tests"
-        depends="init"
-        description="Runs the org.eclipse.jpt.core.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jpt.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jpt.core.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="jpt-eclipselink-core-tests"
-        depends="init"
-        description="Runs the org.eclipse.jpt.eclipselink.core.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jpt.eclipselink.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jpt.eclipselink.core.tests"/>
-        </antcall>
-    </target>
-
-    <!-- JSDT tests -->
-    <target
-        name="jsdt-tests"
-        depends="init"
-        description="Runs the org.eclipse.wst.jsdt.core.test.* test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.jsdt.core.tests.compiler}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.jsdt.core.tests.compiler"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.jsdt.core.tests.model}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.jsdt.core.tests.model"/>
-        </antcall>
-    </target>
-    <target
-        name="xsl-tests"
-        depends="init">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.xsl.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.xsl.tests"/>
-        </antcall>
-    </target>
-
-    <!-- releng Tests -->
-    <target
-        name="releng-tests"
-        depends="init"
-        description="Runs the releng tests.">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wtp.releng.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wtp.releng.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="all"
-        depends="init">
-        <echo
-            level="info"
-            message="Starting Dali Unit Tests"/>
-    	<!--
-        <echo
-            level="info"
-            message="Starting releng tests"/>
-        <antcall
-            target="releng-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-server-tests"/>
-        <antcall
-            target="wst-server-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-monitor-tests"/>
-        <antcall
-            target="wst-monitor-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-cache-tests"/>
-        <antcall
-            target="wst-cache-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-common-tests"/>
-        <antcall
-            target="wst-common-tests"/>
-        <echo
-            level="info"
-            message="Starting validation-framework-tests"/>
-        <antcall
-            target="validation-framework-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-common-snippets-tests"/>
-        <antcall
-            target="wst-common-snippets-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-sse-tests"/>
-        <antcall
-            target="wst-sse-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-xml-tests"/>
-        <antcall
-            target="wst-xml-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-wsdl-tests"/>
-        <antcall
-            target="wst-wsdl-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-wsi-tests"/>
-        <antcall
-            target="wst-wsi-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-xsd-tests"/>
-        <antcall
-            target="wst-xsd-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-html-tests"/>
-        <antcall
-            target="wst-html-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-dtd-tests"/>
-        <antcall
-            target="wst-dtd-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-css-tests"/>
-        <antcall
-            target="wst-css-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-ws-tests"/>
-        <antcall
-            target="wst-ws-tests"/>
-        <echo
-            level="info"
-            message="Starting jst-server-tests"/>
-        <antcall
-            target="jst-server-tests"/>
-        <echo
-            level="info"
-            message="Starting jst-server-tomcat-tests"/>
-        <antcall
-            target="jst-server-tomcat-tests"/>
-        <echo
-            level="info"
-            message="Starting jst-server-geronimo-tests"/>
-        <antcall
-            target="jst-server-geronimo-tests"/>
-        <echo
-            level="info"
-            message="Starting jst-server-generic-tests"/>
-        <antcall
-            target="jst-server-generic-tests"/>
-        <echo
-            level="info"
-            message="Starting jst-jem-tests"/>
-        <antcall
-            target="jst-jem-tests"/>
-        <echo
-            level="info"
-            message="Starting jst-j2ee-core-tests"/>
-        <antcall
-            target="jst-j2ee-core-tests"/>
-        <echo
-            level="info"
-            message="Starting jst-j2ee-tests"/>
-        <antcall
-            target="jst-j2ee-tests"/>
-        <echo
-            level="info"
-            message="Starting jst-validation-framework-tests"/>
-        <antcall
-            target="jst-validation-framework-tests"/>
-        <echo
-            level="info"
-            message="Starting jst-jsp-tests"/>
-        <antcall
-            target="jst-jsp-tests"/>
-        <echo
-            level="info"
-            message="Starting jst-ws-tests"/>
-        <antcall
-            target="jst-ws-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-facets-tests"/>
-        <antcall
-            target="wst-facets-tests"/>
-            -->
-        <echo
-            level="info"
-            message="Starting JPT Unit Tests"/>
-        <echo
-            level="info"
-            message="Starting jpt-utility-tests"/>
-        <antcall
-            target="jpt-utility-tests"/>
-        <echo
-            level="info"
-            message="Starting dali-core-tests"/>
-        <antcall
-            target="dali-core-tests"/>
-        <echo
-            level="info"
-            message="Starting jpt-eclipselink-core-tests"/>
-        <antcall
-            target="jpt-eclipselink-core-tests"/>
-        <echo
-            level="info"
-            message="Ended JPT Unit Tests"/>
-    	<!--
-        <echo
-            level="info"
-            message="Starting JSF Tests"/>
-        <antcall
-            target="jsf-tests"/>
-        <echo
-            level="info"
-            message="Starting JSDT Tests"/>
-        <antcall
-            target="jsdt-tests"/>
-        <echo
-            level="info"
-            message="Starting XSL Tests"/>
-        <antcall
-            target="xsl-tests"/>
-            -->
-    </target>
-    <target
-        name="genHtml"
-        description="Generates HTML results with provided JUNIT.XSL provided"
-        unless="genHtml.disable">
-        <xslt
-            style="JUNIT.XSL"
-            basedir="${results}/xml"
-            destdir="${results}/html"/>
-    </target>
-    <target
-        name="computePluginVersion"
-        depends="test2properties"
-        unless="test2propertiesexists">
-        <java
-            classname="org.eclipse.wtp.releng.test.ComputePluginVersion">
-            <classpath>
-                <pathelement
-                    location="ComputePluginVersion.jar"/>
-            </classpath>
-            <arg
-                value="${eclipse-home}/plugins"/>
-            <arg
-                value="${testRoot}/test2.properties"/>
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-        </java>
-    </target>
-    <target
-        name="test2properties">
-        <condition
-            property="test2propertiesexists">
-            <available
-                file="${testRoot}/test2.properties"/>
-        </condition>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/dali.tests/testScripts/testServer.properties b/releng.wtpbuilder/distribution/dali.tests/testScripts/testServer.properties
deleted file mode 100644
index be77c9b..0000000
--- a/releng.wtpbuilder/distribution/dali.tests/testScripts/testServer.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-
-# Tomcat dirs
-tomcat50Dir=jakarta-tomcat-5.0.28
-
-# Jonas dirs
-#jonas432Dir=
-jonas432DirName=JONAS_4_3_2
-
-# SWT
-#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
-
-# JSF Runtime Library directory
-jsf1.1Dir=myfaces-core-1.1.5/lib
-
-# JPT Persistence Runtime Library path
-jpt-persistence-jar=jpt/jpt-persistence-2.0-preview/lib/javax.persistence_2.0_preview.jar
-jpt-eclipselink-jar=jpt/jpt-eclipselink-2.0.0/lib/eclipselink.jar
-
-jpt-persistence10-jar=jpt/persistence-1.0/lib/persistence.jar
-jpt-eclipselink110-jar=jpt/eclipselink-1.1.0/lib/eclipselink.jar
diff --git a/releng.wtpbuilder/distribution/dali.tests/testdependency.xml b/releng.wtpbuilder/distribution/dali.tests/testdependency.xml
deleted file mode 100644
index d9be5c6..0000000
--- a/releng.wtpbuilder/distribution/dali.tests/testdependency.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-    <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="info"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <available
-        file="${keyCfgFile}"
-        property="keyCfgFile.exists"/>
-    <fail
-        message="${keyCfgFile} Not Found"
-        unless="keyCfgFile.exists"/>
-    <available
-        file="${dependency.properties}"
-        property="dependency.properties.exists"/>
-    <fail
-        message="${dependency.properties} Not Found"
-        unless="dependency.properties.exists"/>
-    <property
-        file="${keyCfgFile}"/>
-    <target
-        name="get">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="dtp"/>
-        </antcall>
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="eclipseTestFramework"/>
-        </antcall>
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="wst"/>
-        </antcall>
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="jst"/>
-        </antcall>
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="jpt-persistence.jar"/>
-        </antcall>
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="jpt-eclipselink.jar"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstallBase">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-    <target
-        name="getAndInstallDropins">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}${dropinsFolder}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/jaxws.build/build.xml b/releng.wtpbuilder/distribution/jaxws.build/build.xml
deleted file mode 100644
index 904876f..0000000
--- a/releng.wtpbuilder/distribution/jaxws.build/build.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<project
-    default="build"
-    basedir=".">
-    <fail
-        unless="wtp.builder.home"/>
-    <property
-        file="${wtp.builder.home}/build.properties"/>
-    <target
-        name="build"
-        depends="getBaseBuilder">
-        <dirname
-            file="${ant.file}"
-            property="distribution.wtp.build.dir"/>
-        <property
-            name="buildTargets"
-            value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
-        <!--
-            for this distribution, dependencies come from project's
-            releng map project
-        -->
-        <property
-            name="dependency.properties"
-            value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-
-        <!-- calling label.xml to createg label.properties file -->
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-        <echo
-            level="info"
-            message="invoking buildTargets: ${buildTargets} to build for each component"/>
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="jaxws"/>
-        </ant>
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="jaxws_sdk"/>
-        </ant>
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="jaxws_tests"/>
-            <property
-                name="eclipseBuildFailOnError"
-                value="false"/>
-        </ant>
-
-        <!-- package -->
-        <antcall
-            target="package"/>
-    </target>
-
-    <!-- invoking runbuild.xml targetting getBaseBuilder -->
-    <target
-        name="getBaseBuilder"
-        if="eclipse.builder.fetch">
-        <dirname
-            file="${ant.file}"
-            property="wtbuilder.dir"/>
-        <property
-            name="buildTargets"
-            value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
-        <echo
-            level="info"
-            message="invoking buildTargets: ${buildTargets} -> getBaseBuilder"/>
-        <ant
-            antfile="${buildTargets}"
-            target="getBaseBuilder"/>
-    </target>
-    <target
-        name="package">
-        <!--
-            post, post packaging, for WTP ... "manually" assemble the
-            desired zips
-        -->
-        <!-- nothing to assemble right now -->
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/jaxws.site/build.xml b/releng.wtpbuilder/distribution/jaxws.site/build.xml
deleted file mode 100644
index 39fc90e..0000000
--- a/releng.wtpbuilder/distribution/jaxws.site/build.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-<project
-    name="Build specific targets and properties"
-    default="build"
-    basedir=".">
-    <!--
-        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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- = = = end standard properties pattern = = = -->
-    <echo
-        message="ant.file: ${ant.file}"/>
-    <target
-        name="build">
-    	<mkdir dir="${buildDirectory}/${buildLabel} "/>
-        <java
-            jar="${eclipse.launcher}"
-            fork="true"
-            failonerror="true">
-            <jvmarg
-                value="-Dosgi.ws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dosgi.os=${env.BASEOS}"/>
-            <jvmarg
-                value="-Dosgi.arch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-Dbuild.donottagmaps=${build.donottagmaps}"/>
-            <jvmarg
-                value="-DbuildBranch=${buildBranch}"/>
-            <jvmarg
-                value="-DbuildType=${buildType}"/>
-            <jvmarg
-                value="-DbuildId=${buildId}"/>
-            <jvmarg
-                value="-DmapVersionTag=${mapVersionTag}"/>
-            <jvmarg
-                value="-Dbuild.distribution=${build.distribution}"/>
-            <jvmarg
-                value="-DbuildDirectory=${buildDirectory}"/>
-            <jvmarg
-                value="-Dwtp.builder.home=${wtp.builder.home}"/>
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <jvmarg
-                value="-Dprojectname=${projectname}"/>
-            <jvmarg
-                value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
-            <jvmarg
-                value="-DurlLogLocation=${buildDirectory}/${buildLabel}/outgoinghttplogfromsitebuild.log"/>
-            <arg
-                value="-data"/>
-            <arg
-                value="${basedir}/workspace"/>
-            <arg
-                value="-application"/>
-            <arg
-                value="org.eclipse.ant.core.antRunner"/>
-            <arg
-                value="-buildfile"/>
-            <arg
-                value="${ant.file}"/>
-            <arg
-                value="publish"/>
-        </java>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Steps to do to publish the build results -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="publish">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-        <property
-            file="${buildDirectory}/label.properties"/>
-        <property
-            name="publish.xml"
-            value="${component.dir}/publish.xml"/>
-        <property
-            name="indexFileName"
-            value="index.php"/>
-        <property
-            name="result"
-            value="${buildDirectory}/${buildLabel}"/>
-        <property
-            name="indexTemplateFilename"
-            value="index.html.template.php"/>
-        <copy
-            file="${wtp.builder.home}/distribution/wtp.site/templateFiles/${indexTemplateFilename}"
-            tofile="${buildDirectory}/${indexFileName}"/>
-        <condition
-            property="isBuildTested"
-            value="true">
-            <available
-                file="${buildDirectory}/${buildLabel}/testResults/html"/>
-        </condition>
-        <ant
-            antfile="${publish.xml}"
-            dir="${component.dir}">
-            <property
-                name="dropTokenList"
-                value="%wtpruntime%,%wtpsdk%,%wtptest%,%wst%,%wst-sdk%,%wst-tests%,%jst-tests%,%wst-perf-tests%,%jst-perf-tests%,%jpt-runtime%,%jpt-sdk%,%jpt-tests%"/>
-            <property
-                name="webtoolsDownloadURL"
-                value="http://www.eclipse.org/downloads/download.php?file=/webtools/committers/drops"/>
-            <property
-                name="buildBranch"
-                value="${buildBranch}"/>
-            <property
-                name="isBuildTested"
-                value="${isBuildTested}"/>
-            <property
-                name="indexTemplateFilename"
-                value="${indexTemplateFilename}"/>
-        </ant>
-
-        <!--  Get the build map over for the results to point to. -->
-        <copy
-            file="${buildDirectory}/directory.txt"
-            tofile="${result}/directory.txt"/>
-
-        <!-- Copy info for build identification -->
-        <copy
-            file="${buildDirectory}/buildmachineinfo.properties"
-            tofile="${result}/buildmachineinfo.properties"/>
-
-        <!-- http access logs -->
-        <copy
-            todir="${result}/"
-            failonerror="false">
-            <fileset
-                dir="${buildDirectory}"
-                includes="*.log"/>
-        </copy>
-
-        <!-- ant build log, from control directory -->
-        <copy
-            todir="${result}/"
-            failonerror="false">
-            <fileset
-                dir="${env.ANT_WORKING}/${projectname}"
-                includes="antBuilderOutput.log"/>
-        </copy>
-
-
-
-        <!-- final count files -->
-        <countBuildFiles
-            sourceDirectory="${buildDirectory}/${buildLabel}"
-            filterString=".zip,.tar.gz"
-            outputFile="${buildDirectory}/${buildLabel}/files.count"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/jaxws.site/compilerXMLOutputToHTML.xsl b/releng.wtpbuilder/distribution/jaxws.site/compilerXMLOutputToHTML.xsl
deleted file mode 100644
index ffc7905..0000000
--- a/releng.wtpbuilder/distribution/jaxws.site/compilerXMLOutputToHTML.xsl
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet
-    version="1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-    <xsl:output
-        method="html"
-        indent="yes"/>
-    <xsl:template
-        match="/">
-        <html>
-            <body>
-                <xsl:apply-templates
-                    select="compiler"/>
-            </body>
-        </html>
-    </xsl:template>
-    <xsl:template
-        match="compiler">
-        <h2>Compiler Report</h2>
-        <p>
-            Compiler:
-            <xsl:value-of
-                select="@name"/>
-            <xsl:text>   </xsl:text>
-            Version:
-            <xsl:value-of
-                select="@version"/>
-        </p>
-        <xsl:apply-templates
-            select="stats"/>
-        <xsl:apply-templates
-            select="sources"/>
-    </xsl:template>
-    <xsl:template
-        name="stats"
-        match="stats">
-        <p>
-            Number of source files:
-            <xsl:value-of
-                select="count(..//source)"/>
-            Number of classfiles:
-            <xsl:value-of
-                select="number_of_classfiles/@value"/>
-        </p>
-        <p>
-            Problems:
-            <xsl:value-of
-                select="problem_summary/@problems"/>
-            (Errors:
-            <xsl:value-of
-                select="problem_summary/@errors"/>
-            Warnings:
-            <xsl:value-of
-                select="problem_summary/@warnings"/>
-            )
-        </p>
-    </xsl:template>
-    <xsl:template
-        name="sources"
-        match="sources">
-        <xsl:if
-            test="count(source) > 0">
-            <dl>
-                <xsl:for-each
-                    select="source">
-                    <xsl:variable
-                        name="package"
-                        select="normalize-space(@package)">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="path"
-                        select="normalize-space(@path)">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="classname"
-                        select="substring-after($path, $package)">
-                    </xsl:variable>
-                    <xsl:if
-                        test="count(problems) > 0">
-                        <dt
-                            style="font-weight: bold; color: black">
-                            Source File:
-                            <xsl:value-of
-                                select="$package"/>
-                            <xsl:value-of
-                                select="$classname"/>
-                        </dt>
-                        <xsl:apply-templates
-                            select="problems">
-                            <xsl:with-param
-                                name="classname">
-                                <xsl:value-of
-                                    select="$classname"/>
-                            </xsl:with-param>
-                        </xsl:apply-templates>
-                    </xsl:if>
-                </xsl:for-each>
-            </dl>
-        </xsl:if>
-    </xsl:template>
-    <xsl:template
-        match="problems">
-        <xsl:param
-            name="classname"/>
-        <xsl:for-each
-            select="problem">
-            <dd
-                style="font-weight: normal; color: black">
-                <xsl:value-of
-                    select="position()"/>
-                <xsl:text>.  </xsl:text>
-                <xsl:value-of
-                    select="@severity"/>
-                <xsl:text>:  </xsl:text>
-                <xsl:value-of
-                    select="@id"/>
-                <xsl:variable
-                    name="lineNumber"
-                    select="@line">
-                </xsl:variable>
-                <xsl:for-each
-                    select="message">
-                    <p
-                        style="margin-left: +.5in; font-size: -1; margin-top: 0;margin-bottom:0;">
-                        <small>
-                            <xsl:value-of
-                                select="@value"/>
-                        </small>
-                    </p>
-                </xsl:for-each>
-                <xsl:for-each
-                    select="source_context">
-                    <xsl:variable
-                        name="pre"
-                        select="substring(@value,0,(@sourceStart + 1))">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="main"
-                        select="substring(@value,(@sourceStart + 1),(((@sourceEnd + 1) - (@sourceStart + 1)) + 1))">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="end"
-                        select="substring(@value,(@sourceEnd + 2))">
-                    </xsl:variable>
-                    <p
-                        style="margin-left: +.5in; font-size: -2; margin-top: 0;margin-bottom:0;">
-                        <xsl:value-of
-                            select="substring($classname,2)"/>
-                        :
-                    </p>
-                    <p
-                        style="margin-left: +.5in; font-size: -2;font-family: monospace; margin-top: 0;margin-bottom:0;">
-                        <xsl:value-of
-                            select="$lineNumber"/>
-                        :
-                        <xsl:value-of
-                            select="$pre"/>
-                        <b>
-                            <u>
-                                <xsl:value-of
-                                    select="$main"/>
-                            </u>
-                        </b>
-                        <xsl:value-of
-                            select="$end"/>
-                    </p>
-                </xsl:for-each>
-            </dd>
-        </xsl:for-each>
-    </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/jaxws.site/publish.xml b/releng.wtpbuilder/distribution/jaxws.site/publish.xml
deleted file mode 100644
index 71afb65..0000000
--- a/releng.wtpbuilder/distribution/jaxws.site/publish.xml
+++ /dev/null
@@ -1,821 +0,0 @@
-<project
-    name="Publish Build"
-    default="default"
-    basedir=".">
-    <!--
-        Properties that must be passed to this script: buildDirectory:
-        Path to perform the build in. (A working directory) buildType:
-        Type of build (nightly, integration etc.) buildId: Build name
-        buildLabel: <buildType>-<buildName>-<timestamp>
-    -->
-    <property
-        environment="env"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be provided to publish"/>
-    <fail
-        unless="buildLabel"
-        message="buildLabel must be provided to publish"/>
-    <fail
-        unless="wtp.builder.home"
-        message="wtp.builder.home must be provided to publish"/>
-    <fail
-        unless="build.distribution"
-        message="build.distribution must be provided to publish"/>
-    <property
-        name="resultDir"
-        value="${buildDirectory}/${buildLabel}"/>
-    <!--name of generated index page-->
-    <property
-        name="indexFileName"
-        value="index.php"/>
-    <property
-        name="templateDir"
-        value="${wtp.builder.home}/distribution/${build.distribution}.site"/>
-    <property
-        name="resultingIndex"
-        value="${resultDir}/${indexFileName}"/>
-    <echo
-        level="debug"
-        message="resultDir: ${resultDir}"/>
-    <echo
-        level="debug"
-        message="templateDir: ${templateDir}"/>
-    <echo
-        level="debug"
-        message="resultingIndex: ${resultingIndex}"/>
-    <target
-        name="default">
-        <copy
-            overwrite="true"
-            file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/${indexTemplateFilename}"
-            tofile="${resultingIndex}"/>
-        <antcall
-            target="countFiles"/>
-        <antcall
-            target="generateCompileIndex"/>
-        <antcall
-            target="generateJUnitTestsIndex"/>
-        <antcall
-            target="getStaticFiles"/>
-    </target>
-    <target
-        name="generateCompileIndex">
-        <!--
-            <taskdef name="indexResults"
-            classname="org.eclipse.wtp.releng.tools.ResultsSummaryGenerator"
-            />
-        -->
-        <!--
-            isBuildTested: true|false should JUnit plugin test results
-            be used to generate index page dropTokenList: comma
-            separated list of strings which should be replaced by the
-            fileName attribute settings in the testManifest.xml.
-            xmlDirectoryName: path to directory containing JUnit plugin
-            test results in xml format (see doc is org.eclipse.test).
-            dropDirectoryName: path to directory containing the result
-            of the build. testResultsTemplateFileName: path to template
-            file used to generate page with links to JUnit test results
-            testResultsHtmlFileName: name of file which will be
-            generated with links to JUnit test results dropHtmlFileName:
-            name of generated index page hrefTestResultsTargetPath:
-            relative path from index page to directory containing JUnit
-            html test results hrefCompileLogsTargetPath: relative path
-            from index page directory containing compilelogs
-            testManifestFileName: name of xml file containing
-            descriptions of zip types and log files
-        -->
-        <property
-            file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-
-        <!-- create tables of test plugin compiles first -->
-        <antcall
-            target="generateTestCompileOutput">
-            <param
-                name="outputDirectory"
-                value="${resultDir}/testcompilelogs"/>
-        </antcall>
-
-        <!-- create table of code plugins compiles -->
-        <antcall
-            target="generateCompileOutput">
-            <param
-                name="outputDirectory"
-                value="${resultDir}/compilelogs"/>
-        </antcall>
-        <tstamp>
-            <format
-                property="TODAY"
-                pattern="MMMM d, yyyy"/>
-        </tstamp>
-
-        <!--  Insert Build Type descriptor  -->
-        <antcall
-            target="${buildType}"/>
-        <antcall
-            target="writeData"/>
-        <!--
-            Update timestamp on file to permit overwrite through Ant
-            copy task
-        -->
-        <touch
-            file="${resultingIndex}"/>
-    </target>
-    <target
-        name="generateTestCompileOutput"
-        depends="checkIfCompileLogs"
-        if="doCompileLogs">
-        <summarizeResults
-            isBuildTested="false"
-            includeAll="true"
-            dropTokenList="${dropTokenList}"
-            xmlDirectoryName=""
-            dropDirectoryName="${resultDir}"
-            testResultsTemplateFileName="${templateDir}/templateFiles/testCompileResults.php.template"
-            testResultsHtmlFileName="testCompileResults.php"
-            hrefTestResultsTargetPath=""
-            hrefCompileLogsTargetPath="testcompilelogs"
-            compileLogsDirectoryName="${outputDirectory}"/>
-        <antcall
-            target="compilerXMLToHTML"/>
-    </target>
-    <target
-        name="generateCompileOutput"
-        depends="checkIfCompileLogs"
-        if="doCompileLogs">
-        <summarizeResults
-            isBuildTested="false"
-            includeAll="true"
-            dropTokenList="${dropTokenList}"
-            xmlDirectoryName=""
-            dropDirectoryName="${resultDir}"
-            testResultsTemplateFileName="${templateDir}/templateFiles/compileResults.php.template"
-            testResultsHtmlFileName="compileResults.php"
-            hrefTestResultsTargetPath="testResults/html"
-            hrefCompileLogsTargetPath="compilelogs"
-            compileLogsDirectoryName="${outputDirectory}"/>
-        <antcall
-            target="compilerXMLToHTML"/>
-    </target>
-    <target
-        name="compilerXMLToHTML">
-        <xslt
-            basedir="${outputDirectory}"
-            destdir="${outputDirectory}"
-            includes="**/*.xml"
-            scanincludeddirectories="true"
-            style="compilerXMLOutputToHTML.xsl"
-            force="true"/>
-    </target>
-    <target
-        name="generateJUnitTestsIndex"
-        depends="checkIfTested"
-        if="doTests">
-        <!--
-            isBuildTested: true|false should JUnit plugin test results
-            be used to generate index page dropTokenList: comma
-            separated list of strings which should be replaced by the
-            fileName attribute settings in the testManifest.xml.
-            xmlDirectoryName: path to directory containing JUnit plugin
-            test results in xml format (see doc is org.eclipse.test).
-            dropDirectoryName: path to directory containing the result
-            of the build. testResultsTemplateFileName: path to template
-            file used to generate page with links to JUnit test results
-            testResultsHtmlFileName: name of file which will be
-            generated with links to JUnit test results dropHtmlFileName:
-            name of generated index page hrefTestResultsTargetPath:
-            relative path from index page to directory containing JUnit
-            html test results hrefCompileLogsTargetPath: relative path
-            from index page directory containing compilelogs
-            testManifestFileName: name of xml file containing
-            descriptions of zip types and log files
-        -->
-        <property
-            file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-
-        <!-- create table of test plugin compiles first -->
-        <!-- set isBuildTested to true for the "compile only" results -->
-        <summarizeResults
-            isBuildTested="true"
-            dropTokenList="${dropTokenList}"
-            dropDirectoryName="${resultDir}"
-            xmlDirectoryName="${resultDir}/testResults/xml"
-            testResultsTemplateFileName="${templateDir}/templateFiles/testResults.php.template"
-            testResultsHtmlFileName="testResults.php"
-            hrefTestResultsTargetPath="testResults/html"
-            compileLogsDirectoryName=""/>
-        <tstamp>
-            <format
-                property="TODAY"
-                pattern="MMMM d, yyyy"/>
-        </tstamp>
-
-        <!--  Insert Build Type descriptor  -->
-        <antcall
-            target="${buildType}"/>
-        <antcall
-            target="writeData"/>
-        <!--
-            Update timestamp on file to permit overwrite through Ant
-            copy task
-        -->
-        <touch
-            file="${resultingIndex}"/>
-    </target>
-    <target
-        name="getStaticFiles">
-        <!--get static files required in the buildLabel directory-->
-        <copy
-            todir="${resultDir}">
-            <fileset
-                dir="${templateDir}/staticDropFiles"/>
-        </copy>
-
-        <!--copy buildnotes from plugin directories-->
-        <mkdir
-            dir="${resultDir}/buildnotes"/>
-        <copy
-            todir="${resultDir}/buildnotes"
-            flatten="true">
-            <fileset
-                dir="${buildDirectory}/plugins"
-                includes="**/buildnotes_*.html"/>
-            <fileset
-                dir="${buildDirectory}/features"
-                includes="**/buildnotes_*.html"/>
-        </copy>
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/full/logIndex.php"/>
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/testLogs/logIndex.php"/>
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/testSysErrorLogs/logIndex.php"/>
-    </target>
-    <target
-        name="updateSite">
-
-
-        <!-- get our authored, tokenized site.xml file -->
-        <copy
-            file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/siteWTP.xml"
-            tofile="${buildDirectory}/${buildLabel}/updateSite/site.xml"
-            overwrite="true"
-            failonerror="true"/>
-        <!--
-            get the ${buildDirectory}/finalPluginsVersions.properties,
-            and read as properties
-        -->
-        <!-- substitute property value for tokens -->
-        <replace
-            file="${buildDirectory}/${buildLabel}/updateSite/site.xml"
-            propertyfile="${buildDirectory}/finalFeaturesVersions.properties">
-            <replacefilter
-                token="@org.eclipse.wtp@"
-                property="org.eclipse.wtp"/>
-            <replacefilter
-                token="@org.eclipse.wtp.sdk@"
-                property="org.eclipse.wtp.sdk"/>
-            <replacefilter
-                token="@org.eclipse.jst@"
-                property="org.eclipse.jst"/>
-            <replacefilter
-                token="@org.eclipse.jst.sdk@"
-                property="org.eclipse.jst.sdk"/>
-            <replacefilter
-                token="@org.eclipse.jpt.feature@"
-                property="org.eclipse.jpt.feature"/>
-            <replacefilter
-                token="@org.eclipse.jpt_sdk.feature@"
-                property="org.eclipse.jpt_sdk.feature"/>
-        </replace>
-    </target>
-    <target
-        name="countFiles">
-        <!--
-            files.count is a file that should exist in the drop
-            directory with a count of the zip files in the same
-            directory. It is required to generate a link to the build on
-            the downloads page.
-        -->
-        <countBuildFiles
-            sourceDirectory="${resultDir}"
-            filterString=".zip,.tar.gz"
-            outputFile="${resultDir}/files.count"/>
-    </target>
-
-    <!--Build type descriptors-->
-    <target
-        name="I">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Integration"/>
-    </target>
-    <target
-        name="S">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Stable"/>
-    </target>
-    <target
-        name="N">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Nightly"/>
-    </target>
-    <target
-        name="M">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Maintenance"/>
-    </target>
-    <target
-        name="R">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Release"/>
-    </target>
-    <target
-        name="T">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Test"/>
-    </target>
-    <target
-        name="P">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Patches"/>
-    </target>
-    <target
-        name="checkIfTested">
-        <echo
-            level="debug"
-            message="isBuildTested: ${isBuildTested}"/>
-        <condition
-            property="doTests">
-            <equals
-                arg1="${isBuildTested}"
-                arg2="true"
-                trim="true"
-                casesensitive="false"/>
-        </condition>
-    </target>
-    <target
-        name="checkIfCompileLogs">
-        <condition
-            property="doCompileLogs">
-            <available
-                file="${outputDirectory}"/>
-        </condition>
-    </target>
-    <target
-        name="writeData">
-        <!--  Insert Build Date  -->
-        <replace
-            file="${resultingIndex}"
-            token="@date@"
-            value="${TODAY}"/>
-
-        <!--  Insert Build Name  -->
-        <replace
-            file="${resultingIndex}"
-            token="@build@"
-            value="${buildLabel}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@buildBranch@"
-            value="${buildBranch}"/>
-
-        <!--  Insert PreRequsites  -->
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformFile@"
-            value="${eclipseplatform.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformURL@"
-            value="${eclipseplatform.url}/${eclipseplatform.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformBuildURL@"
-            value="${eclipseplatform.url}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformfilelinux@"
-            value="${eclipseplatform.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformfilewindows@"
-            value="${eclipseplatform.file.win32-win32-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformfilemacos@"
-            value="${eclipseplatform.file.macosx-carbon-ppc}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformBuildHome@"
-            value="${eclipseplatform.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatform.mirror.prefixuri@"
-            value="${eclipseplatform.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatform.fspath.prefix@"
-            value="${eclipseplatform.fspath.prefix}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseFile@"
-            value="${eclipse.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseURL@"
-            value="${eclipse.url}/${eclipse.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseBuildURL@"
-            value="${eclipse.url}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilelinux@"
-            value="${eclipse.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilewindows@"
-            value="${eclipse.file.win32-win32-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilemacos@"
-            value="${eclipse.file.macosx-carbon-ppc}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseBuildHome@"
-            value="${eclipse.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipse.mirror.prefixuri@"
-            value="${eclipse.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipse.fspath.prefix@"
-            value="${eclipse.fspath.prefix}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@testURL@"
-            value="${eclipseTestFramework.url}/${eclipseTestFramework.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@testFile@"
-            value="${eclipseTestFramework.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfName@"
-            value="${emf.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfDescription@"
-            value="${emf.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfFile@"
-            value="${emf.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfURL@"
-            value="${emf.url}/${emf.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfBuildHome@"
-            value="${emf.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emf.mirror.prefixuri@"
-            value="${emf.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsourceURL@"
-            value="${emfsourcedoc.url}/${emfsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsourceFile@"
-            value="${emfsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsourceName@"
-            value="${emfsourcedoc.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsourceDescription@"
-            value="${emfsourcedoc.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsourceBuildHome@"
-            value="${emfsourcedoc.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsource.mirror.prefixuri@"
-            value="${emfsourcedoc.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsourceURL@"
-            value="${emfxsdsourcedoc.url}/${emfsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsourceFile@"
-            value="${emfxsdsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsourceName@"
-            value="${emfxsdsourcedoc.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsourceDescription@"
-            value="${emfxsdsourcedoc.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsourceBuildHome@"
-            value="${emfxsdsourcedoc.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsource.mirror.prefixuri@"
-            value="${emfxsdsourcedoc.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdFile@"
-            value="${emfxsd.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdName@"
-            value="${emfxsd.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdDescription@"
-            value="${emfxsd.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdURL@"
-            value="${emfxsd.url}/${emfxsd.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdBuildHome@"
-            value="${emfxsd.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsd.mirror.prefixuri@"
-            value="${emfxsd.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationFile@"
-            value="${emfvalidation.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationURL@"
-            value="${emfvalidation.url}/${emfvalidation.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationBuildHome@"
-            value="${emfvalidation.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidation.mirror.prefixuri@"
-            value="${emfvalidation.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationName@"
-            value="${emfvalidation.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationDescription@"
-            value="${emfvalidation.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsourceFile@"
-            value="${emfvalidationsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsourceURL@"
-            value="${emfvalidationsourcedoc.url}/${emfvalidationsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsourceBuildHome@"
-            value="${emfvalidationsourcedoc.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsource.mirror.prefixuri@"
-            value="${emfvalidationsourcedoc.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsourceName@"
-            value="${emfvalidationsourcedoc.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsourceDescription@"
-            value="${emfvalidationsourcedoc.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstName@"
-            value="${wst.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstDescription@"
-            value="${wst.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstFile@"
-            value="${wst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstURL@"
-            value="${wst.url}/${wst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstBuildHome@"
-            value="${wst.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wst.mirror.prefixuri@"
-            value="${wst.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstName@"
-            value="${jst.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstDescription@"
-            value="${jst.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstFile@"
-            value="${jst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstURL@"
-            value="${jst.url}/${jst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstBuildHome@"
-            value="${jst.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jst.mirror.prefixuri@"
-            value="${jst.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpName@"
-            value="${wtp.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpDescription@"
-            value="${wtp.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpFile@"
-            value="${wtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpURL@"
-            value="${wtp.url}/${wtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpBuildHome@"
-            value="${wtp.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtp.mirror.prefixuri@"
-            value="${wtp.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefFile@"
-            value="${gef.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefURL@"
-            value="${gef.url}/${gef.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefBuildHome@"
-            value="${gef.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gef.mirror.prefixuri@"
-            value="${gef.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefName@"
-            value="${gef.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefDescription@"
-            value="${gef.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipserelengFile@"
-            value="${eclipsereleng.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipserelengURL@"
-            value="${eclipsereleng.url}/${eclipsereleng.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipFile@"
-            value="${orbitthirdpartyzip.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipURL@"
-            value="${orbitthirdpartyzip.url}/${orbitthirdpartyzip.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipBuildHome@"
-            value="${orbitthirdpartyzip.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzip.mirror.prefixuri@"
-            value="${orbitthirdpartyzip.mirror.prefixuri}"/>
-
-
-        <!-- no longer used. Post 1.5.5 -->
-        <replace
-            file="${resultingIndex}"
-            token="@jemFile@"
-            value="${jem.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jemURL@"
-            value="${jem.url}/${jem.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jemBuildHome@"
-            value="${jem.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jem.mirror.prefixuri@"
-            value="${jem.mirror.prefixuri}"/>
-        <!--
-            these token/s should not exist in maintenance stream, but do
-            no harm done, so in the interests of keeping builder streams
-            in sync, we'll leave them here as place hold
-        -->
-        <replace
-            file="${resultingIndex}"
-            token="@dtpFile@"
-            value="${dtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtpURL@"
-            value="${dtp.url}/${dtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtpBuildHome@"
-            value="${dtp.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtp.mirror.prefixuri@"
-            value="${dtp.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtpName@"
-            value="${dtp.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtpDescription@"
-            value="${dtp.description}"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/access_err.gif b/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/access_err.gif
deleted file mode 100644
index 4f0748a..0000000
--- a/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/access_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/access_warn.gif b/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/access_warn.gif
deleted file mode 100644
index 8386e3e..0000000
--- a/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/access_warn.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/buildNotes.php b/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/buildNotes.php
deleted file mode 100644
index f666887..0000000
--- a/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/buildNotes.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<html>
-<head>
-<?php
-$parts = explode("/", getcwd());
-$parts2 = explode("-", $parts[count($parts) - 1]);
-$buildName = $parts2[1];
-
-echo "<title>Build Notes for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Build Notes</font></b></p>
-
-<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"> Build Notes for <?php echo "$buildName"; ?></font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$hasNotes = false;
-$aDirectory = dir("buildnotes");
-while ($anEntry = $aDirectory->read()) {
-	if ($anEntry != "." && $anEntry != "..") {
-		//print_r($anEntry);
-		//echo "<br />";
-
-		$subject = $anEntry;
-		$pattern = '/^buildnotes_(.*)/i';
-		preg_match($pattern, $subject, $matches);
-		$subject = $matches[1];
-		//print_r($subject);
-		//echo "<br />";
-		$pattern = '/^(.*)\.html$/';
-		preg_match($pattern, $subject, $matches);
-		//print_r($matches);
-		//echo "<br />";
-
-		$component = $matches[1];
-
-		$line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
-		echo "<tr>";
-		echo "$line";
-		echo "</tr>";
-		$hasNotes = true;
-
-	}
-}
-$aDirectory.closedir();
-if (!$hasNotes) {
-	echo "<br>There are no build notes for this build.";
-}
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/compile_err.gif b/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/compile_err.gif
deleted file mode 100644
index c2bfdd6..0000000
--- a/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/compile_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/compile_warn.gif b/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/compile_warn.gif
deleted file mode 100644
index cf4fdf9..0000000
--- a/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/compile_warn.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/consoleLogs.php b/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/consoleLogs.php
deleted file mode 100644
index 2ee3c36..0000000
--- a/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/consoleLogs.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<html>
-<head>
-<?php
-$parts = explode("/", getcwd());
-$parts2 = explode("-", $parts[count($parts) - 1]);
-$buildName = $parts2[1];
-
-echo "<title>Test Console Output for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-<title>Console Logs from Running JUnit Plug-in Tests</title>
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b></p>
-
-<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">Console output from running
-		JUnit plugin tests for <?php echo "$buildName"; ?> </font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$rootDir = "testResults/consolelogs";
-$hasNotes = false;
-$aDirectory = dir($rootDir);
-$index = 0;
-$dirindex = 0;
-while ($anEntry = $aDirectory->read()) {
-	if ($anEntry != "." && $anEntry != "..") {
-		if (is_file("$rootDir/$anEntry")) {
-			$entries[$index] = $anEntry;
-			$index++;
-		} else if (is_dir("$rootDir/$anEntry")) {
-			$direntries[$dirindex] = $anEntry;
-			$dirindex++;
-		}
-	}
-}
-$aDirectory->close();
-
-
-sort($entries);
-sort($direntries);
-
-for ($i = 0; $i < $dirindex; $i++) {
-	$anEntry = $direntries[$i];
-	$line = "<td><a href=\"testResults/consolelogs/$anEntry/logIndex.php\">$anEntry</a></td>";
-	echo "<tr>";
-	echo "$line";
-	echo "</tr>";
-}
-for ($i = 0; $i < $index; $i++) {
-	$anEntry = $entries[$i];
-	$logsize = filesize("testResults/consolelogs/$anEntry");
-
-
-	$level = 0;
-	if ($logsize > 20000) {
-		$level = 2;
-	}
-	else if ($logsize > 2000) {
-		$level = 1;
-	}
-
-	if ($level == 0) {
-		$line = "<td><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-	}
-	else if ($level == 1) {
-		$line = "<td><em><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-	} else if ($level == 2) {
-		$line = "<td><strong><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-	}
-
-
-	echo "<tr>";
-	echo "$line";
-	echo "</tr>";
-	$hasNotes = true;
-}
-
-if (!$hasNotes) {
-	echo "<br>There are no test logs for this build.";
-}
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/junit_err.gif b/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/junit_err.gif
deleted file mode 100644
index 1b7ff9d..0000000
--- a/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/junit_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/logIndex.php b/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/logIndex.php
deleted file mode 100644
index 721ca00..0000000
--- a/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/logIndex.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<html>
-<head>
-<?php
-
-function endsWith( $str, $sub ) {
-
-	return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub );
-}
-
-$parts = explode("/", getcwd());
-$parts2 = explode("-", $parts[count($parts) - 1]);
-$buildName = $parts2[1];
-
-echo "<title>Test Console Output for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-<title>Console Logs from Running JUnit Plug-in Tests</title>
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b></p>
-
-<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">Console output from running
-		JUnit plugin tests for <?php echo "$buildName"; ?> </font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$hasNotes = false;
-$aDirectory = dir(".");
-$index = 0;
-while ($anEntry = $aDirectory->read()) {
-	if ($anEntry != "." && $anEntry != ".." && !endsWith(__FILE__, $anEntry)) {
-		$entries[$index] = $anEntry;
-		$index++;
-	}
-}
-aDirectory.closedir();
-
-
-sort($entries);
-
-for ($i = 0; $i < $index; $i++) {
-	$anEntry = $entries[$i];
-	$logsize = filesize("$anEntry");
-
-
-	$level = 0;
-	if ($logsize > 20000) {
-		$level = 2;
-	}
-	else if ($logsize > 2000) {
-		$level = 1;
-	}
-
-	if ($level == 0) {
-		$line = "<td><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-	}
-	else if ($level == 1) {
-		$line = "<td><em><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-	} else if ($level == 2) {
-		$line = "<td><strong><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-	}
-
-
-	echo "<tr>";
-	echo "$line";
-	echo "</tr>";
-	$hasNotes = true;
-}
-
-if (!$hasNotes) {
-	echo "<br>There are no test logs for this build.";
-}
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/miscUtil.php b/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/miscUtil.php
deleted file mode 100644
index 5001f38..0000000
--- a/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/miscUtil.php
+++ /dev/null
@@ -1,219 +0,0 @@
-<?php
-
-// todo: unsure if can handle filenames that are URLs?
-// handy constant to compute file size in megabytes
-
-function fileSizeInMegs($filename) {
-	$onemeg=1024*1024;
-	$zipfilesize=filesize($filename);
-	$zipfilesize=round($zipfilesize/$onemeg, 0);
-	return $zipfilesize;
-}
-
-function fileSizeForDisplay($filename) {
-	$onekilo=1024;
-	$onemeg=$onekilo * $onekilo;
-	$criteria = 10 * $onemeg;
-	$scaleChar = "M";
-	if (file_exists($filename)) {
-		$zipfilesize=filesize($filename);
-		if ($zipfilesize > $criteria) {
-			$zipfilesize=round($zipfilesize/$onemeg, 0);
-			$scaleChar = "M";
-		}
-		else {
-			$zipfilesize=round($zipfilesize/$onekilo, 0);
-			$scaleChar = "K";
-		}
-	}
-	else {
-		$zipfilesize = 0;
-	}
-	$result =  "(" . $zipfilesize . $scaleChar . ")";
-	return $result;
-}
-
-
-function displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription) {
-	echo "<td align=\"right\" valign=\"top\" width=\"30%\">";
-	echo "<a href=\"$downloadprefix$filename\">" . $fileShortDescription . "</a>";
-	echo "</td><td align=\"right\" valign=\"top\" width=\"3%\">";
-	echo $zipfilesize;
-	echo "</td>";
-	echo "<td align=\"right\" valign=\"top\" width=\"2%\">";
-	echo "[<a href=\"checksum/$filename.md5\">md5</a>]";
-	echo "</td>";
-}
-
-function resourceExist($url, $mirrorPrefixuri, $prereqfilename, $eclipseFSpathPrefix)
-{
-	$result = false;
-
-	$allowURLopen = ini_get('allow_url_fopen');
-
-	if ($allowURLopen && stream_last_modified($url)) {
-		$result = true;
-	}
-	else {
-		// TODO: for now, we'll do a raw check on the whole file name, since enable_url_open
-		// is off. better would be to check if we are on build.eclipse.org or download.eclipse.org?
-		$wholePath = trim($eclipseFSpathPrefix) . "/" . trim($mirrorPrefixuri) . "/" . trim($prereqfilename);
-		if (file_exists($wholePath)) {
-			$result = true;
-		}
-	}
-	return $result;
-}
-
-function stream_last_modified($url)
-{
-	if (function_exists('version_compare') && version_compare(phpversion(), '4.3.0') > 0)
-	{
-		if (!($fp = @fopen($url, 'r')))
-		return NULL;
-
-		$meta = stream_get_meta_data($fp);
-		for ($j = 0; isset($meta['wrapper_data'][$j]); $j++)
-		{
-			if (strstr(strtolower($meta['wrapper_data'][$j]), 'last-modified'))
-			{
-				$modtime = substr($meta['wrapper_data'][$j], 15);
-				break;
-			}
-		}
-		fclose($fp);
-	}
-	else
-	{
-		$parts = parse_url($url);
-		$host  = $parts['host'];
-		$path  = $parts['path'];
-
-		if (!($fp = @fsockopen($host, 80)))
-		return NULL;
-
-		$req = "HEAD $path HTTP/1.0\r\nUser-Agent: PHP/".phpversion()."\r\nHost: $host:80\r\nAccept: */*\r\n\r\n";
-		fputs($fp, $req);
-
-		while (!feof($fp))
-		{
-			$str = fgets($fp, 4096);
-			if (strstr(strtolower($str), 'last-modified'))
-			{
-				$modtime = substr($str, 15);
-				break;
-			}
-		}
-		fclose($fp);
-	}
-	return isset($modtime) ? strtotime($modtime) : time();
-}
-
-function isMirrored($uriToCheck) {
-	global $debugScript;
-	global $debugFunctions;
-	$localuri = $uriToCheck;
-
-	$debugMirrorList = false;
-	if ($debugScript) {
-		echo "uriToCheck: " . $localuri . "<br />";
-	}
-
-	$xmlcount = 0;
-
-	/* This method true and accurate method of parsing mirror results
-	 * may be expensive, and would
-	 * likely cause artificially high counts of "downloads".
-	 * Could maybe use if somehow only checked once ever 5 minutes or something.
-
-
-	 // turn off warnings, as sometimes HTML is returned, which causes lots of warnings
-	 $holdLevel = error_reporting(E_ERROR);
-	 $mirrorsxml=simplexml_load_file(rawurlencode($localuri) . urlencode("&format=xml"));
-	 error_reporting($holdLevel);
-
-
-	 if ($mirrorsxml) {
-	 if ($debugFunctions) {
-	 echo "root node: " . $mirrorsxml->getName() . "<br />";
-	 }
-	 if (strcmp($mirrorsxml->getName(), "mirrors") == 0) {
-	 foreach ($mirrorsxml->children() as $mirror) {
-	 if (strcmp($mirror->getName(),"mirror") == 0) {
-	 $xmlcount=$xmlcount+1;
-	 }
-	 if ($debugMirrorList) {
-	 print_r($mirror);
-	 echo "<br />";
-	 }
-	 }
-	 }
-	 if ($debugFunctions) {
-	 echo "Mirror count: " . $xmlcount . "<br />";
-	 }
-	 }
-	 */
-	/*
-	 * Use simple heuristic based on pattern
-	 * in the URI ... if it contains "/downloads/" then assume it's mirrored
-	 */
-	if (strpos($uriToCheck, "webtools/downloads/") > 0) {
-		$xmlcount = 1;
-	}
-	return ($xmlcount > 0);
-
-}
-
-// TODO: replace with Phoenix variables
-function getPlatform () {
-	global $debugScript;
-	global $debugFunctions;
-	// getBrowser is expensive, so cache the data
-	static $browser;
-	$platform = "unknown";
-
-
-	if(ini_get("browscap")) {
-		if(!isset($browser)){
-			$browser = get_browser(null, true);
-		}
-
-		if ($browser) {
-			$rawPlatform = $browser['platform'];
-			if ($debugFunctions) {
-				echo "browser platfrom: " . $rawPlatform . "<br />" ;
-			}
-
-			if ($debugFunctions) {
-				$browserKeys = array_keys($browser);
-				foreach ($browserKeys as $key) {
-					echo $key . ": " . $browser[$key] . "<br />";
-				}
-			}
-		}
-		if (strpos($rawPlatform, "Win") === 0) {
-			$platform="windows";
-		} else if (strpos($rawPlatform, "Linux") === 0) {
-			$platform="linux";
-		} else if (strpos($rawPlatform, "Mac") === 0) {
-			$platform="mac";
-		}
-	}
-	return $platform;
-}
-
-
-function getPrereqReferenceOrName($eclipseMirrorScript, $mirrorPrefixuri, $prerequrl, $prereqfilename, $eclipseFSpathPrefix) {
-	// todo: we really only need "if exists" so could make a bit more efficient
-	// I tried "file_exists" but is didn't seem to work on my test server
-	// For these pre-reqs, we assume if they exist, they are mirrored. This is true
-	// 99% of the time.
-
-	if (resourceExist($prerequrl, $mirrorPrefixuri, $prereqfilename, $eclipseFSpathPrefix)) {
-		$reflink="<a href=\"" . $eclipseMirrorScript . $mirrorPrefixuri . "/" . $prereqfilename . "\">" . $prereqfilename . "</a>";
-	} else {
-		$reflink=$prereqfilename;
-	}
-	return $reflink;
-}
-?>
diff --git a/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/pending.gif b/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/pending.gif
deleted file mode 100644
index 66db2a6..0000000
--- a/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/pending.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/pending1.gif b/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/pending1.gif
deleted file mode 100644
index 1b2ea6e..0000000
--- a/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/pending1.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/report2.php b/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/report2.php
deleted file mode 100644
index cb68e7b..0000000
--- a/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/report2.php
+++ /dev/null
@@ -1,45 +0,0 @@
-
-<?php
-
-function parse_testResults($filename)
-{
-	$junitFailures = 0;
-	if (is_file($filename)) {
-		$handle = @fopen($filename, "r");
-		if ($handle)
-		{
-			$size = filesize($filename);
-			$content = fread($handle, $size);
-			fclose($handle);
-			$junitStart = strpos($content, "Errors &amp; Failures");
-			$junitEnd = strpos($content, "</table>", $junitStart);
-			$junitInfo = substr($content, $junitStart, $junitEnd - $junitStart);
-			$start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">");
-			while ($start !== false)
-			{
-				$start += 29;
-				$stop = strpos($junitInfo, "</font></b></td>", $start);
-				if ($stop !== false)
-				{
-					$result = substr($junitInfo, $start, $stop - $start);
-					if (is_numeric($result))
-					{
-						$junitFailures += $result;
-					}
-					else if (strcmp($result, "DNF") == 0)
-					{
-						$junitFailures++;
-					}
-				}
-				$start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">", $stop);
-			}
-			$results = array($junitFailures);
-			return $results;
-		}
-	}
-}
-
-
-?>
-
-
diff --git a/releng.wtpbuilder/distribution/jaxws.site/templateFiles/compileResults.php.template b/releng.wtpbuilder/distribution/jaxws.site/templateFiles/compileResults.php.template
deleted file mode 100644
index f785771..0000000
--- a/releng.wtpbuilder/distribution/jaxws.site/templateFiles/compileResults.php.template
+++ /dev/null
@@ -1,76 +0,0 @@
-<html>
-<head>
-
-<?php
-        $parts = explode("/", getcwd());
-        $parts2 = explode("-", $parts[count($parts) - 1]);
-        $buildName = $parts2[1];
-
-        echo "<title>Compile Logs: Code Bundles for $buildName</title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2%;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-}
-</style>
-</head>
-<body>
-
-<?php
-        echo "<h1>Compile Logs: Code Bundles for $buildName</h1>";
-?>
-
-
-<table id=tabledata align = "center" width="75%" border="1">
-  <tr>
-    <td class="bold" align="center">Compile Logs</td>
-    <td class="bold" align="center">Compile Errors</td>
-    <td class="bold" align="center">Compiler Warnings</td>
-    <td class="bold" align="center">Access Violations</td>
-    <td class="bold" align="center">Access Warnings</td>
-  </tr>
-
-  %compilelogs%
-
-</table>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/jaxws.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/jaxws.site/templateFiles/index.html.template.php
deleted file mode 100644
index 2df61b0..0000000
--- a/releng.wtpbuilder/distribution/jaxws.site/templateFiles/index.html.template.php
+++ /dev/null
@@ -1,850 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<?php
-
-ini_set("display_errors", "true");
-error_reporting (E_ALL);
-
-
-$buildBranch="@buildBranch@";
-$build="@build@";
-$type="@type@";
-$builddate="@date@";
-
-$eclipseMirrorPrefixuri="@eclipse.mirror.prefixuri@";
-$eclipseFSpathPrefix="@eclipse.fspath.prefix@";
-
-$eclipsefilelinux="@eclipsefilelinux@";
-$eclipsefilewindows="@eclipsefilewindows@";
-$eclipsefilemacosx="@eclipsefilemacos@";
-
-$eclipseURL="@eclipseURL@";
-$eclipseFile="@eclipseFile@";
-$eclipseBuildURL="@eclipseBuildURL@";
-$eclipseBuildHome="@eclipseBuildHome@";
-$eclipseName="@eclipseName@";
-$eclipseDescription="@eclipseDescription@";
-
-$eclipseplatformMirrorPrefixuri="@eclipseplatform.mirror.prefixuri@";
-$eclipseplatformFSpathPrefix="@eclipse.fspath.prefix@";
-
-$eclipseplatformfilelinux="@eclipseplatformfilelinux@";
-$eclipseplatformfilewindows="@eclipseplatformfilewindows@";
-$eclipseplatformfilemacosx="@eclipseplatformfilemacos@";
-
-$eclipseplatformURL="@eclipseplatformURL@";
-$eclipseplatformFile="@eclipseplatformFile@";
-$eclipseplatformBuildURL="@eclipseplatformBuildURL@";
-$eclipseplatformBuildHome="@eclipseplatformBuildHome@";
-$eclipseplatformName="@eclipseplatformName@";
-$eclipseplatformDescription="@eclipseplatformDescription@";
-
-$testURL="@testURL@";
-$testFile="@testFile@";
-
-$wstURL="@wstURL@";
-$wstFile="@wstFile@";
-$wstMirrorPrefixuri="@wst.mirror.prefixuri@";
-$wstBuildHome="@wstBuildHome@";
-$wstName="@wstName@";
-$wstDescription="@wstDescription@";
-
-$jstURL="@jstURL@";
-$jstFile="@jstFile@";
-$jstMirrorPrefixuri="@jst.mirror.prefixuri@";
-$jstBuildHome="@jstBuildHome@";
-$jstName="@jstName@";
-$jstDescription="@jstDescription@";
-
-$wtpURL="@wtpURL@";
-$wtpFile="@wtpFile@";
-$wtpMirrorPrefixuri="@wtp.mirror.prefixuri@";
-$wtpBuildHome="@wtpBuildHome@";
-$wtpName="@wtpName@";
-$wtpDescription="@wtpDescription@";
-
-$gefURL="@gefURL@";
-$gefFile="@gefFile@";
-$gefMirrorPrefixuri="@gef.mirror.prefixuri@";
-$gefBuildHome="@gefBuildHome@";
-$gefName="@getName@";
-$gefDescription="@gefDescription@";
-
-$emfURL="@emfURL@";
-$emfFile="@emfFile@";
-$emfMirrorPrefixuri="@emf.mirror.prefixuri@";
-$emfBuildHome="@emfBuildHome@";
-$emfName="@emfName@";
-$emfDescription="@emfDescription@";
-
-$emfsourceURL="@emfsourceURL@";
-$emfsourceFile="@emfsourceFile@";
-$emfsourceMirrorPrefixuri="@emfsource.mirror.prefixuri@";
-$emfsourceBuildHome="@emfsourceBuildHome@";
-$emfsourceName="@emfsourceName@";
-$emfsourceDescription="@emfsourceDescription@";
-
-
-$emfxsdURL="@emfxsdURL@";
-$emfxsdFile="@emfxsdFile@";
-$emfxsdMirrorPrefixuri="@emfxsd.mirror.prefixuri@";
-$emfxsdBuildHome="@emfxsdBuildHome@";
-$emfxsdName="@emfxsdName@";
-$emfxsdDescription="@emfxsdDescription@";
-
-$emfxsdsourceURL="@emfxsdsourceURL@";
-$emfxsdsourceFile="@emfxsdsourceFile@";
-$emfxsdsourceMirrorPrefixuri="@emfxsdsource.mirror.prefixuri@";
-$emfxsdsourceBuildHome="@emfxsdsourceBuildHome@";
-$emfxsdsourceName="@emfxsdsourceName@";
-$emfxsdsourceDescription="@emfxsdsourceDescription@";
-
-
-$emfvalidationURL="@emfvalidationURL@";
-$emfvalidationFile="@emfvalidationFile@";
-$emfvalidationMirrorPrefixuri="@emfvalidation.mirror.prefixuri@";
-$emfvalidationBuildHome="@emfvalidationBuildHome@";
-$emfvalidationName="@emfvalidationName@";
-$emfvalidationDescription="@emfvalidationDescription@";
-
-$emfvalidationsourceURL="@emfvalidationsourceURL@";
-$emfvalidationsourceFile="@emfvalidationsourceFile@";
-$emfvalidationsourceMirrorPrefixuri="@emfvalidationsource.mirror.prefixuri@";
-$emfvalidationsourceBuildHome="@emfvalidationsourceBuildHome@";
-$emfvalidationsourceName="@emfvalidationsourceName@";
-$emfvalidationsourceDescription="@emfvalidationsourceDescription@";
-
-
-$dtpURL="@dtpURL@";
-$dtpFile="@dtpFile@";
-$dtpMirrorPrefixuri="@dtp.mirror.prefixuri@";
-$dtpBuildHome="@dtpBuildHome@";
-$dtpName="@dtpName@";
-$dtpDescription="@dtpDescription@";
-
-
-$eclipserelengFile="@eclipserelengFile@";
-$eclipserelengURL="@eclipserelengURL@";
-$orbitthirdpartyzipFile="@orbitthirdpartyzipFile@";
-$orbitthirdpartyzipURL="@orbitthirdpartyzipURL@";
-$orbitthirdpartyzipBuildHome="@orbitthirdpartyzipBuildHome@";
-$orbitthirdpartyzipMirrorPrefixuri="@orbitthirdpartyzip.mirror.prefixuri@";
-
-
-$prereq_eclipse="true";
-$prereq_eclipseplatform="false";
-$prereq_emf="true";
-$prereq_emfxsd="true";
-$prereq_emfvalidation="true";
-$prereq_gef="true";
-$prereq_dtp="false";
-$prereq_wst="false";
-$prereq_jst="false";
-$prereq_wtp="true";
-
-
-include("miscUtil.php");
-
-
-
-
-$debugScript = false;
-$debugFunctions = false;
-
-$defaultMirrorScript="";
-$defaultWTPMirrorPrefix="./";
-
-$eclipseMirrorScript="http://www.eclipse.org/downloads/download.php?file=";
-
-// TODO: improve so this hard coding isn't required.
-// This depends on the declare script changing webtools/committers to webtools/downloads
-// And, the logic is such that if it is not mirrored, this URI is not used at all, just
-// a relative reference only
-$eclipseWTPMirrorPrefix="/webtools/committers/drops/$buildBranch/$build/";
-
-
-$mirrorScript=$defaultMirrorScript;
-$downloadprefix=$defaultWTPMirrorPrefix;
-
-
-$keytestMirrorString=$eclipseMirrorScript . "$eclipseWTPMirrorPrefix/wtp-incubator-jaxws-sdk-$build.zip";
-if (isMirrored($keytestMirrorString) ) {
-	$mirrorScript=$eclipseMirrorScript;
-	$downloadprefix="${mirrorScript}${eclipseWTPMirrorPrefix}";
-}
-
-if ($debugScript)  {
-	echo "inferred platform: " . getPlatform();
-}
-
-
-// our summary results handling requires php 5 (for simple xml file loading)
-// so, if not php 5, just don't display any summary results
-// This was found to be required, since some mirror our whole site (e.g. IBM)
-// and not all mirrors use PHP 5
-$displayTestSummary=false;
-if (phpversion() >= 5) {
-
-	$code_totalBundles=0;
-	$code_totalErrors=0;
-	$code_totalWarnings=0;
-	$code_totalforbiddenAccessWarningCount=0;
-	$code_totaldiscouragedAccessWarningCount=0;
-
-	$test_totalBundles=0;
-	$test_totalErrors=0;
-	$test_totalWarnings=0;
-	$test_totalforbiddenAccessWarningCount=0;
-	$test_totaldiscouragedAccessWarningCount=0;
-
-
-	$displayTestSummary=true;
-	// expecting grandTotalErrors and grandTotalTests
-	$filename = "unitTestsSummary.xml";
-	if (file_exists($filename)) {
-		$prefix = "unitTests_";
-		$unitTestsSummary = simplexml_load_file($filename);
-		foreach ($unitTestsSummary->summaryItem as $summaryItem) {
-			$name = $summaryItem->name;
-			$value = $summaryItem->value;
-			$code= "\$" . $prefix . $name . " = " . $value . ";";
-			//echo "<br />code: " . $code;
-			eval($code);
-		}
-	}
-
-	$filename = "compilelogsSummary.xml";
-	if (file_exists($filename)) {
-		$prefix = "code_";
-		$compileSummary = simplexml_load_file($filename);
-		foreach ($compileSummary->summaryItem as $summaryItem) {
-			$name = $summaryItem->name;
-			$value = $summaryItem->value;
-			$code= "\$" . $prefix . $name . " = " . $value . ";";
-			//echo "<br />code: " . $code;
-			eval($code);
-		}
-	}
-
-	$filename = "testcompilelogsSummary.xml";
-	if (file_exists($filename)) {
-		$prefix = "test_";
-		$compileSummary = simplexml_load_file($filename);
-		foreach ($compileSummary->summaryItem as $summaryItem) {
-			$name = $summaryItem->name;
-			$value = $summaryItem->value;
-			$code= "\$" . $prefix . $name . " = " . $value . ";";
-			//echo "<br />code: " . $code;
-			eval($code);
-		}
-	}
-}
-
-$incubating="true";
-
-
-
-if ($incubating) {
-	echo '<title>WTP Incubator Downloads</title>';
-}
-else {
-	echo '<title>WTP Downloads</title>';
-}
-
-
-?>
-
-
-</head>
-
-<body>
-
-
-<?php
-
-// tiny banner to remind when looking at "local" machine results
-$serverName = $_SERVER["SERVER_NAME"];
-
-if (!stristr($serverName, "eclipse.org") && !stristr($serverName,"you.are.at.eclipsecon.org")) {
-	echo '<center>
-          <p>
-          Reminder: this is <font color="#FF0000">' .
-	$serverName .
-        '</font>
-          See also
-          <a href="http://download.eclipse.org/webtools/downloads" target="_top">the live public Eclipse site</a>.
-          </p>
-          <hr />
-          </center>';
-
-}
-?>
-
-<?php if ("true" === $incubating) {
-	echo "<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH=\"100%\">";
-	echo "	<tr>";
-	echo "		<td ALIGN=left><font face=\"'Bitstream Vera',Helvetica,Arial\" size=\"+2\"><b><?php echo \"$type\";?>";
-	echo "        Build: $build</b></font></td>";
-	echo "		<td align=\"right\" rowspan=\"3\"><a";
-	echo "			href=\"http://www.eclipse.org/projects/what-is-incubation.php\"><img";
-	echo "			src=\"http://www.eclipse.org/images/egg-incubation.png\"";
-	echo "			alt=\"Incubation\" align=\"middle\" border=\"0\"></a></td>";
-
-
-	echo "	<tr valign=\"top\">";
-	echo "		<td><font size=\"-1\">" . $builddate . "</font></td>";
-	echo "	</tr>";
-	echo "	<tr valign=\"top\">";
-	echo "		<td>";
-	echo "		<p>The Eclipse Web Tools Platform (WTP) Incubator Project provides";
-	echo "		tools for development that are just getting started, or are";
-	echo "		experimental in some fashion.</p>";
-	echo "		</td>";
-	echo "	</tr>";
-	echo "</table>";
-
-} else {
-
-	echo "<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH=\"100%\">";
-	echo "	<tr>";
-	echo "		<td ALIGN=left><font face=\"'Bitstream Vera',Helvetica,Arial\" size=\"+2\"><b>$type";
-	echo "		Build: " . $build . "</b></font></td>";
-
-	echo "	<tr valign=\"top\">";
-	echo "		<td><font size=\"-1\">" . $builddate . "</font></td>";
-	echo "	</tr>";
-	echo "	<tr valign=\"top\">";
-	echo "		<td>";
-	echo "		<p>Component build from the Eclipse Web Tools Platform (WTP) Project.</p>";
-	echo "		</td>";
-	echo "	</tr>";
-	echo "</table>";
-
-} ?>
-
-<!-- ***********  Prerequisites **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-	<tr>
-		<td align="left" valign="top" bgcolor="#0080C0"><font
-			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Prerequisites
-		and Handy Extras</font></td>
-	</tr>
-	<tr>
-		<td>
-		<p>These are the prerequisites to build or run these packages. All are
-		not necessarily required, but instead some subset. Also listed are
-		some frequently needed links for committer-required packages when
-		creating new development environments, or targets to run against.</p>
-		<p>Note that WTP requires Java 5 or higher (and, for some things,
-		actually requires a JDK rather than only a JRE) even though many other
-		<a href="http://www.eclipse.org/downloads/">Eclipse Projects</a> can
-		run with <a href="http://www.eclipse.org/downloads/moreinfo/jre.php">other
-		JRE levels</a>.</p>
-		<p></p>
-		</td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=1 cellpadding=1 width="90%" align="center">
-
-		<?php
-		if ("true" === $prereq_eclipseplatform) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td width=\"40%\">Eclipse Platform</td>";
-
-
-			//customize page depending on user's browser/platform, if we can detect it
-			$usersPlatform = getPlatform();
-			// assume windows by default, since likely most frequent, even for cases where
-			// platform is "unknown". I've noticed Opera reports 'unknown' :(
-			$recommendedFile=$eclipseplatformfilewindows;
-			if (strcmp($usersPlatform,"linux")== 0) {
-				$recommendedFile=$eclipseplatformfilelinux;
-			} else if (strcmp($usersPlatform,"mac") == 0) {
-				$recommendedFile=$eclipseplatformfilemacosx;
-			}
-
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $eclipseplatformBuildURL . "\">appropriate platform</a>";
-			echo " or <a href=\"" . $eclipseplatformBuildHome . "\">equivalent</a></td>";
-
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_eclipse) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td width=\"40%\">Eclipse SDK (Platform, JDT)</td>";
-
-
-			//customize page depending on user's browser/platform, if we can detect it
-			$usersPlatform = getPlatform();
-			// assume windows by default, since likely most frequent, even for cases where
-			// platform is "unknown". I've noticed Opera reports 'unknown' :(
-			$recommendedFile=$eclipsefilewindows;
-			if (strcmp($usersPlatform,"linux")== 0) {
-				$recommendedFile=$eclipsefilelinux;
-			} else if (strcmp($usersPlatform,"mac") == 0) {
-				$recommendedFile=$eclipsefilemacosx;
-			}
-
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $eclipseBuildURL . "\">appropriate platform</a>";
-			echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_emf) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $emfName . "&nbsp;" . $emfDescription ;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $emfMirrorPrefixuri, $emfURL, $emfFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $emfBuildHome . "\">equivalent</a></td>";
-			echo " </tr>";
-		}
-		?>
-
-
-		<?php
-		if ("true" === $prereq_emfxsd) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $emfxsdName . "&nbsp;" . $emfxsdDescription ;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdMirrorPrefixuri, $emfxsdURL, $emfxsdFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $emfxsdBuildHome . "\">equivalent</a></td>";
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_emfvalidation) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $emfvalidationName  . "&nbsp;" . $emfvalidationDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $emfvalidationMirrorPrefixuri, $emfvalidationURL, $emfvalidationFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $emfvalidationBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_gef) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $gefName  . "&nbsp;" . $gefDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $gefMirrorPrefixuri, $gefURL, $gefFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $gefBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_dtp) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $dtpName . "&nbsp;" . $dtpDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $dtpMirrorPrefixuri, $dtpURL, $dtpFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $dtpBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_wst) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $wstName . "&nbsp;" . $wstDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $wstMirrorPrefixuri, $wstURL, $wstFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $wstBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_jst) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $jstName . "&nbsp;" . $jstDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $jstMirrorPrefixuri, $jstURL, $jstFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $jstBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-		<?php
-		if ("true" === $prereq_wtp) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $wtpName . "&nbsp;" . $wtpDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $wtpMirrorPrefixuri, $wtpURL, $wtpFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $wtpBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-			<tr valign="middle">
-				<td width="10%"></td>
-				<td colspan="2">
-				<hr />
-				</td>
-			</tr>
-
-
-
-			<?php
-			if ("true" === $prereq_emf) {
-				echo "<tr valign=\"top\">";
-				echo "<td width=\"10%\"></td>";
-				echo "<td>";
-				echo $emfsourceName . "&nbsp;" . $emfsourceDescription;
-				echo "</td> ";
-				echo "<td align=\"right\">";
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfsourceMirrorPrefixuri, $emfsourceURL, $emfsourceFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $emfsourceBuildHome . "\">equivalent</a></td>";
-				echo "</tr>";
-			}
-			?>
-			<?php
-			if ("true" === $prereq_emfxsd) {
-				echo "<tr valign=\"top\">";
-				echo "<td width=\"10%\"></td>";
-				echo "<td>";
-				echo $emfxsdsourceName . "&nbsp;" . $emfxsdsourceDescription;
-				echo "</td> ";
-				echo "<td align=\"right\">";
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdsourceMirrorPrefixuri, $emfxsdsourceURL, $emfxsdsourceFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $emfxsdsourceBuildHome . "\">equivalent</a></td>";
-				echo "</tr>";
-			}
-			?>
-
-			<?php
-			if ("true" === $prereq_emfvalidation) {
-				echo "<tr valign=\"top\">";
-				echo "<td width=\"10%\"></td>";
-				echo "<td>";
-				echo $emfvalidationsourceName . "&nbsp;" . $emfvalidationsourceDescription;
-				echo "</td> ";
-				echo "<td align=\"right\">";
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfvalidationsourceMirrorPrefixuri, $emfvalidationsourceURL, $emfvalidationsourceFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $emfvalidationsourceBuildHome . "\">equivalent</a></td>";
-				echo "</tr>";
-			}
-			?>
-
-			<?php
-			if (true) {
-				echo "<tr valign=\"top\">";
-				echo "<td width=\"10%\"></td>";
-				echo "<td>";
-				echo "Eclipse Test Framework (required only for Automated JUnit tests)";
-				echo "</td> ";
-				echo "<td align=\"right\">";
-
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $testURL, $testFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-				echo "</tr>";
-			}
-			?>
-
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>Eclipse releng tool (required only for committers to more easily
-				"release" code to a build)</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipserelengURL, $eclipserelengFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>Third Party code from Orbit. Not required and is currently much
-				more than needed for WTP, but some committers like using to create a
-				PDE target.</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $orbitthirdpartyzipMirrorPrefixuri, $orbitthirdpartyzipURL, $orbitthirdpartyzipFile,$eclipseFSpathPrefix);
-				echo " or <a href=\"" . $orbitthirdpartyzipBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-		</table>
-		</td>
-	</tr>
-</table>
-
-<!-- ***********  WTP **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-	<tr>
-		<td align=left valign=top colspan="5" bgcolor="#0080C0"><font
-			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF"> Web Tools
-		Platform</font></td>
-	</tr>
-
-	<tr>
-		<td align="left" valign="top" colspan="5">
-		<p>The Zip files includes the features and plugins for the WTP Incubator JAX WS Component.</p>
-		</td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
-
-
-			<tr>
-				<td align="left" valign="top" width="10%"><b>Minimal</b></td>
-				<td align="left" valign="top">
-				<p>Executable code only.</p>
-				</td>
-				<?php
-				$zipfilename="wtp-incubator-jaxws-${build}";
-				$filename=$zipfilename.".zip";
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription="jaxws";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-				?>
-			</tr>
-
-			<tr>
-				<td align="left" valign="top" width="10%"><b>SDK</b></td>
-				<td align="left" valign="top">
-				<p>Executable code and source code.</p>
-				</td>
-				<?php
-				$zipfilename="wtp-incubator-jaxws-sdk-${build}";
-				$filename=$zipfilename.".zip";
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription="jaxws sdk";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-				?>
-			</tr>
-			<tr>
-				<td align="left" valign="top" width="10%"><b>Tests</b></td>
-				<td align="left" valign="top">
-				<p>Unit tests.</p>
-				</td>
-				<?php
-				$zipfilename="wtp-incubator-jaxws-tests-${build}";
-				$filename=$zipfilename.".zip";
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription="jaxws tests";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-				?>
-			</tr>
-		</table>
-		</td>
-	
-	
-	<tr>
-
-</table>
-
-
-
-
-
-
-
-<!-- ***********  Build Status **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-	<tr>
-		<td align=left valign=top bgcolor="#0080C0"><font
-			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Status, tests
-		and other interesting details</font></td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
-
-			<tr>
-				<td><!-- 
-				Its silly to always display 'Build notes', but hard to 
-				compute if required or not. 
-				<a href="buildNotes.php">Build notes</a> <br /> 
-				--> <a href="directory.txt">map files</a> <br />
-				<?php
-
-				if ($displayTestSummary) {
-
-
-					if (isset($unitTests_grandTotalErrors)) {
-						$errorColor="green";
-						if ($unitTests_grandTotalErrors > 0) {
-							$errorColor="red";
-						}
-						echo "<a href=\"testResults.php\">Unit test results</a>&nbsp;";
-						echo "<img src=\"junit_err.gif\"/><font color=\"" . $errorColor . "\">" . $unitTests_grandTotalErrors . "</font>&nbsp;&nbsp;Total: " . $unitTests_grandTotalTests;
-					}
-					else {
-						// we hardly ever "pend" anymore ... abscense usually signifies no tests or a build error.
-						echo "<br /><font color=\"orange\">Unit tests don't exists, are pending, or there's a build error.</font>";
-						//&nbsp;&nbsp;<img src=\"pending.gif\"/>";
-					}
-
-					echo "<br />";
-					echo "<a href=\"compileResults.php\">Compile logs: Code Bundles</a>";
-
-					echo "&nbsp;&nbsp;($code_totalBundles)&nbsp;&nbsp;";
-					echo "<img src=\"compile_err.gif\"/><font color=red>$code_totalErrors</font>&nbsp;";
-					echo "<img src=\"compile_warn.gif\"/><font color=orange>$code_totalWarnings</font>&nbsp;";
-					echo "<img src=\"access_err.gif\"/><font color=red>$code_totalforbiddenAccessWarningCount</font>&nbsp;";
-					echo "<img src=\"access_warn.gif\"/><font color=orange>$code_totaldiscouragedAccessWarningCount</font>&nbsp;";
-
-					echo "<br />";
-					echo "<a href=\"testCompileResults.php\">Compile logs: Test Bundles</a>";
-
-					echo "&nbsp;&nbsp;($test_totalBundles)&nbsp;&nbsp;";
-					echo "<img src=\"compile_err.gif\"/><font color=red>$test_totalErrors</font>&nbsp;";
-					echo "<img src=\"compile_warn.gif\"/><font color=orange>$test_totalWarnings</font>&nbsp;";
-					echo "<img src=\"access_err.gif\"/><font color=red>$test_totalforbiddenAccessWarningCount</font>&nbsp;";
-					echo "<img src=\"access_warn.gif\"/><font color=orange>$test_totaldiscouragedAccessWarningCount</font>&nbsp;";
-				}
-
-				?> <br />
-
-				<?php
-				if (file_exists("versioningReportName.php")) {
-					include "versioningReportName.php";
-					$fname="${versionReportFilename}.html";
-					if (file_exists($fname)) {
-						echo "<br /> <a href='$fname'>Versioning Information</a>";
-					}
-}
-?> <?php
-echo "<br />";
-if (file_exists("./apiresults/api-progress.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-progress.html\">API Progress Report</a>";
-}
-if (file_exists("./apiresults/api-info-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-info-summary.html\">APIs Defined by Each Component</a>";
-}
-if (file_exists("./apiresults/api-ref-compatibility.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-ref-compatibility.html\">Adopter Breakage Report</a>";
-}
-if (file_exists("./apiresults/api-violation-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-violation-summary.html\">API Violations</a>";
-}
-if (file_exists("./apiresults/component-api-violation-all.html"))
-{
-	echo "<br /> <a href=\"apiresults/component-api-violation-all.html\">Non-API dependencies</a>";
-}
-if (file_exists("./apiresults/api-tc-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-tc-summary.html\">API Test Coverage</a>";
-}
-if (file_exists("./apiresults/api-javadoc-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-javadoc-summary.html\">API Javadoc Coverage</a>";
-}
-if (file_exists("./apiresults/api-tc-summary.html"))
-{
-	echo "<br /><br /> <a href=\"apiresults/full_test_coverage/api-tc-summary.html\">Test Coverage for All Classes and Methods</a>";
-}
-?> <?php
-if (file_exists("./perfresults/graph/performance.php"))
-{
-	echo "<br />";
-	echo "<br /> <a href=\"perfresults/graph/performance.php\">Performance Results</a>";
-	echo "<br />";
-}
-?></td>
-			</tr>
-
-
-		</table>
-		</td>
-	</tr>
-</table>
-
-
-
-<!-- footer -->
-<center>
-<hr>
-<p>All downloads are provided under the terms and conditions of the <a
-	href="http://www.eclipse.org/legal/notice.html">Eclipse.org Software
-User Agreement</a> unless otherwise specified.</p>
-
-<p>If you have problems downloading the drops, contact the <font
-	face="'Bitstream Vera',Helvetica,Arial" size="-1"><a
-	href="mailto:webmaster@eclipse.org">webmaster</a></font>.</p>
-
-</center>
-<!-- end footer -->
-
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/jaxws.site/templateFiles/siteEnablingFeatures.xml b/releng.wtpbuilder/distribution/jaxws.site/templateFiles/siteEnablingFeatures.xml
deleted file mode 100644
index cc3ed81..0000000
--- a/releng.wtpbuilder/distribution/jaxws.site/templateFiles/siteEnablingFeatures.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-    <description> The update site contains the enabling features. </description>
-    <category-def
-        name="Enabling Features"
-        label="Enabling Features">
-        <description> This category contains features used by several
-            projects that enable some functionality, but which by
-            themselves are not very interesting. </description>
-    </category-def>
-</site>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/jaxws.site/templateFiles/siteWTP.xml b/releng.wtpbuilder/distribution/jaxws.site/templateFiles/siteWTP.xml
deleted file mode 100644
index f94e83f..0000000
--- a/releng.wtpbuilder/distribution/jaxws.site/templateFiles/siteWTP.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site
-    pack200="true"
-    mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/webtools/testUpdates/site.xml&amp;format=xml"
-    digestURL="http://download.eclipse.org/webtools/testUpdates/">
-    <description
-        url="http://download.eclipse.org/webtools/declaredUpdates/index.html"> The update site contains the features of the of Eclipse Web
-        Tools Project (WTP) </description>
-    <feature
-        url="features/org.eclipse.wst_@org.eclipse.wst@.jar"
-        id="org.eclipse.wst"
-        version="@org.eclipse.wst@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.wst.sdk_@org.eclipse.wst.sdk@.jar"
-        id="org.eclipse.wst.sdk"
-        version="@org.eclipse.wst.sdk@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jst_@org.eclipse.jst@.jar"
-        id="org.eclipse.jst"
-        version="@org.eclipse.jst@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jst.sdk_@org.eclipse.jst.sdk@.jar"
-        id="org.eclipse.jst.sdk"
-        version="@org.eclipse.jst.sdk@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jpt.feature_@org.eclipse.jpt.feature@.jar"
-        id="org.eclipse.jpt.feature"
-        version="@org.eclipse.jpt.feature@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jpt_sdk.feature_@org.eclipse.jpt_sdk.feature@.jar"
-        id="org.eclipse.jpt_sdk.feature"
-        version="@org.eclipse.jpt_sdk.feature@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <category-def
-        name="Web Tools Platform (WTP)"
-        label="Web Tools Platform (WTP)">
-        <description> This category contains the features of the Eclipse
-            Web Tools Project (WTP). </description>
-    </category-def>
-</site>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/jaxws.site/templateFiles/testCompileResults.php.template b/releng.wtpbuilder/distribution/jaxws.site/templateFiles/testCompileResults.php.template
deleted file mode 100644
index 42d6f65..0000000
--- a/releng.wtpbuilder/distribution/jaxws.site/templateFiles/testCompileResults.php.template
+++ /dev/null
@@ -1,76 +0,0 @@
-<html>
-<head>
-
-<?php
-        $parts = explode("/", getcwd());
-        $parts2 = explode("-", $parts[count($parts) - 1]);
-        $buildName = $parts2[1];
-
-        echo "<title>Compile Logs: Test Bundles for $buildName</title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2em;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:Bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-}
-</style>
-</head>
-<body>
-
-<?php
-        echo "<h1>Compile Logs: Test Bundles for $buildName</h1>";
-?>
-
-
-<table id=tabledata align = "center" width="75%" border="1">
-  <tr>
-    <td class="bold" align="center">Compile Logs</td>
-    <td class="bold" align="center">Compile Errors</td>
-    <td class="bold" align="center">Compiler Warnings</td>
-    <td class="bold" align="center">Access Violations</td>
-    <td class="bold" align="center">Access Warnings</td>
-  </tr>
-
-  %compilelogs%
-
-</table>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/jaxws.site/templateFiles/testResults.php.template b/releng.wtpbuilder/distribution/jaxws.site/templateFiles/testResults.php.template
deleted file mode 100644
index ddad0b7..0000000
--- a/releng.wtpbuilder/distribution/jaxws.site/templateFiles/testResults.php.template
+++ /dev/null
@@ -1,119 +0,0 @@
-<html>
-<head>
-
-<?php
-	$parts = explode("/", getcwd());
-	$parts2 = explode("-", $parts[count($parts) - 1]);
-	$buildName = $parts2[1];
-	
-	echo "<title>Test Results for $buildName </title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2em;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:Bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-
-}
-</style>
-
-
-</head>
-<body>
-<p><b><font face="Verdana" size="+3">Test Results</font></b> </p>
-
-<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">
-    Unit Test Results for <?php echo "$buildName"; ?> on Various Platforms and JRE</font></b></td>
-  </tr>
-</table>
-
-<?php
-if (file_exists("testResults"))
-{
-$dir = dir("testResults");
-while ($anEntry = $dir->read())
-{
-  if ($anEntry != "." && $anEntry != ".." && $anEntry != "consolelogs" && $anEntry != "html" && $anEntry != "xml")
-  {
-    $link = "testResults/".$anEntry."/results/index.php";
-    echo "<p><a href=\"$link\">$anEntry</a></p>";
-  }
-}
-}
-?>
-
-<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">Unit 
-      Test Results for <?php echo "$buildName"; ?> </font></b></td>
-  </tr>
-</table>
-
-<table id=tableunittestdata align = "center" width="75%" border="1">
-  <tr> 
-    <td class="bold" align="center" width="70%">Test Suite</td>
-    <td class="bold" align="center" width="10%">Errors &amp; Failures</td>
-    <td class="bold" align="center" width="10%">Total Tests</td>
-    <td class="bold" align="center" width="10%">Total Time (s)</td>
-  </tr>
-  
-  
-  %testresults%
-  
-</table>
-<p></p>
-<br>
-<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"> 
-      Console output logs 
-      <?php echo "$buildName"; ?>
-      </font></b></td>
-  </tr>
-</table>
-<br>
-These <a href="consoleLogs.php">logs</a> contain the console output captured while 
-running the JUnit automated tests. <br>
-<br>
-
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/jaxws.site/transformReportToHTML.xml b/releng.wtpbuilder/distribution/jaxws.site/transformReportToHTML.xml
deleted file mode 100644
index b72f6cd..0000000
--- a/releng.wtpbuilder/distribution/jaxws.site/transformReportToHTML.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-    name="xsl-conversion"
-    default="main"
-    basedir=".">
-    <target
-        name="main"
-        description="example.@dot.xml to produce example.@dot.html">
-        <xslt
-            destdir="${resultDir}/compilelogs"
-            scanincludeddirectories="true"
-            style="compilerXMLOutputToHTML.xsl"
-            force="true">
-            <fileset
-                dir="${resultDir}/compilelogs"
-                includes="**/*.xml"/>
-        </xslt>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/jaxws.tests/build.xml b/releng.wtpbuilder/distribution/jaxws.tests/build.xml
deleted file mode 100644
index 038cd8b..0000000
--- a/releng.wtpbuilder/distribution/jaxws.tests/build.xml
+++ /dev/null
@@ -1,330 +0,0 @@
-<project
-    name="Build specific targets and properties"
-    default="runTest">
-    <!--
-        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"/>
-    <fail
-        message="testRoot must be set for this task"
-        unless="testRoot"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-
-
-    <!-- 
-        typcially already set, but in case of standalone tests, may not
-        be
-    -->
-    <property
-        name="buildLabel"
-        value="${buildType}-${buildId}-${timestamp}"/>
-
-
-    <!-- 
-	   Steps to do after the build is done. 
-	 -->
-    <target
-        name="test">
-        <dirname
-            file="${ant.file}"
-            property="currentDirectory"/>
-        <ant
-            antfile="${ant.file}"
-            target="runTest"
-            dir="${currentDirectory}"/>
-    </target>
-
-    <!-- 
-	  Steps to do to test the build results
-   -->
-    <target
-        name="runTest">
-        <dirname
-            file="${ant.file}"
-            property="test.component.dir"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-        <property
-            file="${buildDirectory}/label.properties"/>
-        <property
-            file="${wtp.builder.home}/build.properties"/>
-        <fail
-            message="testRoot must be set for this task"
-            unless="testRoot"/>
-        <mkdir
-            dir="${testRoot}"/>
-
-        <!-- if results already exist, delete them -->
-        <delete
-            dir="${testRoot}/results"
-            failOnError="false"/>
-        <mkdir
-            dir="${testRoot}/results"/>
-        <mkdir
-            dir="${testRoot}/results/consolelogs"/>
-        <copy
-            todir="${testRoot}"
-            overwrite="true">
-            <fileset
-                dir="${test.component.dir}/testScripts"/>
-        </copy>
-        <echo
-            message="BASEOS: ${env.BASEOS}   BASEWS: ${env.BASEWS}   BASEARCH: ${env.BASEARCH} "/>
-        <ant
-            antfile="${test.component.dir}/testdependency.xml"
-            target="get">
-            <property
-                name="dependency.properties"
-                value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-            <property
-                name="base.install.dir"
-                value="${testRoot}"/>
-        </ant>
-        <antcall
-            target="unzipTests"/>
-        <antcall
-            target="runTestEclipse">
-            <param
-                name="testTarget"
-                value="all"/>
-        </antcall>
-        <antcall
-            target="postRunTestEclipse">
-            <param
-                name="testTarget"
-                value="all"/>
-        </antcall>
-    </target>
-    <target
-        name="unzipTests">
-        <!--
-            unzip the builds and junit tests we use 'unzip' here, so we
-            can continue on error, if desired. (such as if zip was not
-            created, due to other failures or options).
-        -->
-        <echo
-            message="installing sdk"/>
-        <exec
-            dir="${buildDirectory}/${buildLabel}"
-            executable="unzip"
-            failonerror="true">
-            <arg
-                line="-o -qq  wtp-incubator-jaxws-sdk-${buildLabel}.zip -d ${testRoot}${dropinsFolder}"/>
-        </exec>
-        <echo
-            message="installing tests"/>
-        <exec
-            dir="${buildDirectory}/${buildLabel}"
-            executable="unzip"
-            failonerror="false">
-            <arg
-                line="-o -qq wtp-incubator-jaxws-tests-${buildLabel}.zip -d ${testRoot}${dropinsFolder}"/>
-        </exec>
-    </target>
-    <!--
-        time out may need to be set/adjust for api or performance tests?
-        This testTimeLimit is the whole, overall limit on tests. There's
-        a shorter one for individual suites. some common values, of
-        milliseconds to more recognizable units: 7200000: 2 hours
-        3600000: 1 hour 1800000: 30 minutes 600000: 10 minutes
-    -->
-    <property
-        name="testTimeLimit"
-        value="7200000"/>
-    <property
-        name="testFailOnError"
-        value="false"/>
-    <target
-        name="runTestEclipse"
-        description="Run our JUnit's within an instance of antRunner">
-        <property
-            name="test-vm"
-            value="${env.JAVA_6_HOME}/bin/java"/>
-
-        <property
-            name="vmargs"
-            value="-Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm}  -Dperf.buildId=${buildType}${date}-${time}"/>
-        <!--
-            set path to eclipse folder. If local folder, use '.';
-            otherwise, use c:\path\to\eclipse or /path/to/eclipse/
-        -->
-        <property
-            name="eclipse.home"
-            value="${testRoot}"/>
-        <echo
-            message="Running junits"/>
-        <!--
-            Remember: using -debug for org.eclipse.ant.core.antRunner
-            produces ant debug info to be output ... which is a TON of
-            stuff
-        -->
-        <echo
-            message="eclipse.launcher: ${eclipse.launcher}"/>
-        <java
-            taskname="unit-test-masterprocess"
-            fork="true"
-            resultProperty="wtpmasterjunitresult"
-            failonerror="false"
-            timeout="${testTimeLimit}"
-            dir="${testRoot}/eclipse"
-            jvm="${env.JAVA_6_HOME}/bin/java"
-            classname="org.eclipse.equinox.launcher.Main">
-            <classpath>
-                <fileset
-                    dir="${testRoot}/eclipse/plugins">
-                    <include
-                        name="org.eclipse.equinox.launcher_*.jar"/>
-                </fileset>
-            </classpath>
-            <jvmarg
-                value="-Xmx512m"/>
-            <jvmarg
-                value="-Dosgi.ws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dosgi.os=${env.BASEOS}"/>
-            <jvmarg
-                value="-Dosgi.arch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-Dws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dos=${env.BASEOS}"/>
-            <jvmarg
-                value="-Darch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-Dnoclean=true"/>
-            <jvmarg
-                value="-DbuildBranch=${buildBranch}"/>
-            <jvmarg
-                value="-DbuildType=${buildType}"/>
-            <jvmarg
-                value="-DbuildId=${buildId}"/>
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <jvmarg
-                value="-Dprojectname=${projectname}"/>
-            <arg
-                value="-nosplash"/>
-            <arg
-                value="-consolelog"/>
-            <arg
-                value="-data"/>
-            <arg
-                value="${testRoot}/overallTestWorkspace"/>
-            <arg
-                value="-application"/>
-            <arg
-                value="org.eclipse.ant.core.antRunner"/>
-            <arg
-                value="-file"/>
-            <arg
-                value="${testRoot}/test.xml"/>
-            <arg
-                value="-logger"/>
-            <arg
-                value="org.apache.tools.ant.DefaultLogger"/>
-            <env
-                key="DISPLAY"
-                value="${env.DISPLAY}"/>
-            <redirector
-                output="${testRoot}/results/fullOutput.txt"
-                error="${testRoot}/results/fullErrorLog.txt"/>
-            <sysproperty
-                key="build.home"
-                value="${env.BUILD_HOME}"/>
-            <sysproperty
-                key="buildDirectory"
-                value="${buildDirectory}"/>
-            <sysproperty
-                key="buildLabel"
-                value="${buildLabel}"/>
-            <sysproperty
-                key="baseLocation"
-                value="${baseLocation}"/>
-            <sysproperty
-                key="testRoot"
-                value="${testRoot}"/>
-            <sysproperty
-                key="testDir"
-                value="${testRoot}"/>
-            <sysproperty
-                key="perf.buildId"
-                value="${buildType}${date}-${time}"/>
-            <sysproperty
-                key="eclipseBuilderDirectory"
-                value="${pde.builder.path}"/>
-            <sysproperty
-                key="buildLabel"
-                value="${buildLabel}"/>
-        </java>
-        <echo
-            message="wtpmasterjunitresult ${wtpmasterjunitresult}"/>
-    </target>
-    <target
-        name="postRunTestEclipse">
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/consolelogs/testLogs"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results">
-                <include
-                    name="*output.txt"/>
-            </fileset>
-        </copy>
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/consolelogs/testSysErrorLogs"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results">
-                <include
-                    name="*error.txt"/>
-            </fileset>
-        </copy>
-        <copy
-            file="${testRoot}/results/fullOutput.txt"
-            toDir="${buildDirectory}/${buildLabel}/testResults/consolelogs/full"
-            overwrite="true"
-            failonerror="false">
-        </copy>
-        <copy
-            file="${testRoot}/results/fullErrorLog.txt"
-            toDir="${buildDirectory}/${buildLabel}/testResults/consolelogs/full"
-            overwrite="true"
-            failonerror="false">
-        </copy>
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/xml"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results/xml">
-                <include
-                    name="*.xml"/>
-            </fileset>
-        </copy>
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/html"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results/html">
-                <include
-                    name="*.html"/>
-            </fileset>
-        </copy>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/jaxws.tests/templateFiles/index.php b/releng.wtpbuilder/distribution/jaxws.tests/templateFiles/index.php
deleted file mode 100644
index a42c883..0000000
--- a/releng.wtpbuilder/distribution/jaxws.tests/templateFiles/index.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<html>
-<head>
-
-<?php
-$parts = explode("/", realpath(".."));
-$label = $parts[count($parts) - 1];
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-</head>
-<body>
-<p><b><font face="Verdana" size="+3">Test Results</font></b></p>
-<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">Unit Test Results for <?php echo "$label"; ?>
-		</font></b></td>
-	</tr>
-</table>
-<p></p>
-<table border="0">
-</table>
-
-<table width="77%" border="1">
-	<tr>
-		<td width="81%"><b>Tests Performed</b></td>
-		<td width="19%"><b>Errors &amp; Failures</b></td>
-	</tr>
-
-	<?
-	$dir = dir("html");
-	while ($anEntry = $dir->read())
-	{
-		if ($anEntry != "." && $anEntry != "..")
-		{
-			$link = "html/".$anEntry;
-			$xml = "xml/".substr($anEntry, 0, strlen($anEntry)-4)."xml";
-			$count = 0;
-			$fileHandle = fopen($xml, "r");
-			while (!feof($fileHandle))
-			{
-				$aLine = fgets($fileHandle, 4096); // Length parameter only optional after 4.2.0
-				$count = $count + substr_count($aLine, '<error');
-			}
-			fclose($fileHandle);
-			if ($count > 0)
-			{
-				echo "<tr><td><a href=\"$link\"><b><font color=\"red\">";
-				echo "$anEntry";
-				echo "</font></b></a></td>";
-				echo "<td><b><font color=\"red\">$count</font></b></td></tr>";
-			}
-			else
-			{
-				echo "<tr><td><a href=\"$link\">";
-				echo "$anEntry";
-				echo "</a></td>";
-				echo "<td>$count</td></tr>";
-			}
-		}
-	}
-	?>
-
-</table>
-<p></p>
-<br>
-<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"> Console output logs <?php echo "$label"; ?>
-		</font></b></td>
-	</tr>
-</table>
-<br>
-These
-<a href="consolelogs/wtptestlog.txt">logs</a>
-contain the console output captured while running the JUnit automated
-tests.
-<br>
-<br>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/jaxws.tests/testScripts/JUNIT.XSL b/releng.wtpbuilder/distribution/jaxws.tests/testScripts/JUNIT.XSL
deleted file mode 100644
index 9cdd80e..0000000
--- a/releng.wtpbuilder/distribution/jaxws.tests/testScripts/JUNIT.XSL
+++ /dev/null
@@ -1,703 +0,0 @@
-<xsl:stylesheet
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="1.0">
-    <xsl:output
-        method="html"
-        indent="yes"/>
-    <xsl:decimal-format
-        decimal-separator="."
-        grouping-separator=","/>
-    <xsl:template
-        match="testsuites">
-        <HTML>
-            <HEAD>
-                <style
-                    type="text/css"> body { font:normal 68%
-                    verdana,arial,helvetica; color:#000000; } table tr
-                    td, table tr th { font-size: 68%; } table.details tr
-                    th{ font-weight: bold; text-align:left;
-                    background:#a6caf0; } table.details tr td{
-                    background:#eeeee0; } p { line-height:1.5em;
-                    margin-top:0.5em; margin-bottom:1.0em; } h1 {
-                    margin: 0px 0px 5px; font: 165%
-                    verdana,arial,helvetica } h2 { margin-top: 1em;
-                    margin-bottom: 0.5em; font: bold 125%
-                    verdana,arial,helvetica } h3 { margin-bottom: 0.5em;
-                    font: bold 115% verdana,arial,helvetica } h4 {
-                    margin-bottom: 0.5em; font: bold 100%
-                    verdana,arial,helvetica } h5 { margin-bottom: 0.5em;
-                    font: bold 100% verdana,arial,helvetica } h6 {
-                    margin-bottom: 0.5em; font: bold 100%
-                    verdana,arial,helvetica } .Error { font-weight:bold;
-                    color:red; } .Failure { font-weight:bold;
-                    color:purple; } .Properties { text-align:right; } </style>
-                <script
-                    language="JavaScript">
-                    var TestCases = new Array(); var cur;
-                    <xsl:for-each
-                        select="./testsuite">
-                        <xsl:apply-templates
-                            select="properties"/>
-                    </xsl:for-each>
-                </script>
-                <script
-                    language="JavaScript"><![CDATA[
-        function displayProperties (name) {
-          var win = window.open('','JUnitSystemProperties','scrollbars=1,resizable=1');
-          var doc = win.document.open();
-          doc.write("<html><head><title>Properties of " + name + "</title>");
-          doc.write("<style>")
-          doc.write("body {font:normal 68% verdana,arial,helvetica;	color:#000000; }");
-          doc.write("table tr td, table tr th { font-size: 68%; }");
-          doc.write("table.properties { border-collapse:collapse; border-left:solid 1 #cccccc; border-top:solid 1 #cccccc; padding:5px; }");
-          doc.write("table.properties th { text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#eeeeee; }");
-          doc.write("table.properties td { font:normal; text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#fffffff; }");
-          doc.write("h3 { margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica }");
-          doc.write("</style>");
-          doc.write("</head><body>");
-          doc.write("<h3>Properties of " + name + "</h3>");
-          doc.write("<div align=\"right\"><a href=\"javascript:window.close();\">Close</a></div>");
-          doc.write("<table class='properties'>");
-          doc.write("<tr><th>Name</th><th>Value</th></tr>");
-          for (prop in TestCases[name]) {
-            doc.write("<tr><th>" + prop + "</th><td>" + TestCases[name][prop] + "</td></tr>");
-          }
-          doc.write("</table>");
-          doc.write("</body></html>");
-          doc.close();
-          win.focus();
-        }
-      ]]>
-                </script>
-            </HEAD>
-            <body>
-                <a
-                    name="top"></a>
-                <xsl:call-template
-                    name="pageHeader"/>
-
-                <!-- Summary part -->
-                <xsl:call-template
-                    name="summary"/>
-                <hr
-                    size="1"
-                    width="95%"
-                    align="left"/>
-
-                <!-- Package List part -->
-                <xsl:call-template
-                    name="packagelist"/>
-                <hr
-                    size="1"
-                    width="95%"
-                    align="left"/>
-
-                <!-- For each package create its part -->
-                <xsl:call-template
-                    name="packages"/>
-                <hr
-                    size="1"
-                    width="95%"
-                    align="left"/>
-
-                <!-- For each class create the  part -->
-                <xsl:call-template
-                    name="classes"/>
-            </body>
-        </HTML>
-    </xsl:template>
-    <!--
-        ==================================================================
-    -->
-    <!--
-        Write a list of all packages with an hyperlink to the anchor of
-    -->
-    <!--
-        of the package name.
-    -->
-    <!--
-        ==================================================================
-    -->
-    <xsl:template
-        name="packagelist">
-        <h2>Packages</h2>
-        Note: package statistics are not computed recursively, they only
-        sum up all of its testsuites numbers.
-        <table
-            class="details"
-            border="0"
-            cellpadding="5"
-            cellspacing="2"
-            width="95%">
-            <xsl:call-template
-                name="testsuite.test.header"/>
-            <!-- list all packages recursively -->
-            <xsl:for-each
-                select="./testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
-                <xsl:sort
-                    select="@package"/>
-                <xsl:variable
-                    name="testsuites-in-package"
-                    select="/testsuites/testsuite[./@package = current()/@package]"/>
-                <xsl:variable
-                    name="testCount"
-                    select="sum($testsuites-in-package/@tests)"/>
-                <xsl:variable
-                    name="errorCount"
-                    select="sum($testsuites-in-package/@errors)"/>
-                <xsl:variable
-                    name="failureCount"
-                    select="sum($testsuites-in-package/@failures)"/>
-                <xsl:variable
-                    name="timeCount"
-                    select="sum($testsuites-in-package/@time)"/>
-
-                <!-- write a summary for the package -->
-                <tr
-                    valign="top">
-                    <!-- set a nice color depending if there is an error/failure -->
-                    <xsl:attribute
-                        name="class">
-						<xsl:choose>
-							<xsl:when
-                        test="$failureCount &gt; 0">Failure</xsl:when>
-							<xsl:when
-                        test="$errorCount &gt; 0">Error</xsl:when>
-						</xsl:choose>
-					</xsl:attribute>
-                    <td>
-                        <a
-                            href="#{@package}">
-                            <xsl:value-of
-                                select="@package"/>
-                        </a>
-                    </td>
-                    <td>
-                        <xsl:value-of
-                            select="$testCount"/>
-                    </td>
-                    <td>
-                        <xsl:value-of
-                            select="$errorCount"/>
-                    </td>
-                    <td>
-                        <xsl:value-of
-                            select="$failureCount"/>
-                    </td>
-                    <td>
-                        <xsl:call-template
-                            name="display-time">
-                            <xsl:with-param
-                                name="value"
-                                select="$timeCount"/>
-                        </xsl:call-template>
-                    </td>
-                </tr>
-            </xsl:for-each>
-        </table>
-    </xsl:template>
-    <!--
-        ==================================================================
-    -->
-    <!--
-        Write a package level report
-    -->
-    <!--
-        It creates a table with values from the document:
-    -->
-    <!--
-        Name | Tests | Errors | Failures | Time
-    -->
-    <!--
-        ==================================================================
-    -->
-    <xsl:template
-        name="packages">
-        <!-- create an anchor to this package name -->
-        <xsl:for-each
-            select="/testsuites/testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
-            <xsl:sort
-                select="@package"/>
-            <a
-                name="{@package}"></a>
-            <h3>
-                Package
-                <xsl:value-of
-                    select="@package"/>
-            </h3>
-            <table
-                class="details"
-                border="0"
-                cellpadding="5"
-                cellspacing="2"
-                width="95%">
-                <xsl:call-template
-                    name="testsuite.test.header"/>
-
-                <!-- match the testsuites of this package -->
-                <xsl:apply-templates
-                    select="/testsuites/testsuite[./@package = current()/@package]"
-                    mode="print.test"/>
-            </table>
-            <a
-                href="#top">Back to top</a>
-            <p/>
-            <p/>
-        </xsl:for-each>
-    </xsl:template>
-    <xsl:template
-        name="classes">
-        <xsl:for-each
-            select="testsuite">
-            <xsl:sort
-                select="@name"/>
-            <!-- create an anchor to this class name -->
-            <a
-                name="{@name}"></a>
-            <h3>
-                TestCase
-                <xsl:value-of
-                    select="@name"/>
-            </h3>
-            <table
-                class="details"
-                border="0"
-                cellpadding="5"
-                cellspacing="2"
-                width="95%">
-                <xsl:call-template
-                    name="testcase.test.header"/>
-                <!--
-                    test can even not be started at all (failure to load
-                    the class) so report the error directly
-                -->
-                <xsl:if
-                    test="./error">
-                    <tr
-                        class="Error">
-                        <td
-                            colspan="4">
-                            <xsl:apply-templates
-                                select="./error"/>
-                        </td>
-                    </tr>
-                </xsl:if>
-                <xsl:apply-templates
-                    select="./testcase"
-                    mode="print.test"/>
-            </table>
-            <div
-                class="Properties">
-                <a>
-                    <xsl:attribute
-                        name="href">javascript:displayProperties('<xsl:value-of
-                        select="@package"/>.<xsl:value-of
-                        select="@name"/>');</xsl:attribute>
-                    Properties &gt;&gt;
-                </a>
-            </div>
-            <p/>
-            <a
-                href="#top">Back to top</a>
-        </xsl:for-each>
-    </xsl:template>
-    <xsl:template
-        name="summary">
-        <h2>Summary</h2>
-        <xsl:variable
-            name="testCount"
-            select="sum(testsuite/@tests)"/>
-        <xsl:variable
-            name="errorCount"
-            select="sum(testsuite/@errors)"/>
-        <xsl:variable
-            name="failureCount"
-            select="sum(testsuite/@failures)"/>
-        <xsl:variable
-            name="timeCount"
-            select="sum(testsuite/@time)"/>
-        <xsl:variable
-            name="successRate"
-            select="($testCount - $failureCount - $errorCount) div $testCount"/>
-        <table
-            class="details"
-            border="0"
-            cellpadding="5"
-            cellspacing="2"
-            width="95%">
-            <tr
-                valign="top">
-                <th>Tests</th>
-                <th>Failures</th>
-                <th>Errors</th>
-                <th>Success rate</th>
-                <th>Time</th>
-            </tr>
-            <tr
-                valign="top">
-                <xsl:attribute
-                    name="class">
-				<xsl:choose>
-					<xsl:when
-                    test="$failureCount &gt; 0">Failure</xsl:when>
-					<xsl:when
-                    test="$errorCount &gt; 0">Error</xsl:when>
-				</xsl:choose>
-			</xsl:attribute>
-                <td>
-                    <xsl:value-of
-                        select="$testCount"/>
-                </td>
-                <td>
-                    <xsl:value-of
-                        select="$failureCount"/>
-                </td>
-                <td>
-                    <xsl:value-of
-                        select="$errorCount"/>
-                </td>
-                <td>
-                    <xsl:call-template
-                        name="display-percent">
-                        <xsl:with-param
-                            name="value"
-                            select="$successRate"/>
-                    </xsl:call-template>
-                </td>
-                <td>
-                    <xsl:call-template
-                        name="display-time">
-                        <xsl:with-param
-                            name="value"
-                            select="$timeCount"/>
-                    </xsl:call-template>
-                </td>
-            </tr>
-        </table>
-        <table
-            border="0"
-            width="95%">
-            <tr>
-                <td
-                    style="text-align: justify;">
-                    Note:
-                    <i>failures</i>
-                    are anticipated and checked for with assertions
-                    while
-                    <i>errors</i>
-                    are unanticipated.
-                </td>
-            </tr>
-        </table>
-    </xsl:template>
-    <!--
-        Write properties into a JavaScript data structure. This is based
-        on the original idea by Erik Hatcher (erik@hatcher.net)
-    -->
-    <xsl:template
-        match="properties">
-        cur = TestCases['
-        <xsl:value-of
-            select="../@package"/>
-        .
-        <xsl:value-of
-            select="../@name"/>
-        '] = new Array();
-        <xsl:for-each
-            select="property">
-            <xsl:sort
-                select="@name"/>
-            cur['
-            <xsl:value-of
-                select="@name"/>
-            '] = '
-            <xsl:call-template
-                name="JS-escape">
-                <xsl:with-param
-                    name="string"
-                    select="@value"/>
-            </xsl:call-template>
-            ';
-        </xsl:for-each>
-    </xsl:template>
-
-    <!-- Page HEADER -->
-    <xsl:template
-        name="pageHeader">
-        <h1>Unit Test Results</h1>
-        <table
-            width="100%">
-            <tr>
-                <td
-                    align="left"></td>
-                <td
-                    align="right">
-                    Designed for use with
-                    <a
-                        href='http://www.junit.org'>JUnit</a>
-                    and
-                    <a
-                        href='http://jakarta.apache.org/ant'>Ant</a>
-                    .
-                </td>
-            </tr>
-        </table>
-        <hr
-            size="1"/>
-    </xsl:template>
-    <xsl:template
-        match="testsuite"
-        mode="header">
-        <tr
-            valign="top">
-            <th
-                width="80%">Name</th>
-            <th>Tests</th>
-            <th>Errors</th>
-            <th>Failures</th>
-            <th
-                nowrap="nowrap">Time(s)</th>
-        </tr>
-    </xsl:template>
-
-    <!-- class header -->
-    <xsl:template
-        name="testsuite.test.header">
-        <tr
-            valign="top">
-            <th
-                width="80%">Name</th>
-            <th>Tests</th>
-            <th>Errors</th>
-            <th>Failures</th>
-            <th
-                nowrap="nowrap">Time(s)</th>
-        </tr>
-    </xsl:template>
-
-    <!-- method header -->
-    <xsl:template
-        name="testcase.test.header">
-        <tr
-            valign="top">
-            <th>Name</th>
-            <th>Status</th>
-            <th
-                width="80%">Type</th>
-            <th
-                nowrap="nowrap">Time(s)</th>
-        </tr>
-    </xsl:template>
-
-
-    <!-- class information -->
-    <xsl:template
-        match="testsuite"
-        mode="print.test">
-        <tr
-            valign="top">
-            <!-- set a nice color depending if there is an error/failure -->
-            <xsl:attribute
-                name="class">
-			<xsl:choose>
-				<xsl:when
-                test="@failures[.&gt; 0]">Failure</xsl:when>
-				<xsl:when
-                test="@errors[.&gt; 0]">Error</xsl:when>
-			</xsl:choose>
-		</xsl:attribute>
-
-            <!-- print testsuite information -->
-            <td>
-                <a
-                    href="#{@name}">
-                    <xsl:value-of
-                        select="@name"/>
-                </a>
-            </td>
-            <td>
-                <xsl:value-of
-                    select="@tests"/>
-            </td>
-            <td>
-                <xsl:value-of
-                    select="@errors"/>
-            </td>
-            <td>
-                <xsl:value-of
-                    select="@failures"/>
-            </td>
-            <td>
-                <xsl:call-template
-                    name="display-time">
-                    <xsl:with-param
-                        name="value"
-                        select="@time"/>
-                </xsl:call-template>
-            </td>
-        </tr>
-    </xsl:template>
-    <xsl:template
-        match="testcase"
-        mode="print.test">
-        <tr
-            valign="top">
-            <xsl:attribute
-                name="class">
-			<xsl:choose>
-				<xsl:when
-                test="failure | error">Error</xsl:when>
-			</xsl:choose>
-		</xsl:attribute>
-            <td>
-                <xsl:value-of
-                    select="@name"/>
-            </td>
-            <xsl:choose>
-                <xsl:when
-                    test="failure">
-                    <td>Failure</td>
-                    <td>
-                        <xsl:apply-templates
-                            select="failure"/>
-                    </td>
-                </xsl:when>
-                <xsl:when
-                    test="error">
-                    <td>Error</td>
-                    <td>
-                        <xsl:apply-templates
-                            select="error"/>
-                    </td>
-                </xsl:when>
-                <xsl:otherwise>
-                    <td>Success</td>
-                    <td></td>
-                </xsl:otherwise>
-            </xsl:choose>
-            <td>
-                <xsl:call-template
-                    name="display-time">
-                    <xsl:with-param
-                        name="value"
-                        select="@time"/>
-                </xsl:call-template>
-            </td>
-        </tr>
-    </xsl:template>
-    <xsl:template
-        match="failure">
-        <xsl:call-template
-            name="display-failures"/>
-    </xsl:template>
-    <xsl:template
-        match="error">
-        <xsl:call-template
-            name="display-failures"/>
-    </xsl:template>
-
-    <!-- Style for the error and failure in the tescase template -->
-    <xsl:template
-        name="display-failures">
-        <xsl:choose>
-            <xsl:when
-                test="not(@message)">
-                N/A
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of
-                    select="@message"/>
-            </xsl:otherwise>
-        </xsl:choose>
-        <!-- display the stacktrace -->
-        <code>
-            <p/>
-            <xsl:call-template
-                name="br-replace">
-                <xsl:with-param
-                    name="word"
-                    select="."/>
-            </xsl:call-template>
-        </code>
-        <!--
-            the later is better but might be problematic for non-21"
-            monitors...
-        -->
-        <!--pre><xsl:value-of select="."/></pre-->
-    </xsl:template>
-    <xsl:template
-        name="JS-escape">
-        <xsl:param
-            name="string"/>
-        <xsl:choose>
-            <!--
-                something isn't right here, basically all single quotes
-                need to be replaced with backslash-single-quote
-                <xsl:when test="contains($string,'&apos;')">
-                <xsl:value-of
-                select="substring-before($string,'&apos;')"/> \&apos;
-                <xsl:call-template name="JS-escape"> <xsl:with-param
-                name="string"
-                select="substring-after($string,'&apos;')"/>
-                </xsl:call-template> </xsl:when>
-            -->
-            <xsl:when
-                test="contains($string,'\')">
-                <xsl:value-of
-                    select="substring-before($string,'\')"/>
-                \\
-                <xsl:call-template
-                    name="JS-escape">
-                    <xsl:with-param
-                        name="string"
-                        select="substring-after($string,'\')"/>
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of
-                    select="$string"/>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-    <!--
-        template that will convert a carriage return into a br tag
-        @param word the text from which to convert CR to BR tag
-    -->
-    <xsl:template
-        name="br-replace">
-        <xsl:param
-            name="word"/>
-        <xsl:choose>
-            <xsl:when
-                test="contains($word,'&#xA;')">
-                <xsl:value-of
-                    select="substring-before($word,'&#xA;')"/>
-                <br/>
-                <xsl:call-template
-                    name="br-replace">
-                    <xsl:with-param
-                        name="word"
-                        select="substring-after($word,'&#xA;')"/>
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of
-                    select="$word"/>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-    <xsl:template
-        name="display-time">
-        <xsl:param
-            name="value"/>
-        <xsl:value-of
-            select="format-number($value,'0.000')"/>
-    </xsl:template>
-    <xsl:template
-        name="display-percent">
-        <xsl:param
-            name="value"/>
-        <xsl:value-of
-            select="format-number($value,'0.00%')"/>
-    </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/jaxws.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/jaxws.tests/testScripts/test.xml
deleted file mode 100644
index 96c6ddc..0000000
--- a/releng.wtpbuilder/distribution/jaxws.tests/testScripts/test.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<project
-    name="Automated Eclipse Testing"
-    default="all"
-    basedir=".">
-    <property
-        environment="env"/>
-
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-    <echo
-        level="info"
-        message="starting Automated Eclipse Testing"/>
-    <echo
-        level="debug"
-        message="basedir: ${basedir}"/>
-    <echo
-        level="debug"
-        message="testRoot: ${testRoot}"/>
-    <fail
-        message="testRoot must be set"
-        unless="testRoot"/>
-
-    <!--properties file containing the build information-->
-    <property
-        file="${buildDirectory}/label.properties"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-    <!--default directory where test-eclipse will be installed-->
-    <property
-        name="install"
-        value="${testRoot}"/>
-    <!--
-        name that can be added to report name to identify which platform
-        tests results come from
-    -->
-    <property
-        name="platform"
-        value=""/>
-
-    <!-- The root of the eclipse installation -->
-    <property
-        name="eclipse-home"
-        value="${testRoot}${dropinsFolder}/eclipse/"/>
-    <!--
-        The directory that will contain the xml and html results from
-        the tests that are run
-    -->
-    <property
-        name="results"
-        value="${testRoot}/results"/>
-    <property
-        name="library-file"
-        value="${testRoot}/wtp-junit-tests.xml"/>
-    <target
-        name="init">
-    </target>
-    <target
-        name="all"
-        depends="init">
-        <echo
-            level="info"
-            message="Starting Unit Tests"/>
-        <!--
-            unlike other ant tasks, subant defaults to false for
-            inheritall!
-        -->
-        <subant
-            target=""
-            inheritall="true">
-            <fileset
-                dir="${eclipse-home}/plugins/">
-                <exclude
-                    name="**/*performance*/test.xml"/>
-                <include
-                    name="**/test.xml"/>
-            </fileset>
-        </subant>
-        <echo
-            level="info"
-            message="Ended Unit Tests"/>
-        <antcall
-            target="genHtml"/>
-    </target>
-    <target
-        name="genHtml"
-        description="Generates HTML results with provided JUNIT.XSL provided"
-        unless="genHtml.disable">
-        <xslt
-            style="JUNIT.XSL"
-            basedir="${results}/xml"
-            destdir="${results}/html"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/jaxws.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/jaxws.tests/testScripts/wtp-junit-tests.xml
deleted file mode 100644
index 62f4501..0000000
--- a/releng.wtpbuilder/distribution/jaxws.tests/testScripts/wtp-junit-tests.xml
+++ /dev/null
@@ -1,317 +0,0 @@
-<?xml version="1.0"?>
-<project
-    name="JUnit tests"
-    basedir=".">
-    <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-    <target
-        name="init">
-        <property
-            name="junit-report-output"
-            value="${testRoot}/results"/>
-        <mkdir
-            dir="${junit-report-output}/raw"/>
-        <!--
-            if not otherwise set, be sure extraVMargs is at least some
-            string, even if unused string. 
-            
-            Remember, though, extraVMArgs can contain more than one extra arg, 
-            so much be passed to VM as a "line", not "value". 
-        -->
-        <property
-            name="extraVMargs"
-            value="-DextraVMargsunused=notused"/>
-
-        <!-- if not otherwise set, use a unique workspace name -->
-        <property
-            name="data-dir"
-            value="${testRoot}/junitworkspaces/workspace-${classname}"/>
-        <property
-            name="testRoot"
-            value="${testRoot}"/>
-        <!--
-            Some common values, of milliseconds to more recognizable
-            units: 14400000: 4 hours 7200000: 2 hours 3600000: 1 hour
-            1800000: 30 minutes 600000: 10 minutes
-        -->
-        <property
-            name="timeout"
-            value="1800000"/>
-        <property
-            name="junit-report-output"
-            value="${junit-report-output}"/>
-        <property
-            name="formatter"
-            value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter"/>
-        <property
-            name="test-output"
-            value="${junit-report-output}/raw/${classname}.xml"/>
-        <property
-            name="jvm"
-            value="${env.JAVA_6_HOME}/bin/java"/>
-        <dirname
-            file="${ant.file}"
-            property="currentDir"/>
-        <echo
-            level="debug"
-            message="data-dir: ${data-dir}"/>
-        <echo
-            level="debug"
-            message="plugin-name: ${plugin-name}"/>
-        <echo
-            level="debug"
-            message="classname: ${classname}"/>
-        <echo
-            level="info"
-            message="extraVMargs: ${extraVMargs}"/>
-        <echo
-            level="debug"
-            message="timeout: ${timeout}"/>
-        <echo
-            level="debug"
-            message="testRoot: ${testRoot}"/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="debug"
-            message="eclipse-home: ${eclipse-home}"/>
-        <echo
-            level="debug"
-            message="junit-report-output: ${junit-report-output}"/>
-        <echo
-            level="debug"
-            message="test-output: ${test-output}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="buildLabel: ${buildLabel}"/>
-        <echo
-            level="debug"
-            message="jvm: ${jvm}"/>
-    </target>
-    <target
-        name="core-test"
-        depends="init">
-        <echo
-            level="info"
-            message="test-type: core-test"/>
-        <ant
-            antfile="${ant.file}"
-            dir="${currentDir}"
-            target="eclipse-test">
-            <property
-                name="application"
-                value="org.eclipse.test.coretestapplication"/>
-        </ant>
-    </target>
-    <target
-        name="ui-test"
-        depends="init">
-        <echo
-            level="info"
-            message="test-type: ui-test"/>
-        <ant
-            antfile="${ant.file}"
-            dir="${currentDir}"
-            target="eclipse-test">
-            <property
-                name="application"
-                value="org.eclipse.test.uitestapplication"/>
-        </ant>
-    </target>
-    <target
-        name="eclipse-test"
-        description="Runs the specified classname as a plug-in test.">
-        <echo
-            level="info"
-            message="Running ${classname}"/>
-        <echo
-            level="debug"
-            message="Result file: ${junit-report-output}/${classname}.xml."/>
-        <echo
-            level="debug"
-            message="DISPLAY: ${env.DISPLAY}"/>
-        <mkdir
-            dir="${buildDirectory}/${buildLabel}/httplogstest"/>
-        <echo
-            message="http log messages to: ${buildDirectory}/${buildLabel}/httplogstest"/>
-    	
-       <condition
-           property="xulRunnerParam"
-           value="org.eclipse.swt.browser.XULRunnerPath"
-           else="XULRunnerPathNotSpecified">
-           <isset
-               property="env.WTP_XULRUNNER"/>
-       </condition>
-        <echo
-            message="xulRunnerParam: ${xulRunnerParam}"/>
-        <echo
-            message="WTP_XULRUNNER: ${env.WTP_XULRUNNER}"/>
-        <!--
-            If there is not exactly one launcher in the stack, we'd best
-            fail fast, since we are not expecting that, and may indicate
-            an installation that would produce unpredictable results
-        -->
-        <!--
-            requires ant 1.7, and at this point, we're running 1.6 from
-            eclipse ... <condition property="expectedNumberOfLaunchers">
-            <resourcecount when="equal" count="1" > <fileset
-            dir="${testRoot}/eclipse/plugins"> <include
-            name="org.eclipse.equinox.launcher_*.jar" /> </fileset>
-            </resourcecount> </condition> <fail message="Did not find
-            expected number of launcher jars. Check installation."
-            unless="expectedNumberOfLaunchers" />
-        -->
-        <java
-            taskname="suiteUnitTest"
-            fork="true"
-            resultProperty="suitejunitresult"
-            failonerror="false"
-            timeout="${timeout}"
-            dir="${testRoot}/eclipse"
-            jvm="${jvm}"
-            classname="org.eclipse.equinox.launcher.Main">
-            <classpath>
-                <fileset
-                    dir="${testRoot}/eclipse/plugins">
-                    <include
-                        name="org.eclipse.equinox.launcher_*.jar"/>
-                </fileset>
-            </classpath>
-            <jvmarg
-                value="-Xmx512m"/>
-            <jvmarg
-                value="-Dosgi.ws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dosgi.os=${env.BASEOS}"/>
-            <jvmarg
-                value="-Dosgi.arch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-DbuildLabel=${buildLabel}"/>
-            <jvmarg
-                value="-DbuildDirectory=${buildDirectory}"/>
-            <jvmarg
-                value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
-            <jvmarg
-                value="-DurlLogLocation=${buildDirectory}/${buildLabel}/httplogstest/outgoinghttplog-${plugin-name}.log"/>
-            <jvmarg
-                value="-Dwtp.autotest.noninteractive=true"/>
-            <jvmarg
-                line="${extraVMargs}"/>
-            <jvmarg
-                value="-Declipse.consolelog=true"/>
-            <jvmarg
-                value="-Dosgi.debug"/>
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <jvmarg
-                value="-Dprojectname=${projectname}"/>
-        	
-              <jvmarg
-                  value="-D${xulRunnerParam}=${env.WTP_XULRUNNER}"/> 	
-        	
-        	
-            <arg
-                value="-nosplash"/>
-            <arg
-                value="-data"/>
-            <arg
-                value="${data-dir}"/>
-            <arg
-                value="-application"/>
-            <arg
-                value="${application}"/>
-            <arg
-                value="formatter=${formatter},${test-output}"/>
-            <arg
-                value="-testPluginName"/>
-            <arg
-                value="${plugin-name}"/>
-            <arg
-                value="-className"/>
-            <arg
-                value="${classname}"/>
-            <env
-                key="DISPLAY"
-                value="${env.DISPLAY}"/>
-            <redirector
-                output="${junit-report-output}/${classname}.output.txt"
-                error="${junit-report-output}/${classname}.error.txt"/>
-        </java>
-        <echo
-            level="info"
-            message="suitejunitresult: ${suitejunitresult}"/>
-        <antcall
-            target="summarizeFailure"/>
-        <antcall
-            target="collect-results"/>
-    </target>
-    <target
-        name="collect-results">
-        <dirname
-            property="output-dir"
-            file="${test-output}"/>
-        <basename
-            property="output-file-name"
-            file="${test-output}"/>
-        <mkdir
-            dir="${junit-report-output}/xml"/>
-        <junitreport
-            todir="${junit-report-output}/xml"
-            tofile="${classname}.xml">
-            <fileset
-                dir="${output-dir}">
-                <include
-                    name="${output-file-name}"/>
-            </fileset>
-        </junitreport>
-        <mkdir
-            dir="${junit-report-output}/html"/>
-        <xslt
-            style="${testRoot}/JUNIT.XSL"
-            basedir="${junit-report-output}"
-            includes="${classname}.xml"
-            destdir="${junit-report-output}/html"/>
-    </target>
-    <target
-        name="collect">
-        <!--
-            deprecated, each test.xml uses it, and we should remove,
-            eventually
-        -->
-        <echo
-            message="Deprecated. There is no need to call the collect task. It no longer does anything. Please remove from your test.xml file"/>
-    </target>
-    <target
-        name="summarizeFailure"
-        depends="checkFailure"
-        if="doFailure">
-        <echo
-            append="true"
-            file="${buildDirectory}/junitFailureList.log">${plugin-name}${line.separator}</echo>
-    </target>
-    <target
-        name="checkFailure">
-        <condition
-            property="doFailure">
-            <not>
-                <equals
-                    arg1="${suitejunitresult}"
-                    arg2="0"
-                    trim="true"/>
-            </not>
-        </condition>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/jaxws.tests/testdependency.xml b/releng.wtpbuilder/distribution/jaxws.tests/testdependency.xml
deleted file mode 100644
index e49e666..0000000
--- a/releng.wtpbuilder/distribution/jaxws.tests/testdependency.xml
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-    <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <fail
-        message="Required property file does not exist: ${keyCfgFile}">
-        <condition>
-            <not>
-                <available
-                    file="${keyCfgFile}"/>
-            </not>
-        </condition>
-    </fail>
-    <property
-        file="${keyCfgFile}"/>
-    <condition
-        property="getprereq.eclipse">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.eclipseplatform">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.emf">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.emfxsd">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.emfvalidation">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.gef">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.dtp">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.wst">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.jst">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.wtp">
-        <istrue
-            value="true"/>
-    </condition>
-    <target
-        name="get">
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined, which we do later with
-            statements such if="${groupId}.url"
-        -->
-        <property
-            file="${dependency.properties}"/>
-        <antcall
-            target="prereq.emf"/>
-        <antcall
-            target="prereq.emfxsd"/>
-        <antcall
-            target="prereq.emfvalidation"/>
-        <antcall
-            target="prereq.gef"/>
-        <antcall
-            target="prereq.dtp"/>
-        <antcall
-            target="prereq.wst"/>
-        <antcall
-            target="prereq.jst"/>
-        <antcall
-            target="prereq.wtp"/>
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="eclipseTestFramework"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.eclipse"
-        if="getprereq.eclipse">
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.eclipseplatform"
-        if="getprereq.eclipseplatform">
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="eclipseplatform"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emf"
-        if="getprereq.emf">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfxsd"
-        if="getprereq.emfxsd">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfvalidation"
-        if="getprereq.emfvalidation">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="emfvalidation"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.gef"
-        if="getprereq.gef">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.dtp"
-        if="getprereq.dtp">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="dtp"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wst"
-        if="getprereq.wst">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="wst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.jst"
-        if="getprereq.jst">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="jst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wtp"
-        if="getprereq.wtp">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="wtp"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstallBase"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-    <target
-        name="getAndInstallDropins"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}${dropinsFolder}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/jsdt.build/build.xml b/releng.wtpbuilder/distribution/jsdt.build/build.xml
deleted file mode 100644
index 081d161..0000000
--- a/releng.wtpbuilder/distribution/jsdt.build/build.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<project
-    default="build"
-    basedir=".">
-    <fail
-        unless="wtp.builder.home"/>
-    <property
-        file="${wtp.builder.home}/build.properties"/>
-    <target
-        name="build"
-        depends="getBaseBuilder">
-        <dirname
-            file="${ant.file}"
-            property="distribution.wtp.build.dir"/>
-        <property
-            name="buildTargets"
-            value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
-        <!--
-            for this distribution, dependencies come from project's
-            releng map project
-        -->
-        <property
-            name="dependency.properties"
-            value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-
-        <!-- calling label.xml to createg label.properties file -->
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-        <echo
-            level="info"
-            message="invoking buildTargets: ${buildTargets} to build for each component"/>
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="jsdt"/>
-        </ant>
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="jsdt_sdk"/>
-        </ant>
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="jsdt_tests"/>
-            <property
-                name="eclipseBuildFailOnError"
-                value="false"/>
-        </ant>
-
-        <!-- package -->
-        <antcall
-            target="package"/>
-    </target>
-
-    <!-- invoking runbuild.xml targetting getBaseBuilder -->
-    <target
-        name="getBaseBuilder"
-        if="eclipse.builder.fetch">
-        <dirname
-            file="${ant.file}"
-            property="wtbuilder.dir"/>
-        <property
-            name="buildTargets"
-            value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
-        <echo
-            level="info"
-            message="invoking buildTargets: ${buildTargets} -> getBaseBuilder"/>
-        <ant
-            antfile="${buildTargets}"
-            target="getBaseBuilder"/>
-    </target>
-    <target
-        name="package">
-        <!--
-            post, post packaging, for WTP ... "manually" assemble the
-            desired zips
-        -->
-        <!-- nothing to assemble right now -->
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/jsdt.site/build.xml b/releng.wtpbuilder/distribution/jsdt.site/build.xml
deleted file mode 100644
index 39fc90e..0000000
--- a/releng.wtpbuilder/distribution/jsdt.site/build.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-<project
-    name="Build specific targets and properties"
-    default="build"
-    basedir=".">
-    <!--
-        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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- = = = end standard properties pattern = = = -->
-    <echo
-        message="ant.file: ${ant.file}"/>
-    <target
-        name="build">
-    	<mkdir dir="${buildDirectory}/${buildLabel} "/>
-        <java
-            jar="${eclipse.launcher}"
-            fork="true"
-            failonerror="true">
-            <jvmarg
-                value="-Dosgi.ws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dosgi.os=${env.BASEOS}"/>
-            <jvmarg
-                value="-Dosgi.arch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-Dbuild.donottagmaps=${build.donottagmaps}"/>
-            <jvmarg
-                value="-DbuildBranch=${buildBranch}"/>
-            <jvmarg
-                value="-DbuildType=${buildType}"/>
-            <jvmarg
-                value="-DbuildId=${buildId}"/>
-            <jvmarg
-                value="-DmapVersionTag=${mapVersionTag}"/>
-            <jvmarg
-                value="-Dbuild.distribution=${build.distribution}"/>
-            <jvmarg
-                value="-DbuildDirectory=${buildDirectory}"/>
-            <jvmarg
-                value="-Dwtp.builder.home=${wtp.builder.home}"/>
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <jvmarg
-                value="-Dprojectname=${projectname}"/>
-            <jvmarg
-                value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
-            <jvmarg
-                value="-DurlLogLocation=${buildDirectory}/${buildLabel}/outgoinghttplogfromsitebuild.log"/>
-            <arg
-                value="-data"/>
-            <arg
-                value="${basedir}/workspace"/>
-            <arg
-                value="-application"/>
-            <arg
-                value="org.eclipse.ant.core.antRunner"/>
-            <arg
-                value="-buildfile"/>
-            <arg
-                value="${ant.file}"/>
-            <arg
-                value="publish"/>
-        </java>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Steps to do to publish the build results -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="publish">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-        <property
-            file="${buildDirectory}/label.properties"/>
-        <property
-            name="publish.xml"
-            value="${component.dir}/publish.xml"/>
-        <property
-            name="indexFileName"
-            value="index.php"/>
-        <property
-            name="result"
-            value="${buildDirectory}/${buildLabel}"/>
-        <property
-            name="indexTemplateFilename"
-            value="index.html.template.php"/>
-        <copy
-            file="${wtp.builder.home}/distribution/wtp.site/templateFiles/${indexTemplateFilename}"
-            tofile="${buildDirectory}/${indexFileName}"/>
-        <condition
-            property="isBuildTested"
-            value="true">
-            <available
-                file="${buildDirectory}/${buildLabel}/testResults/html"/>
-        </condition>
-        <ant
-            antfile="${publish.xml}"
-            dir="${component.dir}">
-            <property
-                name="dropTokenList"
-                value="%wtpruntime%,%wtpsdk%,%wtptest%,%wst%,%wst-sdk%,%wst-tests%,%jst-tests%,%wst-perf-tests%,%jst-perf-tests%,%jpt-runtime%,%jpt-sdk%,%jpt-tests%"/>
-            <property
-                name="webtoolsDownloadURL"
-                value="http://www.eclipse.org/downloads/download.php?file=/webtools/committers/drops"/>
-            <property
-                name="buildBranch"
-                value="${buildBranch}"/>
-            <property
-                name="isBuildTested"
-                value="${isBuildTested}"/>
-            <property
-                name="indexTemplateFilename"
-                value="${indexTemplateFilename}"/>
-        </ant>
-
-        <!--  Get the build map over for the results to point to. -->
-        <copy
-            file="${buildDirectory}/directory.txt"
-            tofile="${result}/directory.txt"/>
-
-        <!-- Copy info for build identification -->
-        <copy
-            file="${buildDirectory}/buildmachineinfo.properties"
-            tofile="${result}/buildmachineinfo.properties"/>
-
-        <!-- http access logs -->
-        <copy
-            todir="${result}/"
-            failonerror="false">
-            <fileset
-                dir="${buildDirectory}"
-                includes="*.log"/>
-        </copy>
-
-        <!-- ant build log, from control directory -->
-        <copy
-            todir="${result}/"
-            failonerror="false">
-            <fileset
-                dir="${env.ANT_WORKING}/${projectname}"
-                includes="antBuilderOutput.log"/>
-        </copy>
-
-
-
-        <!-- final count files -->
-        <countBuildFiles
-            sourceDirectory="${buildDirectory}/${buildLabel}"
-            filterString=".zip,.tar.gz"
-            outputFile="${buildDirectory}/${buildLabel}/files.count"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/jsdt.site/compilerXMLOutputToHTML.xsl b/releng.wtpbuilder/distribution/jsdt.site/compilerXMLOutputToHTML.xsl
deleted file mode 100644
index ffc7905..0000000
--- a/releng.wtpbuilder/distribution/jsdt.site/compilerXMLOutputToHTML.xsl
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet
-    version="1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-    <xsl:output
-        method="html"
-        indent="yes"/>
-    <xsl:template
-        match="/">
-        <html>
-            <body>
-                <xsl:apply-templates
-                    select="compiler"/>
-            </body>
-        </html>
-    </xsl:template>
-    <xsl:template
-        match="compiler">
-        <h2>Compiler Report</h2>
-        <p>
-            Compiler:
-            <xsl:value-of
-                select="@name"/>
-            <xsl:text>   </xsl:text>
-            Version:
-            <xsl:value-of
-                select="@version"/>
-        </p>
-        <xsl:apply-templates
-            select="stats"/>
-        <xsl:apply-templates
-            select="sources"/>
-    </xsl:template>
-    <xsl:template
-        name="stats"
-        match="stats">
-        <p>
-            Number of source files:
-            <xsl:value-of
-                select="count(..//source)"/>
-            Number of classfiles:
-            <xsl:value-of
-                select="number_of_classfiles/@value"/>
-        </p>
-        <p>
-            Problems:
-            <xsl:value-of
-                select="problem_summary/@problems"/>
-            (Errors:
-            <xsl:value-of
-                select="problem_summary/@errors"/>
-            Warnings:
-            <xsl:value-of
-                select="problem_summary/@warnings"/>
-            )
-        </p>
-    </xsl:template>
-    <xsl:template
-        name="sources"
-        match="sources">
-        <xsl:if
-            test="count(source) > 0">
-            <dl>
-                <xsl:for-each
-                    select="source">
-                    <xsl:variable
-                        name="package"
-                        select="normalize-space(@package)">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="path"
-                        select="normalize-space(@path)">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="classname"
-                        select="substring-after($path, $package)">
-                    </xsl:variable>
-                    <xsl:if
-                        test="count(problems) > 0">
-                        <dt
-                            style="font-weight: bold; color: black">
-                            Source File:
-                            <xsl:value-of
-                                select="$package"/>
-                            <xsl:value-of
-                                select="$classname"/>
-                        </dt>
-                        <xsl:apply-templates
-                            select="problems">
-                            <xsl:with-param
-                                name="classname">
-                                <xsl:value-of
-                                    select="$classname"/>
-                            </xsl:with-param>
-                        </xsl:apply-templates>
-                    </xsl:if>
-                </xsl:for-each>
-            </dl>
-        </xsl:if>
-    </xsl:template>
-    <xsl:template
-        match="problems">
-        <xsl:param
-            name="classname"/>
-        <xsl:for-each
-            select="problem">
-            <dd
-                style="font-weight: normal; color: black">
-                <xsl:value-of
-                    select="position()"/>
-                <xsl:text>.  </xsl:text>
-                <xsl:value-of
-                    select="@severity"/>
-                <xsl:text>:  </xsl:text>
-                <xsl:value-of
-                    select="@id"/>
-                <xsl:variable
-                    name="lineNumber"
-                    select="@line">
-                </xsl:variable>
-                <xsl:for-each
-                    select="message">
-                    <p
-                        style="margin-left: +.5in; font-size: -1; margin-top: 0;margin-bottom:0;">
-                        <small>
-                            <xsl:value-of
-                                select="@value"/>
-                        </small>
-                    </p>
-                </xsl:for-each>
-                <xsl:for-each
-                    select="source_context">
-                    <xsl:variable
-                        name="pre"
-                        select="substring(@value,0,(@sourceStart + 1))">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="main"
-                        select="substring(@value,(@sourceStart + 1),(((@sourceEnd + 1) - (@sourceStart + 1)) + 1))">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="end"
-                        select="substring(@value,(@sourceEnd + 2))">
-                    </xsl:variable>
-                    <p
-                        style="margin-left: +.5in; font-size: -2; margin-top: 0;margin-bottom:0;">
-                        <xsl:value-of
-                            select="substring($classname,2)"/>
-                        :
-                    </p>
-                    <p
-                        style="margin-left: +.5in; font-size: -2;font-family: monospace; margin-top: 0;margin-bottom:0;">
-                        <xsl:value-of
-                            select="$lineNumber"/>
-                        :
-                        <xsl:value-of
-                            select="$pre"/>
-                        <b>
-                            <u>
-                                <xsl:value-of
-                                    select="$main"/>
-                            </u>
-                        </b>
-                        <xsl:value-of
-                            select="$end"/>
-                    </p>
-                </xsl:for-each>
-            </dd>
-        </xsl:for-each>
-    </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/jsdt.site/publish.xml b/releng.wtpbuilder/distribution/jsdt.site/publish.xml
deleted file mode 100644
index 71afb65..0000000
--- a/releng.wtpbuilder/distribution/jsdt.site/publish.xml
+++ /dev/null
@@ -1,821 +0,0 @@
-<project
-    name="Publish Build"
-    default="default"
-    basedir=".">
-    <!--
-        Properties that must be passed to this script: buildDirectory:
-        Path to perform the build in. (A working directory) buildType:
-        Type of build (nightly, integration etc.) buildId: Build name
-        buildLabel: <buildType>-<buildName>-<timestamp>
-    -->
-    <property
-        environment="env"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be provided to publish"/>
-    <fail
-        unless="buildLabel"
-        message="buildLabel must be provided to publish"/>
-    <fail
-        unless="wtp.builder.home"
-        message="wtp.builder.home must be provided to publish"/>
-    <fail
-        unless="build.distribution"
-        message="build.distribution must be provided to publish"/>
-    <property
-        name="resultDir"
-        value="${buildDirectory}/${buildLabel}"/>
-    <!--name of generated index page-->
-    <property
-        name="indexFileName"
-        value="index.php"/>
-    <property
-        name="templateDir"
-        value="${wtp.builder.home}/distribution/${build.distribution}.site"/>
-    <property
-        name="resultingIndex"
-        value="${resultDir}/${indexFileName}"/>
-    <echo
-        level="debug"
-        message="resultDir: ${resultDir}"/>
-    <echo
-        level="debug"
-        message="templateDir: ${templateDir}"/>
-    <echo
-        level="debug"
-        message="resultingIndex: ${resultingIndex}"/>
-    <target
-        name="default">
-        <copy
-            overwrite="true"
-            file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/${indexTemplateFilename}"
-            tofile="${resultingIndex}"/>
-        <antcall
-            target="countFiles"/>
-        <antcall
-            target="generateCompileIndex"/>
-        <antcall
-            target="generateJUnitTestsIndex"/>
-        <antcall
-            target="getStaticFiles"/>
-    </target>
-    <target
-        name="generateCompileIndex">
-        <!--
-            <taskdef name="indexResults"
-            classname="org.eclipse.wtp.releng.tools.ResultsSummaryGenerator"
-            />
-        -->
-        <!--
-            isBuildTested: true|false should JUnit plugin test results
-            be used to generate index page dropTokenList: comma
-            separated list of strings which should be replaced by the
-            fileName attribute settings in the testManifest.xml.
-            xmlDirectoryName: path to directory containing JUnit plugin
-            test results in xml format (see doc is org.eclipse.test).
-            dropDirectoryName: path to directory containing the result
-            of the build. testResultsTemplateFileName: path to template
-            file used to generate page with links to JUnit test results
-            testResultsHtmlFileName: name of file which will be
-            generated with links to JUnit test results dropHtmlFileName:
-            name of generated index page hrefTestResultsTargetPath:
-            relative path from index page to directory containing JUnit
-            html test results hrefCompileLogsTargetPath: relative path
-            from index page directory containing compilelogs
-            testManifestFileName: name of xml file containing
-            descriptions of zip types and log files
-        -->
-        <property
-            file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-
-        <!-- create tables of test plugin compiles first -->
-        <antcall
-            target="generateTestCompileOutput">
-            <param
-                name="outputDirectory"
-                value="${resultDir}/testcompilelogs"/>
-        </antcall>
-
-        <!-- create table of code plugins compiles -->
-        <antcall
-            target="generateCompileOutput">
-            <param
-                name="outputDirectory"
-                value="${resultDir}/compilelogs"/>
-        </antcall>
-        <tstamp>
-            <format
-                property="TODAY"
-                pattern="MMMM d, yyyy"/>
-        </tstamp>
-
-        <!--  Insert Build Type descriptor  -->
-        <antcall
-            target="${buildType}"/>
-        <antcall
-            target="writeData"/>
-        <!--
-            Update timestamp on file to permit overwrite through Ant
-            copy task
-        -->
-        <touch
-            file="${resultingIndex}"/>
-    </target>
-    <target
-        name="generateTestCompileOutput"
-        depends="checkIfCompileLogs"
-        if="doCompileLogs">
-        <summarizeResults
-            isBuildTested="false"
-            includeAll="true"
-            dropTokenList="${dropTokenList}"
-            xmlDirectoryName=""
-            dropDirectoryName="${resultDir}"
-            testResultsTemplateFileName="${templateDir}/templateFiles/testCompileResults.php.template"
-            testResultsHtmlFileName="testCompileResults.php"
-            hrefTestResultsTargetPath=""
-            hrefCompileLogsTargetPath="testcompilelogs"
-            compileLogsDirectoryName="${outputDirectory}"/>
-        <antcall
-            target="compilerXMLToHTML"/>
-    </target>
-    <target
-        name="generateCompileOutput"
-        depends="checkIfCompileLogs"
-        if="doCompileLogs">
-        <summarizeResults
-            isBuildTested="false"
-            includeAll="true"
-            dropTokenList="${dropTokenList}"
-            xmlDirectoryName=""
-            dropDirectoryName="${resultDir}"
-            testResultsTemplateFileName="${templateDir}/templateFiles/compileResults.php.template"
-            testResultsHtmlFileName="compileResults.php"
-            hrefTestResultsTargetPath="testResults/html"
-            hrefCompileLogsTargetPath="compilelogs"
-            compileLogsDirectoryName="${outputDirectory}"/>
-        <antcall
-            target="compilerXMLToHTML"/>
-    </target>
-    <target
-        name="compilerXMLToHTML">
-        <xslt
-            basedir="${outputDirectory}"
-            destdir="${outputDirectory}"
-            includes="**/*.xml"
-            scanincludeddirectories="true"
-            style="compilerXMLOutputToHTML.xsl"
-            force="true"/>
-    </target>
-    <target
-        name="generateJUnitTestsIndex"
-        depends="checkIfTested"
-        if="doTests">
-        <!--
-            isBuildTested: true|false should JUnit plugin test results
-            be used to generate index page dropTokenList: comma
-            separated list of strings which should be replaced by the
-            fileName attribute settings in the testManifest.xml.
-            xmlDirectoryName: path to directory containing JUnit plugin
-            test results in xml format (see doc is org.eclipse.test).
-            dropDirectoryName: path to directory containing the result
-            of the build. testResultsTemplateFileName: path to template
-            file used to generate page with links to JUnit test results
-            testResultsHtmlFileName: name of file which will be
-            generated with links to JUnit test results dropHtmlFileName:
-            name of generated index page hrefTestResultsTargetPath:
-            relative path from index page to directory containing JUnit
-            html test results hrefCompileLogsTargetPath: relative path
-            from index page directory containing compilelogs
-            testManifestFileName: name of xml file containing
-            descriptions of zip types and log files
-        -->
-        <property
-            file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-
-        <!-- create table of test plugin compiles first -->
-        <!-- set isBuildTested to true for the "compile only" results -->
-        <summarizeResults
-            isBuildTested="true"
-            dropTokenList="${dropTokenList}"
-            dropDirectoryName="${resultDir}"
-            xmlDirectoryName="${resultDir}/testResults/xml"
-            testResultsTemplateFileName="${templateDir}/templateFiles/testResults.php.template"
-            testResultsHtmlFileName="testResults.php"
-            hrefTestResultsTargetPath="testResults/html"
-            compileLogsDirectoryName=""/>
-        <tstamp>
-            <format
-                property="TODAY"
-                pattern="MMMM d, yyyy"/>
-        </tstamp>
-
-        <!--  Insert Build Type descriptor  -->
-        <antcall
-            target="${buildType}"/>
-        <antcall
-            target="writeData"/>
-        <!--
-            Update timestamp on file to permit overwrite through Ant
-            copy task
-        -->
-        <touch
-            file="${resultingIndex}"/>
-    </target>
-    <target
-        name="getStaticFiles">
-        <!--get static files required in the buildLabel directory-->
-        <copy
-            todir="${resultDir}">
-            <fileset
-                dir="${templateDir}/staticDropFiles"/>
-        </copy>
-
-        <!--copy buildnotes from plugin directories-->
-        <mkdir
-            dir="${resultDir}/buildnotes"/>
-        <copy
-            todir="${resultDir}/buildnotes"
-            flatten="true">
-            <fileset
-                dir="${buildDirectory}/plugins"
-                includes="**/buildnotes_*.html"/>
-            <fileset
-                dir="${buildDirectory}/features"
-                includes="**/buildnotes_*.html"/>
-        </copy>
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/full/logIndex.php"/>
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/testLogs/logIndex.php"/>
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/testSysErrorLogs/logIndex.php"/>
-    </target>
-    <target
-        name="updateSite">
-
-
-        <!-- get our authored, tokenized site.xml file -->
-        <copy
-            file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/siteWTP.xml"
-            tofile="${buildDirectory}/${buildLabel}/updateSite/site.xml"
-            overwrite="true"
-            failonerror="true"/>
-        <!--
-            get the ${buildDirectory}/finalPluginsVersions.properties,
-            and read as properties
-        -->
-        <!-- substitute property value for tokens -->
-        <replace
-            file="${buildDirectory}/${buildLabel}/updateSite/site.xml"
-            propertyfile="${buildDirectory}/finalFeaturesVersions.properties">
-            <replacefilter
-                token="@org.eclipse.wtp@"
-                property="org.eclipse.wtp"/>
-            <replacefilter
-                token="@org.eclipse.wtp.sdk@"
-                property="org.eclipse.wtp.sdk"/>
-            <replacefilter
-                token="@org.eclipse.jst@"
-                property="org.eclipse.jst"/>
-            <replacefilter
-                token="@org.eclipse.jst.sdk@"
-                property="org.eclipse.jst.sdk"/>
-            <replacefilter
-                token="@org.eclipse.jpt.feature@"
-                property="org.eclipse.jpt.feature"/>
-            <replacefilter
-                token="@org.eclipse.jpt_sdk.feature@"
-                property="org.eclipse.jpt_sdk.feature"/>
-        </replace>
-    </target>
-    <target
-        name="countFiles">
-        <!--
-            files.count is a file that should exist in the drop
-            directory with a count of the zip files in the same
-            directory. It is required to generate a link to the build on
-            the downloads page.
-        -->
-        <countBuildFiles
-            sourceDirectory="${resultDir}"
-            filterString=".zip,.tar.gz"
-            outputFile="${resultDir}/files.count"/>
-    </target>
-
-    <!--Build type descriptors-->
-    <target
-        name="I">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Integration"/>
-    </target>
-    <target
-        name="S">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Stable"/>
-    </target>
-    <target
-        name="N">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Nightly"/>
-    </target>
-    <target
-        name="M">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Maintenance"/>
-    </target>
-    <target
-        name="R">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Release"/>
-    </target>
-    <target
-        name="T">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Test"/>
-    </target>
-    <target
-        name="P">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Patches"/>
-    </target>
-    <target
-        name="checkIfTested">
-        <echo
-            level="debug"
-            message="isBuildTested: ${isBuildTested}"/>
-        <condition
-            property="doTests">
-            <equals
-                arg1="${isBuildTested}"
-                arg2="true"
-                trim="true"
-                casesensitive="false"/>
-        </condition>
-    </target>
-    <target
-        name="checkIfCompileLogs">
-        <condition
-            property="doCompileLogs">
-            <available
-                file="${outputDirectory}"/>
-        </condition>
-    </target>
-    <target
-        name="writeData">
-        <!--  Insert Build Date  -->
-        <replace
-            file="${resultingIndex}"
-            token="@date@"
-            value="${TODAY}"/>
-
-        <!--  Insert Build Name  -->
-        <replace
-            file="${resultingIndex}"
-            token="@build@"
-            value="${buildLabel}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@buildBranch@"
-            value="${buildBranch}"/>
-
-        <!--  Insert PreRequsites  -->
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformFile@"
-            value="${eclipseplatform.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformURL@"
-            value="${eclipseplatform.url}/${eclipseplatform.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformBuildURL@"
-            value="${eclipseplatform.url}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformfilelinux@"
-            value="${eclipseplatform.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformfilewindows@"
-            value="${eclipseplatform.file.win32-win32-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformfilemacos@"
-            value="${eclipseplatform.file.macosx-carbon-ppc}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformBuildHome@"
-            value="${eclipseplatform.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatform.mirror.prefixuri@"
-            value="${eclipseplatform.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatform.fspath.prefix@"
-            value="${eclipseplatform.fspath.prefix}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseFile@"
-            value="${eclipse.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseURL@"
-            value="${eclipse.url}/${eclipse.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseBuildURL@"
-            value="${eclipse.url}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilelinux@"
-            value="${eclipse.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilewindows@"
-            value="${eclipse.file.win32-win32-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilemacos@"
-            value="${eclipse.file.macosx-carbon-ppc}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseBuildHome@"
-            value="${eclipse.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipse.mirror.prefixuri@"
-            value="${eclipse.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipse.fspath.prefix@"
-            value="${eclipse.fspath.prefix}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@testURL@"
-            value="${eclipseTestFramework.url}/${eclipseTestFramework.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@testFile@"
-            value="${eclipseTestFramework.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfName@"
-            value="${emf.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfDescription@"
-            value="${emf.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfFile@"
-            value="${emf.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfURL@"
-            value="${emf.url}/${emf.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfBuildHome@"
-            value="${emf.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emf.mirror.prefixuri@"
-            value="${emf.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsourceURL@"
-            value="${emfsourcedoc.url}/${emfsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsourceFile@"
-            value="${emfsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsourceName@"
-            value="${emfsourcedoc.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsourceDescription@"
-            value="${emfsourcedoc.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsourceBuildHome@"
-            value="${emfsourcedoc.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsource.mirror.prefixuri@"
-            value="${emfsourcedoc.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsourceURL@"
-            value="${emfxsdsourcedoc.url}/${emfsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsourceFile@"
-            value="${emfxsdsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsourceName@"
-            value="${emfxsdsourcedoc.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsourceDescription@"
-            value="${emfxsdsourcedoc.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsourceBuildHome@"
-            value="${emfxsdsourcedoc.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsource.mirror.prefixuri@"
-            value="${emfxsdsourcedoc.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdFile@"
-            value="${emfxsd.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdName@"
-            value="${emfxsd.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdDescription@"
-            value="${emfxsd.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdURL@"
-            value="${emfxsd.url}/${emfxsd.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdBuildHome@"
-            value="${emfxsd.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsd.mirror.prefixuri@"
-            value="${emfxsd.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationFile@"
-            value="${emfvalidation.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationURL@"
-            value="${emfvalidation.url}/${emfvalidation.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationBuildHome@"
-            value="${emfvalidation.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidation.mirror.prefixuri@"
-            value="${emfvalidation.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationName@"
-            value="${emfvalidation.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationDescription@"
-            value="${emfvalidation.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsourceFile@"
-            value="${emfvalidationsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsourceURL@"
-            value="${emfvalidationsourcedoc.url}/${emfvalidationsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsourceBuildHome@"
-            value="${emfvalidationsourcedoc.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsource.mirror.prefixuri@"
-            value="${emfvalidationsourcedoc.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsourceName@"
-            value="${emfvalidationsourcedoc.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsourceDescription@"
-            value="${emfvalidationsourcedoc.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstName@"
-            value="${wst.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstDescription@"
-            value="${wst.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstFile@"
-            value="${wst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstURL@"
-            value="${wst.url}/${wst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstBuildHome@"
-            value="${wst.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wst.mirror.prefixuri@"
-            value="${wst.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstName@"
-            value="${jst.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstDescription@"
-            value="${jst.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstFile@"
-            value="${jst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstURL@"
-            value="${jst.url}/${jst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstBuildHome@"
-            value="${jst.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jst.mirror.prefixuri@"
-            value="${jst.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpName@"
-            value="${wtp.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpDescription@"
-            value="${wtp.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpFile@"
-            value="${wtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpURL@"
-            value="${wtp.url}/${wtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpBuildHome@"
-            value="${wtp.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtp.mirror.prefixuri@"
-            value="${wtp.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefFile@"
-            value="${gef.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefURL@"
-            value="${gef.url}/${gef.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefBuildHome@"
-            value="${gef.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gef.mirror.prefixuri@"
-            value="${gef.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefName@"
-            value="${gef.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefDescription@"
-            value="${gef.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipserelengFile@"
-            value="${eclipsereleng.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipserelengURL@"
-            value="${eclipsereleng.url}/${eclipsereleng.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipFile@"
-            value="${orbitthirdpartyzip.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipURL@"
-            value="${orbitthirdpartyzip.url}/${orbitthirdpartyzip.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipBuildHome@"
-            value="${orbitthirdpartyzip.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzip.mirror.prefixuri@"
-            value="${orbitthirdpartyzip.mirror.prefixuri}"/>
-
-
-        <!-- no longer used. Post 1.5.5 -->
-        <replace
-            file="${resultingIndex}"
-            token="@jemFile@"
-            value="${jem.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jemURL@"
-            value="${jem.url}/${jem.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jemBuildHome@"
-            value="${jem.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jem.mirror.prefixuri@"
-            value="${jem.mirror.prefixuri}"/>
-        <!--
-            these token/s should not exist in maintenance stream, but do
-            no harm done, so in the interests of keeping builder streams
-            in sync, we'll leave them here as place hold
-        -->
-        <replace
-            file="${resultingIndex}"
-            token="@dtpFile@"
-            value="${dtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtpURL@"
-            value="${dtp.url}/${dtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtpBuildHome@"
-            value="${dtp.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtp.mirror.prefixuri@"
-            value="${dtp.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtpName@"
-            value="${dtp.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtpDescription@"
-            value="${dtp.description}"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/access_err.gif b/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/access_err.gif
deleted file mode 100644
index 4f0748a..0000000
--- a/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/access_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/access_warn.gif b/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/access_warn.gif
deleted file mode 100644
index 8386e3e..0000000
--- a/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/access_warn.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/buildNotes.php b/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/buildNotes.php
deleted file mode 100644
index f666887..0000000
--- a/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/buildNotes.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<html>
-<head>
-<?php
-$parts = explode("/", getcwd());
-$parts2 = explode("-", $parts[count($parts) - 1]);
-$buildName = $parts2[1];
-
-echo "<title>Build Notes for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Build Notes</font></b></p>
-
-<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"> Build Notes for <?php echo "$buildName"; ?></font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$hasNotes = false;
-$aDirectory = dir("buildnotes");
-while ($anEntry = $aDirectory->read()) {
-	if ($anEntry != "." && $anEntry != "..") {
-		//print_r($anEntry);
-		//echo "<br />";
-
-		$subject = $anEntry;
-		$pattern = '/^buildnotes_(.*)/i';
-		preg_match($pattern, $subject, $matches);
-		$subject = $matches[1];
-		//print_r($subject);
-		//echo "<br />";
-		$pattern = '/^(.*)\.html$/';
-		preg_match($pattern, $subject, $matches);
-		//print_r($matches);
-		//echo "<br />";
-
-		$component = $matches[1];
-
-		$line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
-		echo "<tr>";
-		echo "$line";
-		echo "</tr>";
-		$hasNotes = true;
-
-	}
-}
-$aDirectory.closedir();
-if (!$hasNotes) {
-	echo "<br>There are no build notes for this build.";
-}
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/compile_err.gif b/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/compile_err.gif
deleted file mode 100644
index c2bfdd6..0000000
--- a/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/compile_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/compile_warn.gif b/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/compile_warn.gif
deleted file mode 100644
index cf4fdf9..0000000
--- a/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/compile_warn.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/consoleLogs.php b/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/consoleLogs.php
deleted file mode 100644
index 2ee3c36..0000000
--- a/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/consoleLogs.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<html>
-<head>
-<?php
-$parts = explode("/", getcwd());
-$parts2 = explode("-", $parts[count($parts) - 1]);
-$buildName = $parts2[1];
-
-echo "<title>Test Console Output for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-<title>Console Logs from Running JUnit Plug-in Tests</title>
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b></p>
-
-<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">Console output from running
-		JUnit plugin tests for <?php echo "$buildName"; ?> </font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$rootDir = "testResults/consolelogs";
-$hasNotes = false;
-$aDirectory = dir($rootDir);
-$index = 0;
-$dirindex = 0;
-while ($anEntry = $aDirectory->read()) {
-	if ($anEntry != "." && $anEntry != "..") {
-		if (is_file("$rootDir/$anEntry")) {
-			$entries[$index] = $anEntry;
-			$index++;
-		} else if (is_dir("$rootDir/$anEntry")) {
-			$direntries[$dirindex] = $anEntry;
-			$dirindex++;
-		}
-	}
-}
-$aDirectory->close();
-
-
-sort($entries);
-sort($direntries);
-
-for ($i = 0; $i < $dirindex; $i++) {
-	$anEntry = $direntries[$i];
-	$line = "<td><a href=\"testResults/consolelogs/$anEntry/logIndex.php\">$anEntry</a></td>";
-	echo "<tr>";
-	echo "$line";
-	echo "</tr>";
-}
-for ($i = 0; $i < $index; $i++) {
-	$anEntry = $entries[$i];
-	$logsize = filesize("testResults/consolelogs/$anEntry");
-
-
-	$level = 0;
-	if ($logsize > 20000) {
-		$level = 2;
-	}
-	else if ($logsize > 2000) {
-		$level = 1;
-	}
-
-	if ($level == 0) {
-		$line = "<td><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-	}
-	else if ($level == 1) {
-		$line = "<td><em><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-	} else if ($level == 2) {
-		$line = "<td><strong><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-	}
-
-
-	echo "<tr>";
-	echo "$line";
-	echo "</tr>";
-	$hasNotes = true;
-}
-
-if (!$hasNotes) {
-	echo "<br>There are no test logs for this build.";
-}
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/junit_err.gif b/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/junit_err.gif
deleted file mode 100644
index 1b7ff9d..0000000
--- a/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/junit_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/logIndex.php b/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/logIndex.php
deleted file mode 100644
index 721ca00..0000000
--- a/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/logIndex.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<html>
-<head>
-<?php
-
-function endsWith( $str, $sub ) {
-
-	return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub );
-}
-
-$parts = explode("/", getcwd());
-$parts2 = explode("-", $parts[count($parts) - 1]);
-$buildName = $parts2[1];
-
-echo "<title>Test Console Output for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-<title>Console Logs from Running JUnit Plug-in Tests</title>
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b></p>
-
-<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">Console output from running
-		JUnit plugin tests for <?php echo "$buildName"; ?> </font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$hasNotes = false;
-$aDirectory = dir(".");
-$index = 0;
-while ($anEntry = $aDirectory->read()) {
-	if ($anEntry != "." && $anEntry != ".." && !endsWith(__FILE__, $anEntry)) {
-		$entries[$index] = $anEntry;
-		$index++;
-	}
-}
-aDirectory.closedir();
-
-
-sort($entries);
-
-for ($i = 0; $i < $index; $i++) {
-	$anEntry = $entries[$i];
-	$logsize = filesize("$anEntry");
-
-
-	$level = 0;
-	if ($logsize > 20000) {
-		$level = 2;
-	}
-	else if ($logsize > 2000) {
-		$level = 1;
-	}
-
-	if ($level == 0) {
-		$line = "<td><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-	}
-	else if ($level == 1) {
-		$line = "<td><em><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-	} else if ($level == 2) {
-		$line = "<td><strong><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-	}
-
-
-	echo "<tr>";
-	echo "$line";
-	echo "</tr>";
-	$hasNotes = true;
-}
-
-if (!$hasNotes) {
-	echo "<br>There are no test logs for this build.";
-}
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/miscUtil.php b/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/miscUtil.php
deleted file mode 100644
index 5001f38..0000000
--- a/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/miscUtil.php
+++ /dev/null
@@ -1,219 +0,0 @@
-<?php
-
-// todo: unsure if can handle filenames that are URLs?
-// handy constant to compute file size in megabytes
-
-function fileSizeInMegs($filename) {
-	$onemeg=1024*1024;
-	$zipfilesize=filesize($filename);
-	$zipfilesize=round($zipfilesize/$onemeg, 0);
-	return $zipfilesize;
-}
-
-function fileSizeForDisplay($filename) {
-	$onekilo=1024;
-	$onemeg=$onekilo * $onekilo;
-	$criteria = 10 * $onemeg;
-	$scaleChar = "M";
-	if (file_exists($filename)) {
-		$zipfilesize=filesize($filename);
-		if ($zipfilesize > $criteria) {
-			$zipfilesize=round($zipfilesize/$onemeg, 0);
-			$scaleChar = "M";
-		}
-		else {
-			$zipfilesize=round($zipfilesize/$onekilo, 0);
-			$scaleChar = "K";
-		}
-	}
-	else {
-		$zipfilesize = 0;
-	}
-	$result =  "(" . $zipfilesize . $scaleChar . ")";
-	return $result;
-}
-
-
-function displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription) {
-	echo "<td align=\"right\" valign=\"top\" width=\"30%\">";
-	echo "<a href=\"$downloadprefix$filename\">" . $fileShortDescription . "</a>";
-	echo "</td><td align=\"right\" valign=\"top\" width=\"3%\">";
-	echo $zipfilesize;
-	echo "</td>";
-	echo "<td align=\"right\" valign=\"top\" width=\"2%\">";
-	echo "[<a href=\"checksum/$filename.md5\">md5</a>]";
-	echo "</td>";
-}
-
-function resourceExist($url, $mirrorPrefixuri, $prereqfilename, $eclipseFSpathPrefix)
-{
-	$result = false;
-
-	$allowURLopen = ini_get('allow_url_fopen');
-
-	if ($allowURLopen && stream_last_modified($url)) {
-		$result = true;
-	}
-	else {
-		// TODO: for now, we'll do a raw check on the whole file name, since enable_url_open
-		// is off. better would be to check if we are on build.eclipse.org or download.eclipse.org?
-		$wholePath = trim($eclipseFSpathPrefix) . "/" . trim($mirrorPrefixuri) . "/" . trim($prereqfilename);
-		if (file_exists($wholePath)) {
-			$result = true;
-		}
-	}
-	return $result;
-}
-
-function stream_last_modified($url)
-{
-	if (function_exists('version_compare') && version_compare(phpversion(), '4.3.0') > 0)
-	{
-		if (!($fp = @fopen($url, 'r')))
-		return NULL;
-
-		$meta = stream_get_meta_data($fp);
-		for ($j = 0; isset($meta['wrapper_data'][$j]); $j++)
-		{
-			if (strstr(strtolower($meta['wrapper_data'][$j]), 'last-modified'))
-			{
-				$modtime = substr($meta['wrapper_data'][$j], 15);
-				break;
-			}
-		}
-		fclose($fp);
-	}
-	else
-	{
-		$parts = parse_url($url);
-		$host  = $parts['host'];
-		$path  = $parts['path'];
-
-		if (!($fp = @fsockopen($host, 80)))
-		return NULL;
-
-		$req = "HEAD $path HTTP/1.0\r\nUser-Agent: PHP/".phpversion()."\r\nHost: $host:80\r\nAccept: */*\r\n\r\n";
-		fputs($fp, $req);
-
-		while (!feof($fp))
-		{
-			$str = fgets($fp, 4096);
-			if (strstr(strtolower($str), 'last-modified'))
-			{
-				$modtime = substr($str, 15);
-				break;
-			}
-		}
-		fclose($fp);
-	}
-	return isset($modtime) ? strtotime($modtime) : time();
-}
-
-function isMirrored($uriToCheck) {
-	global $debugScript;
-	global $debugFunctions;
-	$localuri = $uriToCheck;
-
-	$debugMirrorList = false;
-	if ($debugScript) {
-		echo "uriToCheck: " . $localuri . "<br />";
-	}
-
-	$xmlcount = 0;
-
-	/* This method true and accurate method of parsing mirror results
-	 * may be expensive, and would
-	 * likely cause artificially high counts of "downloads".
-	 * Could maybe use if somehow only checked once ever 5 minutes or something.
-
-
-	 // turn off warnings, as sometimes HTML is returned, which causes lots of warnings
-	 $holdLevel = error_reporting(E_ERROR);
-	 $mirrorsxml=simplexml_load_file(rawurlencode($localuri) . urlencode("&format=xml"));
-	 error_reporting($holdLevel);
-
-
-	 if ($mirrorsxml) {
-	 if ($debugFunctions) {
-	 echo "root node: " . $mirrorsxml->getName() . "<br />";
-	 }
-	 if (strcmp($mirrorsxml->getName(), "mirrors") == 0) {
-	 foreach ($mirrorsxml->children() as $mirror) {
-	 if (strcmp($mirror->getName(),"mirror") == 0) {
-	 $xmlcount=$xmlcount+1;
-	 }
-	 if ($debugMirrorList) {
-	 print_r($mirror);
-	 echo "<br />";
-	 }
-	 }
-	 }
-	 if ($debugFunctions) {
-	 echo "Mirror count: " . $xmlcount . "<br />";
-	 }
-	 }
-	 */
-	/*
-	 * Use simple heuristic based on pattern
-	 * in the URI ... if it contains "/downloads/" then assume it's mirrored
-	 */
-	if (strpos($uriToCheck, "webtools/downloads/") > 0) {
-		$xmlcount = 1;
-	}
-	return ($xmlcount > 0);
-
-}
-
-// TODO: replace with Phoenix variables
-function getPlatform () {
-	global $debugScript;
-	global $debugFunctions;
-	// getBrowser is expensive, so cache the data
-	static $browser;
-	$platform = "unknown";
-
-
-	if(ini_get("browscap")) {
-		if(!isset($browser)){
-			$browser = get_browser(null, true);
-		}
-
-		if ($browser) {
-			$rawPlatform = $browser['platform'];
-			if ($debugFunctions) {
-				echo "browser platfrom: " . $rawPlatform . "<br />" ;
-			}
-
-			if ($debugFunctions) {
-				$browserKeys = array_keys($browser);
-				foreach ($browserKeys as $key) {
-					echo $key . ": " . $browser[$key] . "<br />";
-				}
-			}
-		}
-		if (strpos($rawPlatform, "Win") === 0) {
-			$platform="windows";
-		} else if (strpos($rawPlatform, "Linux") === 0) {
-			$platform="linux";
-		} else if (strpos($rawPlatform, "Mac") === 0) {
-			$platform="mac";
-		}
-	}
-	return $platform;
-}
-
-
-function getPrereqReferenceOrName($eclipseMirrorScript, $mirrorPrefixuri, $prerequrl, $prereqfilename, $eclipseFSpathPrefix) {
-	// todo: we really only need "if exists" so could make a bit more efficient
-	// I tried "file_exists" but is didn't seem to work on my test server
-	// For these pre-reqs, we assume if they exist, they are mirrored. This is true
-	// 99% of the time.
-
-	if (resourceExist($prerequrl, $mirrorPrefixuri, $prereqfilename, $eclipseFSpathPrefix)) {
-		$reflink="<a href=\"" . $eclipseMirrorScript . $mirrorPrefixuri . "/" . $prereqfilename . "\">" . $prereqfilename . "</a>";
-	} else {
-		$reflink=$prereqfilename;
-	}
-	return $reflink;
-}
-?>
diff --git a/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/pending.gif b/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/pending.gif
deleted file mode 100644
index 66db2a6..0000000
--- a/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/pending.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/pending1.gif b/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/pending1.gif
deleted file mode 100644
index 1b2ea6e..0000000
--- a/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/pending1.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/report2.php b/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/report2.php
deleted file mode 100644
index cb68e7b..0000000
--- a/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/report2.php
+++ /dev/null
@@ -1,45 +0,0 @@
-
-<?php
-
-function parse_testResults($filename)
-{
-	$junitFailures = 0;
-	if (is_file($filename)) {
-		$handle = @fopen($filename, "r");
-		if ($handle)
-		{
-			$size = filesize($filename);
-			$content = fread($handle, $size);
-			fclose($handle);
-			$junitStart = strpos($content, "Errors &amp; Failures");
-			$junitEnd = strpos($content, "</table>", $junitStart);
-			$junitInfo = substr($content, $junitStart, $junitEnd - $junitStart);
-			$start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">");
-			while ($start !== false)
-			{
-				$start += 29;
-				$stop = strpos($junitInfo, "</font></b></td>", $start);
-				if ($stop !== false)
-				{
-					$result = substr($junitInfo, $start, $stop - $start);
-					if (is_numeric($result))
-					{
-						$junitFailures += $result;
-					}
-					else if (strcmp($result, "DNF") == 0)
-					{
-						$junitFailures++;
-					}
-				}
-				$start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">", $stop);
-			}
-			$results = array($junitFailures);
-			return $results;
-		}
-	}
-}
-
-
-?>
-
-
diff --git a/releng.wtpbuilder/distribution/jsdt.site/templateFiles/compileResults.php.template b/releng.wtpbuilder/distribution/jsdt.site/templateFiles/compileResults.php.template
deleted file mode 100644
index f785771..0000000
--- a/releng.wtpbuilder/distribution/jsdt.site/templateFiles/compileResults.php.template
+++ /dev/null
@@ -1,76 +0,0 @@
-<html>
-<head>
-
-<?php
-        $parts = explode("/", getcwd());
-        $parts2 = explode("-", $parts[count($parts) - 1]);
-        $buildName = $parts2[1];
-
-        echo "<title>Compile Logs: Code Bundles for $buildName</title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2%;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-}
-</style>
-</head>
-<body>
-
-<?php
-        echo "<h1>Compile Logs: Code Bundles for $buildName</h1>";
-?>
-
-
-<table id=tabledata align = "center" width="75%" border="1">
-  <tr>
-    <td class="bold" align="center">Compile Logs</td>
-    <td class="bold" align="center">Compile Errors</td>
-    <td class="bold" align="center">Compiler Warnings</td>
-    <td class="bold" align="center">Access Violations</td>
-    <td class="bold" align="center">Access Warnings</td>
-  </tr>
-
-  %compilelogs%
-
-</table>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/jsdt.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/jsdt.site/templateFiles/index.html.template.php
deleted file mode 100644
index 3e93c3d..0000000
--- a/releng.wtpbuilder/distribution/jsdt.site/templateFiles/index.html.template.php
+++ /dev/null
@@ -1,850 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<?php
-
-ini_set("display_errors", "true");
-error_reporting (E_ALL);
-
-
-$buildBranch="@buildBranch@";
-$build="@build@";
-$type="@type@";
-$builddate="@date@";
-
-$eclipseMirrorPrefixuri="@eclipse.mirror.prefixuri@";
-$eclipseFSpathPrefix="@eclipse.fspath.prefix@";
-
-$eclipsefilelinux="@eclipsefilelinux@";
-$eclipsefilewindows="@eclipsefilewindows@";
-$eclipsefilemacosx="@eclipsefilemacos@";
-
-$eclipseURL="@eclipseURL@";
-$eclipseFile="@eclipseFile@";
-$eclipseBuildURL="@eclipseBuildURL@";
-$eclipseBuildHome="@eclipseBuildHome@";
-$eclipseName="@eclipseName@";
-$eclipseDescription="@eclipseDescription@";
-
-$eclipseplatformMirrorPrefixuri="@eclipseplatform.mirror.prefixuri@";
-$eclipseplatformFSpathPrefix="@eclipse.fspath.prefix@";
-
-$eclipseplatformfilelinux="@eclipseplatformfilelinux@";
-$eclipseplatformfilewindows="@eclipseplatformfilewindows@";
-$eclipseplatformfilemacosx="@eclipseplatformfilemacos@";
-
-$eclipseplatformURL="@eclipseplatformURL@";
-$eclipseplatformFile="@eclipseplatformFile@";
-$eclipseplatformBuildURL="@eclipseplatformBuildURL@";
-$eclipseplatformBuildHome="@eclipseplatformBuildHome@";
-$eclipseplatformName="@eclipseplatformName@";
-$eclipseplatformDescription="@eclipseplatformDescription@";
-
-$testURL="@testURL@";
-$testFile="@testFile@";
-
-$wstURL="@wstURL@";
-$wstFile="@wstFile@";
-$wstMirrorPrefixuri="@wst.mirror.prefixuri@";
-$wstBuildHome="@wstBuildHome@";
-$wstName="@wstName@";
-$wstDescription="@wstDescription@";
-
-$jstURL="@jstURL@";
-$jstFile="@jstFile@";
-$jstMirrorPrefixuri="@jst.mirror.prefixuri@";
-$jstBuildHome="@jstBuildHome@";
-$jstName="@jstName@";
-$jstDescription="@jstDescription@";
-
-$wtpURL="@wtpURL@";
-$wtpFile="@wtpFile@";
-$wtpMirrorPrefixuri="@wtp.mirror.prefixuri@";
-$wtpBuildHome="@wtpBuildHome@";
-$wtpName="@wtpName@";
-$wtpDescription="@wtpDescription@";
-
-$gefURL="@gefURL@";
-$gefFile="@gefFile@";
-$gefMirrorPrefixuri="@gef.mirror.prefixuri@";
-$gefBuildHome="@gefBuildHome@";
-$gefName="@getName@";
-$gefDescription="@gefDescription@";
-
-$emfURL="@emfURL@";
-$emfFile="@emfFile@";
-$emfMirrorPrefixuri="@emf.mirror.prefixuri@";
-$emfBuildHome="@emfBuildHome@";
-$emfName="@emfName@";
-$emfDescription="@emfDescription@";
-
-$emfsourceURL="@emfsourceURL@";
-$emfsourceFile="@emfsourceFile@";
-$emfsourceMirrorPrefixuri="@emfsource.mirror.prefixuri@";
-$emfsourceBuildHome="@emfsourceBuildHome@";
-$emfsourceName="@emfsourceName@";
-$emfsourceDescription="@emfsourceDescription@";
-
-
-$emfxsdURL="@emfxsdURL@";
-$emfxsdFile="@emfxsdFile@";
-$emfxsdMirrorPrefixuri="@emfxsd.mirror.prefixuri@";
-$emfxsdBuildHome="@emfxsdBuildHome@";
-$emfxsdName="@emfxsdName@";
-$emfxsdDescription="@emfxsdDescription@";
-
-$emfxsdsourceURL="@emfxsdsourceURL@";
-$emfxsdsourceFile="@emfxsdsourceFile@";
-$emfxsdsourceMirrorPrefixuri="@emfxsdsource.mirror.prefixuri@";
-$emfxsdsourceBuildHome="@emfxsdsourceBuildHome@";
-$emfxsdsourceName="@emfxsdsourceName@";
-$emfxsdsourceDescription="@emfxsdsourceDescription@";
-
-
-$emfvalidationURL="@emfvalidationURL@";
-$emfvalidationFile="@emfvalidationFile@";
-$emfvalidationMirrorPrefixuri="@emfvalidation.mirror.prefixuri@";
-$emfvalidationBuildHome="@emfvalidationBuildHome@";
-$emfvalidationName="@emfvalidationName@";
-$emfvalidationDescription="@emfvalidationDescription@";
-
-$emfvalidationsourceURL="@emfvalidationsourceURL@";
-$emfvalidationsourceFile="@emfvalidationsourceFile@";
-$emfvalidationsourceMirrorPrefixuri="@emfvalidationsource.mirror.prefixuri@";
-$emfvalidationsourceBuildHome="@emfvalidationsourceBuildHome@";
-$emfvalidationsourceName="@emfvalidationsourceName@";
-$emfvalidationsourceDescription="@emfvalidationsourceDescription@";
-
-
-$dtpURL="@dtpURL@";
-$dtpFile="@dtpFile@";
-$dtpMirrorPrefixuri="@dtp.mirror.prefixuri@";
-$dtpBuildHome="@dtpBuildHome@";
-$dtpName="@dtpName@";
-$dtpDescription="@dtpDescription@";
-
-
-$eclipserelengFile="@eclipserelengFile@";
-$eclipserelengURL="@eclipserelengURL@";
-$orbitthirdpartyzipFile="@orbitthirdpartyzipFile@";
-$orbitthirdpartyzipURL="@orbitthirdpartyzipURL@";
-$orbitthirdpartyzipBuildHome="@orbitthirdpartyzipBuildHome@";
-$orbitthirdpartyzipMirrorPrefixuri="@orbitthirdpartyzip.mirror.prefixuri@";
-
-
-$prereq_eclipse="false";
-$prereq_eclipseplatform="true";
-$prereq_emf="false";
-$prereq_emfxsd="false";
-$prereq_emfvalidation="false";
-$prereq_gef="false";
-$prereq_dtp="false";
-$prereq_wst="false";
-$prereq_jst="false";
-$prereq_wtp="false";
-
-
-include("miscUtil.php");
-
-
-
-
-$debugScript = false;
-$debugFunctions = false;
-
-$defaultMirrorScript="";
-$defaultWTPMirrorPrefix="./";
-
-$eclipseMirrorScript="http://www.eclipse.org/downloads/download.php?file=";
-
-// TODO: improve so this hard coding isn't required.
-// This depends on the declare script changing webtools/committers to webtools/downloads
-// And, the logic is such that if it is not mirrored, this URI is not used at all, just
-// a relative reference only
-$eclipseWTPMirrorPrefix="/webtools/committers/drops/$buildBranch/$build/";
-
-
-$mirrorScript=$defaultMirrorScript;
-$downloadprefix=$defaultWTPMirrorPrefix;
-
-
-$keytestMirrorString=$eclipseMirrorScript . "$eclipseWTPMirrorPrefix/wtp-jsdt-sdk-$build.zip";
-if (isMirrored($keytestMirrorString) ) {
-	$mirrorScript=$eclipseMirrorScript;
-	$downloadprefix="${mirrorScript}${eclipseWTPMirrorPrefix}";
-}
-
-if ($debugScript)  {
-	echo "inferred platform: " . getPlatform();
-}
-
-
-// our summary results handling requires php 5 (for simple xml file loading)
-// so, if not php 5, just don't display any summary results
-// This was found to be required, since some mirror our whole site (e.g. IBM)
-// and not all mirrors use PHP 5
-$displayTestSummary=false;
-if (phpversion() >= 5) {
-
-	$code_totalBundles=0;
-	$code_totalErrors=0;
-	$code_totalWarnings=0;
-	$code_totalforbiddenAccessWarningCount=0;
-	$code_totaldiscouragedAccessWarningCount=0;
-
-	$test_totalBundles=0;
-	$test_totalErrors=0;
-	$test_totalWarnings=0;
-	$test_totalforbiddenAccessWarningCount=0;
-	$test_totaldiscouragedAccessWarningCount=0;
-
-
-	$displayTestSummary=true;
-	// expecting grandTotalErrors and grandTotalTests
-	$filename = "unitTestsSummary.xml";
-	if (file_exists($filename)) {
-		$prefix = "unitTests_";
-		$unitTestsSummary = simplexml_load_file($filename);
-		foreach ($unitTestsSummary->summaryItem as $summaryItem) {
-			$name = $summaryItem->name;
-			$value = $summaryItem->value;
-			$code= "\$" . $prefix . $name . " = " . $value . ";";
-			//echo "<br />code: " . $code;
-			eval($code);
-		}
-	}
-
-	$filename = "compilelogsSummary.xml";
-	if (file_exists($filename)) {
-		$prefix = "code_";
-		$compileSummary = simplexml_load_file($filename);
-		foreach ($compileSummary->summaryItem as $summaryItem) {
-			$name = $summaryItem->name;
-			$value = $summaryItem->value;
-			$code= "\$" . $prefix . $name . " = " . $value . ";";
-			//echo "<br />code: " . $code;
-			eval($code);
-		}
-	}
-
-	$filename = "testcompilelogsSummary.xml";
-	if (file_exists($filename)) {
-		$prefix = "test_";
-		$compileSummary = simplexml_load_file($filename);
-		foreach ($compileSummary->summaryItem as $summaryItem) {
-			$name = $summaryItem->name;
-			$value = $summaryItem->value;
-			$code= "\$" . $prefix . $name . " = " . $value . ";";
-			//echo "<br />code: " . $code;
-			eval($code);
-		}
-	}
-}
-
-$incubating="false";
-
-
-
-if ($incubating) {
-	echo '<title>WTP Incubator Downloads</title>';
-}
-else {
-	echo '<title>WTP Downloads</title>';
-}
-
-
-?>
-
-
-</head>
-
-<body>
-
-
-<?php
-
-// tiny banner to remind when looking at "local" machine results
-$serverName = $_SERVER["SERVER_NAME"];
-
-if (!stristr($serverName, "eclipse.org") && !stristr($serverName,"you.are.at.eclipsecon.org")) {
-	echo '<center>
-          <p>
-          Reminder: this is <font color="#FF0000">' .
-	$serverName .
-        '</font>
-          See also
-          <a href="http://download.eclipse.org/webtools/downloads" target="_top">the live public Eclipse site</a>.
-          </p>
-          <hr />
-          </center>';
-
-}
-?>
-
-<?php if ("true" === $incubating) {
-	echo "<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH=\"100%\">";
-	echo "	<tr>";
-	echo "		<td ALIGN=left><font face=\"'Bitstream Vera',Helvetica,Arial\" size=\"+2\"><b><?php echo \"$type\";?>";
-	echo "        Build: $build</b></font></td>";
-	echo "		<td align=\"right\" rowspan=\"3\"><a";
-	echo "			href=\"http://www.eclipse.org/projects/what-is-incubation.php\"><img";
-	echo "			src=\"http://www.eclipse.org/images/egg-incubation.png\"";
-	echo "			alt=\"Incubation\" align=\"middle\" border=\"0\"></a></td>";
-
-
-	echo "	<tr valign=\"top\">";
-	echo "		<td><font size=\"-1\">" . $builddate . "</font></td>";
-	echo "	</tr>";
-	echo "	<tr valign=\"top\">";
-	echo "		<td>";
-	echo "		<p>The Eclipse Web Tools Platform (WTP) Incubator Project provides";
-	echo "		tools for development that are just getting started, or are";
-	echo "		experimental in some fashion.</p>";
-	echo "		</td>";
-	echo "	</tr>";
-	echo "</table>";
-
-} else {
-
-	echo "<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH=\"100%\">";
-	echo "	<tr>";
-	echo "		<td ALIGN=left><font face=\"'Bitstream Vera',Helvetica,Arial\" size=\"+2\"><b>$type";
-	echo "		Build: " . $build . "</b></font></td>";
-
-	echo "	<tr valign=\"top\">";
-	echo "		<td><font size=\"-1\">" . $builddate . "</font></td>";
-	echo "	</tr>";
-	echo "	<tr valign=\"top\">";
-	echo "		<td>";
-	echo "		<p>Component build from the Eclipse Web Tools Platform (WTP) Project.</p>";
-	echo "		</td>";
-	echo "	</tr>";
-	echo "</table>";
-
-} ?>
-
-<!-- ***********  Prerequisites **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-	<tr>
-		<td align="left" valign="top" bgcolor="#0080C0"><font
-			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Prerequisites
-		and Handy Extras</font></td>
-	</tr>
-	<tr>
-		<td>
-		<p>These are the prerequisites to build or run these packages. All are
-		not necessarily required, but instead some subset. Also listed are
-		some frequently needed links for committer-required packages when
-		creating new development environments, or targets to run against.</p>
-		<p>Note that WTP requires Java 5 or higher (and, for some things,
-		actually requires a JDK rather than only a JRE) even though many other
-		<a href="http://www.eclipse.org/downloads/">Eclipse Projects</a> can
-		run with <a href="http://www.eclipse.org/downloads/moreinfo/jre.php">other
-		JRE levels</a>.</p>
-		<p></p>
-		</td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=1 cellpadding=1 width="90%" align="center">
-
-		<?php
-		if ("true" === $prereq_eclipseplatform) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td width=\"40%\">Eclipse Platform</td>";
-
-
-			//customize page depending on user's browser/platform, if we can detect it
-			$usersPlatform = getPlatform();
-			// assume windows by default, since likely most frequent, even for cases where
-			// platform is "unknown". I've noticed Opera reports 'unknown' :(
-			$recommendedFile=$eclipseplatformfilewindows;
-			if (strcmp($usersPlatform,"linux")== 0) {
-				$recommendedFile=$eclipseplatformfilelinux;
-			} else if (strcmp($usersPlatform,"mac") == 0) {
-				$recommendedFile=$eclipseplatformfilemacosx;
-			}
-
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $eclipseplatformBuildURL . "\">appropriate platform</a>";
-			echo " or <a href=\"" . $eclipseplatformBuildHome . "\">equivalent</a></td>";
-
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_eclipse) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td width=\"40%\">Eclipse SDK (Platform, JDT)</td>";
-
-
-			//customize page depending on user's browser/platform, if we can detect it
-			$usersPlatform = getPlatform();
-			// assume windows by default, since likely most frequent, even for cases where
-			// platform is "unknown". I've noticed Opera reports 'unknown' :(
-			$recommendedFile=$eclipsefilewindows;
-			if (strcmp($usersPlatform,"linux")== 0) {
-				$recommendedFile=$eclipsefilelinux;
-			} else if (strcmp($usersPlatform,"mac") == 0) {
-				$recommendedFile=$eclipsefilemacosx;
-			}
-
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $eclipseBuildURL . "\">appropriate platform</a>";
-			echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_emf) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $emfName . "&nbsp;" . $emfDescription ;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $emfMirrorPrefixuri, $emfURL, $emfFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $emfBuildHome . "\">equivalent</a></td>";
-			echo " </tr>";
-		}
-		?>
-
-
-		<?php
-		if ("true" === $prereq_emfxsd) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $emfxsdName . "&nbsp;" . $emfxsdDescription ;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdMirrorPrefixuri, $emfxsdURL, $emfxsdFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $emfxsdBuildHome . "\">equivalent</a></td>";
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_emfvalidation) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $emfvalidationName  . "&nbsp;" . $emfvalidationDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $emfvalidationMirrorPrefixuri, $emfvalidationURL, $emfvalidationFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $emfvalidationBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_gef) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $gefName  . "&nbsp;" . $gefDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $gefMirrorPrefixuri, $gefURL, $gefFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $gefBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_dtp) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $dtpName . "&nbsp;" . $dtpDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $dtpMirrorPrefixuri, $dtpURL, $dtpFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $dtpBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_wst) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $wstName . "&nbsp;" . $wstDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $wstMirrorPrefixuri, $wstURL, $wstFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $wstBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_jst) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $jstName . "&nbsp;" . $jstDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $jstMirrorPrefixuri, $jstURL, $jstFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $jstBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-		<?php
-		if ("true" === $prereq_wtp) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $wtpName . "&nbsp;" . $wtpDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $wtpMirrorPrefixuri, $wtpURL, $wtpFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $wtpBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-			<tr valign="middle">
-				<td width="10%"></td>
-				<td colspan="2">
-				<hr />
-				</td>
-			</tr>
-
-
-
-			<?php
-			if ("true" === $prereq_emf) {
-				echo "<tr valign=\"top\">";
-				echo "<td width=\"10%\"></td>";
-				echo "<td>";
-				echo $emfsourceName . "&nbsp;" . $emfsourceDescription;
-				echo "</td> ";
-				echo "<td align=\"right\">";
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfsourceMirrorPrefixuri, $emfsourceURL, $emfsourceFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $emfsourceBuildHome . "\">equivalent</a></td>";
-				echo "</tr>";
-			}
-			?>
-			<?php
-			if ("true" === $prereq_emfxsd) {
-				echo "<tr valign=\"top\">";
-				echo "<td width=\"10%\"></td>";
-				echo "<td>";
-				echo $emfxsdsourceName . "&nbsp;" . $emfxsdsourceDescription;
-				echo "</td> ";
-				echo "<td align=\"right\">";
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdsourceMirrorPrefixuri, $emfxsdsourceURL, $emfxsdsourceFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $emfxsdsourceBuildHome . "\">equivalent</a></td>";
-				echo "</tr>";
-			}
-			?>
-
-			<?php
-			if ("true" === $prereq_emfvalidation) {
-				echo "<tr valign=\"top\">";
-				echo "<td width=\"10%\"></td>";
-				echo "<td>";
-				echo $emfvalidationsourceName . "&nbsp;" . $emfvalidationsourceDescription;
-				echo "</td> ";
-				echo "<td align=\"right\">";
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfvalidationsourceMirrorPrefixuri, $emfvalidationsourceURL, $emfvalidationsourceFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $emfvalidationsourceBuildHome . "\">equivalent</a></td>";
-				echo "</tr>";
-			}
-			?>
-
-			<?php
-			if (true) {
-				echo "<tr valign=\"top\">";
-				echo "<td width=\"10%\"></td>";
-				echo "<td>";
-				echo "Eclipse Test Framework (required only for Automated JUnit tests)";
-				echo "</td> ";
-				echo "<td align=\"right\">";
-
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $testURL, $testFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-				echo "</tr>";
-			}
-			?>
-
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>Eclipse releng tool (required only for committers to more easily
-				"release" code to a build)</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipserelengURL, $eclipserelengFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>Third Party code from Orbit. Not required and is currently much
-				more than needed for WTP, but some committers like using to create a
-				PDE target.</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $orbitthirdpartyzipMirrorPrefixuri, $orbitthirdpartyzipURL, $orbitthirdpartyzipFile,$eclipseFSpathPrefix);
-				echo " or <a href=\"" . $orbitthirdpartyzipBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-		</table>
-		</td>
-	</tr>
-</table>
-
-<!-- ***********  WTP **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-	<tr>
-		<td align=left valign=top colspan="5" bgcolor="#0080C0"><font
-			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF"> Web Tools
-		Platform</font></td>
-	</tr>
-
-	<tr>
-		<td align="left" valign="top" colspan="5">
-		<p>The Zip files includes the features and plugins for the JavaScript Development Tools (JSDT).</p>
-		</td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
-
-
-			<tr>
-				<td align="left" valign="top" width="10%"><b>Minimal</b></td>
-				<td align="left" valign="top">
-				<p>Executable code only.</p>
-				</td>
-				<?php
-				$zipfilename="wtp-jsdt-${build}";
-				$filename=$zipfilename.".zip";
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription="jsdt";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-				?>
-			</tr>
-
-			<tr>
-				<td align="left" valign="top" width="10%"><b>SDK</b></td>
-				<td align="left" valign="top">
-				<p>Executable code and source code.</p>
-				</td>
-				<?php
-				$zipfilename="wtp-jsdt-sdk-${build}";
-				$filename=$zipfilename.".zip";
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription="jsdt sdk";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-				?>
-			</tr>
-			<tr>
-				<td align="left" valign="top" width="10%"><b>Tests</b></td>
-				<td align="left" valign="top">
-				<p>Unit tests.</p>
-				</td>
-				<?php
-				$zipfilename="wtp-jsdt-tests-${build}";
-				$filename=$zipfilename.".zip";
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription="jsdt tests";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-				?>
-			</tr>
-		</table>
-		</td>
-	
-	
-	<tr>
-
-</table>
-
-
-
-
-
-
-
-<!-- ***********  Build Status **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-	<tr>
-		<td align=left valign=top bgcolor="#0080C0"><font
-			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Status, tests
-		and other interesting details</font></td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
-
-			<tr>
-				<td><!-- 
-				Its silly to always display 'Build notes', but hard to 
-				compute if required or not. 
-				<a href="buildNotes.php">Build notes</a> <br /> 
-				--> <a href="directory.txt">map files</a> <br />
-				<?php
-
-				if ($displayTestSummary) {
-
-
-					if (isset($unitTests_grandTotalErrors)) {
-						$errorColor="green";
-						if ($unitTests_grandTotalErrors > 0) {
-							$errorColor="red";
-						}
-						echo "<a href=\"testResults.php\">Unit test results</a>&nbsp;";
-						echo "<img src=\"junit_err.gif\"/><font color=\"" . $errorColor . "\">" . $unitTests_grandTotalErrors . "</font>&nbsp;&nbsp;Total: " . $unitTests_grandTotalTests;
-					}
-					else {
-						// we hardly ever "pend" anymore ... abscense usually signifies no tests or a build error.
-						echo "<br /><font color=\"orange\">Unit tests don't exists, are pending, or there's a build error.</font>";
-						//&nbsp;&nbsp;<img src=\"pending.gif\"/>";
-					}
-
-					echo "<br />";
-					echo "<a href=\"compileResults.php\">Compile logs: Code Bundles</a>";
-
-					echo "&nbsp;&nbsp;($code_totalBundles)&nbsp;&nbsp;";
-					echo "<img src=\"compile_err.gif\"/><font color=red>$code_totalErrors</font>&nbsp;";
-					echo "<img src=\"compile_warn.gif\"/><font color=orange>$code_totalWarnings</font>&nbsp;";
-					echo "<img src=\"access_err.gif\"/><font color=red>$code_totalforbiddenAccessWarningCount</font>&nbsp;";
-					echo "<img src=\"access_warn.gif\"/><font color=orange>$code_totaldiscouragedAccessWarningCount</font>&nbsp;";
-
-					echo "<br />";
-					echo "<a href=\"testCompileResults.php\">Compile logs: Test Bundles</a>";
-
-					echo "&nbsp;&nbsp;($test_totalBundles)&nbsp;&nbsp;";
-					echo "<img src=\"compile_err.gif\"/><font color=red>$test_totalErrors</font>&nbsp;";
-					echo "<img src=\"compile_warn.gif\"/><font color=orange>$test_totalWarnings</font>&nbsp;";
-					echo "<img src=\"access_err.gif\"/><font color=red>$test_totalforbiddenAccessWarningCount</font>&nbsp;";
-					echo "<img src=\"access_warn.gif\"/><font color=orange>$test_totaldiscouragedAccessWarningCount</font>&nbsp;";
-				}
-
-				?> <br />
-
-				<?php
-				if (file_exists("versioningReportName.php")) {
-					include "versioningReportName.php";
-					$fname="${versionReportFilename}.html";
-					if (file_exists($fname)) {
-						echo "<br /> <a href='$fname'>Versioning Information</a>";
-					}
-}
-?> <?php
-echo "<br />";
-if (file_exists("./apiresults/api-progress.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-progress.html\">API Progress Report</a>";
-}
-if (file_exists("./apiresults/api-info-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-info-summary.html\">APIs Defined by Each Component</a>";
-}
-if (file_exists("./apiresults/api-ref-compatibility.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-ref-compatibility.html\">Adopter Breakage Report</a>";
-}
-if (file_exists("./apiresults/api-violation-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-violation-summary.html\">API Violations</a>";
-}
-if (file_exists("./apiresults/component-api-violation-all.html"))
-{
-	echo "<br /> <a href=\"apiresults/component-api-violation-all.html\">Non-API dependencies</a>";
-}
-if (file_exists("./apiresults/api-tc-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-tc-summary.html\">API Test Coverage</a>";
-}
-if (file_exists("./apiresults/api-javadoc-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-javadoc-summary.html\">API Javadoc Coverage</a>";
-}
-if (file_exists("./apiresults/api-tc-summary.html"))
-{
-	echo "<br /><br /> <a href=\"apiresults/full_test_coverage/api-tc-summary.html\">Test Coverage for All Classes and Methods</a>";
-}
-?> <?php
-if (file_exists("./perfresults/graph/performance.php"))
-{
-	echo "<br />";
-	echo "<br /> <a href=\"perfresults/graph/performance.php\">Performance Results</a>";
-	echo "<br />";
-}
-?></td>
-			</tr>
-
-
-		</table>
-		</td>
-	</tr>
-</table>
-
-
-
-<!-- footer -->
-<center>
-<hr>
-<p>All downloads are provided under the terms and conditions of the <a
-	href="http://www.eclipse.org/legal/notice.html">Eclipse.org Software
-User Agreement</a> unless otherwise specified.</p>
-
-<p>If you have problems downloading the drops, contact the <font
-	face="'Bitstream Vera',Helvetica,Arial" size="-1"><a
-	href="mailto:webmaster@eclipse.org">webmaster</a></font>.</p>
-
-</center>
-<!-- end footer -->
-
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/jsdt.site/templateFiles/siteEnablingFeatures.xml b/releng.wtpbuilder/distribution/jsdt.site/templateFiles/siteEnablingFeatures.xml
deleted file mode 100644
index cc3ed81..0000000
--- a/releng.wtpbuilder/distribution/jsdt.site/templateFiles/siteEnablingFeatures.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-    <description> The update site contains the enabling features. </description>
-    <category-def
-        name="Enabling Features"
-        label="Enabling Features">
-        <description> This category contains features used by several
-            projects that enable some functionality, but which by
-            themselves are not very interesting. </description>
-    </category-def>
-</site>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/jsdt.site/templateFiles/siteWTP.xml b/releng.wtpbuilder/distribution/jsdt.site/templateFiles/siteWTP.xml
deleted file mode 100644
index f94e83f..0000000
--- a/releng.wtpbuilder/distribution/jsdt.site/templateFiles/siteWTP.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site
-    pack200="true"
-    mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/webtools/testUpdates/site.xml&amp;format=xml"
-    digestURL="http://download.eclipse.org/webtools/testUpdates/">
-    <description
-        url="http://download.eclipse.org/webtools/declaredUpdates/index.html"> The update site contains the features of the of Eclipse Web
-        Tools Project (WTP) </description>
-    <feature
-        url="features/org.eclipse.wst_@org.eclipse.wst@.jar"
-        id="org.eclipse.wst"
-        version="@org.eclipse.wst@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.wst.sdk_@org.eclipse.wst.sdk@.jar"
-        id="org.eclipse.wst.sdk"
-        version="@org.eclipse.wst.sdk@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jst_@org.eclipse.jst@.jar"
-        id="org.eclipse.jst"
-        version="@org.eclipse.jst@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jst.sdk_@org.eclipse.jst.sdk@.jar"
-        id="org.eclipse.jst.sdk"
-        version="@org.eclipse.jst.sdk@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jpt.feature_@org.eclipse.jpt.feature@.jar"
-        id="org.eclipse.jpt.feature"
-        version="@org.eclipse.jpt.feature@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jpt_sdk.feature_@org.eclipse.jpt_sdk.feature@.jar"
-        id="org.eclipse.jpt_sdk.feature"
-        version="@org.eclipse.jpt_sdk.feature@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <category-def
-        name="Web Tools Platform (WTP)"
-        label="Web Tools Platform (WTP)">
-        <description> This category contains the features of the Eclipse
-            Web Tools Project (WTP). </description>
-    </category-def>
-</site>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/jsdt.site/templateFiles/testCompileResults.php.template b/releng.wtpbuilder/distribution/jsdt.site/templateFiles/testCompileResults.php.template
deleted file mode 100644
index 42d6f65..0000000
--- a/releng.wtpbuilder/distribution/jsdt.site/templateFiles/testCompileResults.php.template
+++ /dev/null
@@ -1,76 +0,0 @@
-<html>
-<head>
-
-<?php
-        $parts = explode("/", getcwd());
-        $parts2 = explode("-", $parts[count($parts) - 1]);
-        $buildName = $parts2[1];
-
-        echo "<title>Compile Logs: Test Bundles for $buildName</title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2em;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:Bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-}
-</style>
-</head>
-<body>
-
-<?php
-        echo "<h1>Compile Logs: Test Bundles for $buildName</h1>";
-?>
-
-
-<table id=tabledata align = "center" width="75%" border="1">
-  <tr>
-    <td class="bold" align="center">Compile Logs</td>
-    <td class="bold" align="center">Compile Errors</td>
-    <td class="bold" align="center">Compiler Warnings</td>
-    <td class="bold" align="center">Access Violations</td>
-    <td class="bold" align="center">Access Warnings</td>
-  </tr>
-
-  %compilelogs%
-
-</table>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/jsdt.site/templateFiles/testResults.php.template b/releng.wtpbuilder/distribution/jsdt.site/templateFiles/testResults.php.template
deleted file mode 100644
index ddad0b7..0000000
--- a/releng.wtpbuilder/distribution/jsdt.site/templateFiles/testResults.php.template
+++ /dev/null
@@ -1,119 +0,0 @@
-<html>
-<head>
-
-<?php
-	$parts = explode("/", getcwd());
-	$parts2 = explode("-", $parts[count($parts) - 1]);
-	$buildName = $parts2[1];
-	
-	echo "<title>Test Results for $buildName </title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2em;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:Bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-
-}
-</style>
-
-
-</head>
-<body>
-<p><b><font face="Verdana" size="+3">Test Results</font></b> </p>
-
-<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">
-    Unit Test Results for <?php echo "$buildName"; ?> on Various Platforms and JRE</font></b></td>
-  </tr>
-</table>
-
-<?php
-if (file_exists("testResults"))
-{
-$dir = dir("testResults");
-while ($anEntry = $dir->read())
-{
-  if ($anEntry != "." && $anEntry != ".." && $anEntry != "consolelogs" && $anEntry != "html" && $anEntry != "xml")
-  {
-    $link = "testResults/".$anEntry."/results/index.php";
-    echo "<p><a href=\"$link\">$anEntry</a></p>";
-  }
-}
-}
-?>
-
-<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">Unit 
-      Test Results for <?php echo "$buildName"; ?> </font></b></td>
-  </tr>
-</table>
-
-<table id=tableunittestdata align = "center" width="75%" border="1">
-  <tr> 
-    <td class="bold" align="center" width="70%">Test Suite</td>
-    <td class="bold" align="center" width="10%">Errors &amp; Failures</td>
-    <td class="bold" align="center" width="10%">Total Tests</td>
-    <td class="bold" align="center" width="10%">Total Time (s)</td>
-  </tr>
-  
-  
-  %testresults%
-  
-</table>
-<p></p>
-<br>
-<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"> 
-      Console output logs 
-      <?php echo "$buildName"; ?>
-      </font></b></td>
-  </tr>
-</table>
-<br>
-These <a href="consoleLogs.php">logs</a> contain the console output captured while 
-running the JUnit automated tests. <br>
-<br>
-
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/jsdt.site/transformReportToHTML.xml b/releng.wtpbuilder/distribution/jsdt.site/transformReportToHTML.xml
deleted file mode 100644
index b72f6cd..0000000
--- a/releng.wtpbuilder/distribution/jsdt.site/transformReportToHTML.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-    name="xsl-conversion"
-    default="main"
-    basedir=".">
-    <target
-        name="main"
-        description="example.@dot.xml to produce example.@dot.html">
-        <xslt
-            destdir="${resultDir}/compilelogs"
-            scanincludeddirectories="true"
-            style="compilerXMLOutputToHTML.xsl"
-            force="true">
-            <fileset
-                dir="${resultDir}/compilelogs"
-                includes="**/*.xml"/>
-        </xslt>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/jsdt.tests/build.xml b/releng.wtpbuilder/distribution/jsdt.tests/build.xml
deleted file mode 100644
index 2b85fa7..0000000
--- a/releng.wtpbuilder/distribution/jsdt.tests/build.xml
+++ /dev/null
@@ -1,330 +0,0 @@
-<project
-    name="Build specific targets and properties"
-    default="runTest">
-    <!--
-        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"/>
-    <fail
-        message="testRoot must be set for this task"
-        unless="testRoot"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-
-
-    <!-- 
-        typcially already set, but in case of standalone tests, may not
-        be
-    -->
-    <property
-        name="buildLabel"
-        value="${buildType}-${buildId}-${timestamp}"/>
-
-
-    <!-- 
-	   Steps to do after the build is done. 
-	 -->
-    <target
-        name="test">
-        <dirname
-            file="${ant.file}"
-            property="currentDirectory"/>
-        <ant
-            antfile="${ant.file}"
-            target="runTest"
-            dir="${currentDirectory}"/>
-    </target>
-
-    <!-- 
-	  Steps to do to test the build results
-   -->
-    <target
-        name="runTest">
-        <dirname
-            file="${ant.file}"
-            property="test.component.dir"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-        <property
-            file="${buildDirectory}/label.properties"/>
-        <property
-            file="${wtp.builder.home}/build.properties"/>
-        <fail
-            message="testRoot must be set for this task"
-            unless="testRoot"/>
-        <mkdir
-            dir="${testRoot}"/>
-
-        <!-- if results already exist, delete them -->
-        <delete
-            dir="${testRoot}/results"
-            failOnError="false"/>
-        <mkdir
-            dir="${testRoot}/results"/>
-        <mkdir
-            dir="${testRoot}/results/consolelogs"/>
-        <copy
-            todir="${testRoot}"
-            overwrite="true">
-            <fileset
-                dir="${test.component.dir}/testScripts"/>
-        </copy>
-        <echo
-            message="BASEOS: ${env.BASEOS}   BASEWS: ${env.BASEWS}   BASEARCH: ${env.BASEARCH} "/>
-        <ant
-            antfile="${test.component.dir}/testdependency.xml"
-            target="get">
-            <property
-                name="dependency.properties"
-                value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-            <property
-                name="base.install.dir"
-                value="${testRoot}"/>
-        </ant>
-        <antcall
-            target="unzipTests"/>
-        <antcall
-            target="runTestEclipse">
-            <param
-                name="testTarget"
-                value="all"/>
-        </antcall>
-        <antcall
-            target="postRunTestEclipse">
-            <param
-                name="testTarget"
-                value="all"/>
-        </antcall>
-    </target>
-    <target
-        name="unzipTests">
-        <!--
-            unzip the builds and junit tests we use 'unzip' here, so we
-            can continue on error, if desired. (such as if zip was not
-            created, due to other failures or options).
-        -->
-        <echo
-            message="installing sdk"/>
-        <exec
-            dir="${buildDirectory}/${buildLabel}"
-            executable="unzip"
-            failonerror="true">
-            <arg
-                line="-o -qq  wtp-jsdt-sdk-${buildLabel}.zip -d ${testRoot}${dropinsFolder}"/>
-        </exec>
-        <echo
-            message="installing tests"/>
-        <exec
-            dir="${buildDirectory}/${buildLabel}"
-            executable="unzip"
-            failonerror="false">
-            <arg
-                line="-o -qq wtp-jsdt-tests-${buildLabel}.zip -d ${testRoot}${dropinsFolder}"/>
-        </exec>
-    </target>
-    <!--
-        time out may need to be set/adjust for api or performance tests?
-        This testTimeLimit is the whole, overall limit on tests. There's
-        a shorter one for individual suites. some common values, of
-        milliseconds to more recognizable units: 7200000: 2 hours
-        3600000: 1 hour 1800000: 30 minutes 600000: 10 minutes
-    -->
-    <property
-        name="testTimeLimit"
-        value="7200000"/>
-    <property
-        name="testFailOnError"
-        value="false"/>
-    <target
-        name="runTestEclipse"
-        description="Run our JUnit's within an instance of antRunner">
-        <property
-            name="test-vm"
-            value="${env.JAVA_6_HOME}/bin/java"/>
-
-        <property
-            name="vmargs"
-            value="-Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm}  -Dperf.buildId=${buildType}${date}-${time}"/>
-        <!--
-            set path to eclipse folder. If local folder, use '.';
-            otherwise, use c:\path\to\eclipse or /path/to/eclipse/
-        -->
-        <property
-            name="eclipse.home"
-            value="${testRoot}"/>
-        <echo
-            message="Running junits"/>
-        <!--
-            Remember: using -debug for org.eclipse.ant.core.antRunner
-            produces ant debug info to be output ... which is a TON of
-            stuff
-        -->
-        <echo
-            message="eclipse.launcher: ${eclipse.launcher}"/>
-        <java
-            taskname="unit-test-masterprocess"
-            fork="true"
-            resultProperty="wtpmasterjunitresult"
-            failonerror="false"
-            timeout="${testTimeLimit}"
-            dir="${testRoot}/eclipse"
-            jvm="${env.JAVA_6_HOME}/bin/java"
-            classname="org.eclipse.equinox.launcher.Main">
-            <classpath>
-                <fileset
-                    dir="${testRoot}/eclipse/plugins">
-                    <include
-                        name="org.eclipse.equinox.launcher_*.jar"/>
-                </fileset>
-            </classpath>
-            <jvmarg
-                value="-Xmx512m"/>
-            <jvmarg
-                value="-Dosgi.ws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dosgi.os=${env.BASEOS}"/>
-            <jvmarg
-                value="-Dosgi.arch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-Dws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dos=${env.BASEOS}"/>
-            <jvmarg
-                value="-Darch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-Dnoclean=true"/>
-            <jvmarg
-                value="-DbuildBranch=${buildBranch}"/>
-            <jvmarg
-                value="-DbuildType=${buildType}"/>
-            <jvmarg
-                value="-DbuildId=${buildId}"/>
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <jvmarg
-                value="-Dprojectname=${projectname}"/>
-            <arg
-                value="-nosplash"/>
-            <arg
-                value="-consolelog"/>
-            <arg
-                value="-data"/>
-            <arg
-                value="${testRoot}/overallTestWorkspace"/>
-            <arg
-                value="-application"/>
-            <arg
-                value="org.eclipse.ant.core.antRunner"/>
-            <arg
-                value="-file"/>
-            <arg
-                value="${testRoot}/test.xml"/>
-            <arg
-                value="-logger"/>
-            <arg
-                value="org.apache.tools.ant.DefaultLogger"/>
-            <env
-                key="DISPLAY"
-                value="${env.DISPLAY}"/>
-            <redirector
-                output="${testRoot}/results/fullOutput.txt"
-                error="${testRoot}/results/fullErrorLog.txt"/>
-            <sysproperty
-                key="build.home"
-                value="${env.BUILD_HOME}"/>
-            <sysproperty
-                key="buildDirectory"
-                value="${buildDirectory}"/>
-            <sysproperty
-                key="buildLabel"
-                value="${buildLabel}"/>
-            <sysproperty
-                key="baseLocation"
-                value="${baseLocation}"/>
-            <sysproperty
-                key="testRoot"
-                value="${testRoot}"/>
-            <sysproperty
-                key="testDir"
-                value="${testRoot}"/>
-            <sysproperty
-                key="perf.buildId"
-                value="${buildType}${date}-${time}"/>
-            <sysproperty
-                key="eclipseBuilderDirectory"
-                value="${pde.builder.path}"/>
-            <sysproperty
-                key="buildLabel"
-                value="${buildLabel}"/>
-        </java>
-        <echo
-            message="wtpmasterjunitresult ${wtpmasterjunitresult}"/>
-    </target>
-    <target
-        name="postRunTestEclipse">
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/consolelogs/testLogs"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results">
-                <include
-                    name="*output.txt"/>
-            </fileset>
-        </copy>
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/consolelogs/testSysErrorLogs"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results">
-                <include
-                    name="*error.txt"/>
-            </fileset>
-        </copy>
-        <copy
-            file="${testRoot}/results/fullOutput.txt"
-            toDir="${buildDirectory}/${buildLabel}/testResults/consolelogs/full"
-            overwrite="true"
-            failonerror="false">
-        </copy>
-        <copy
-            file="${testRoot}/results/fullErrorLog.txt"
-            toDir="${buildDirectory}/${buildLabel}/testResults/consolelogs/full"
-            overwrite="true"
-            failonerror="false">
-        </copy>
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/xml"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results/xml">
-                <include
-                    name="*.xml"/>
-            </fileset>
-        </copy>
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/html"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results/html">
-                <include
-                    name="*.html"/>
-            </fileset>
-        </copy>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/jsdt.tests/templateFiles/index.php b/releng.wtpbuilder/distribution/jsdt.tests/templateFiles/index.php
deleted file mode 100644
index a42c883..0000000
--- a/releng.wtpbuilder/distribution/jsdt.tests/templateFiles/index.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<html>
-<head>
-
-<?php
-$parts = explode("/", realpath(".."));
-$label = $parts[count($parts) - 1];
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-</head>
-<body>
-<p><b><font face="Verdana" size="+3">Test Results</font></b></p>
-<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">Unit Test Results for <?php echo "$label"; ?>
-		</font></b></td>
-	</tr>
-</table>
-<p></p>
-<table border="0">
-</table>
-
-<table width="77%" border="1">
-	<tr>
-		<td width="81%"><b>Tests Performed</b></td>
-		<td width="19%"><b>Errors &amp; Failures</b></td>
-	</tr>
-
-	<?
-	$dir = dir("html");
-	while ($anEntry = $dir->read())
-	{
-		if ($anEntry != "." && $anEntry != "..")
-		{
-			$link = "html/".$anEntry;
-			$xml = "xml/".substr($anEntry, 0, strlen($anEntry)-4)."xml";
-			$count = 0;
-			$fileHandle = fopen($xml, "r");
-			while (!feof($fileHandle))
-			{
-				$aLine = fgets($fileHandle, 4096); // Length parameter only optional after 4.2.0
-				$count = $count + substr_count($aLine, '<error');
-			}
-			fclose($fileHandle);
-			if ($count > 0)
-			{
-				echo "<tr><td><a href=\"$link\"><b><font color=\"red\">";
-				echo "$anEntry";
-				echo "</font></b></a></td>";
-				echo "<td><b><font color=\"red\">$count</font></b></td></tr>";
-			}
-			else
-			{
-				echo "<tr><td><a href=\"$link\">";
-				echo "$anEntry";
-				echo "</a></td>";
-				echo "<td>$count</td></tr>";
-			}
-		}
-	}
-	?>
-
-</table>
-<p></p>
-<br>
-<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"> Console output logs <?php echo "$label"; ?>
-		</font></b></td>
-	</tr>
-</table>
-<br>
-These
-<a href="consolelogs/wtptestlog.txt">logs</a>
-contain the console output captured while running the JUnit automated
-tests.
-<br>
-<br>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/jsdt.tests/testScripts/JUNIT.XSL b/releng.wtpbuilder/distribution/jsdt.tests/testScripts/JUNIT.XSL
deleted file mode 100644
index 9cdd80e..0000000
--- a/releng.wtpbuilder/distribution/jsdt.tests/testScripts/JUNIT.XSL
+++ /dev/null
@@ -1,703 +0,0 @@
-<xsl:stylesheet
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="1.0">
-    <xsl:output
-        method="html"
-        indent="yes"/>
-    <xsl:decimal-format
-        decimal-separator="."
-        grouping-separator=","/>
-    <xsl:template
-        match="testsuites">
-        <HTML>
-            <HEAD>
-                <style
-                    type="text/css"> body { font:normal 68%
-                    verdana,arial,helvetica; color:#000000; } table tr
-                    td, table tr th { font-size: 68%; } table.details tr
-                    th{ font-weight: bold; text-align:left;
-                    background:#a6caf0; } table.details tr td{
-                    background:#eeeee0; } p { line-height:1.5em;
-                    margin-top:0.5em; margin-bottom:1.0em; } h1 {
-                    margin: 0px 0px 5px; font: 165%
-                    verdana,arial,helvetica } h2 { margin-top: 1em;
-                    margin-bottom: 0.5em; font: bold 125%
-                    verdana,arial,helvetica } h3 { margin-bottom: 0.5em;
-                    font: bold 115% verdana,arial,helvetica } h4 {
-                    margin-bottom: 0.5em; font: bold 100%
-                    verdana,arial,helvetica } h5 { margin-bottom: 0.5em;
-                    font: bold 100% verdana,arial,helvetica } h6 {
-                    margin-bottom: 0.5em; font: bold 100%
-                    verdana,arial,helvetica } .Error { font-weight:bold;
-                    color:red; } .Failure { font-weight:bold;
-                    color:purple; } .Properties { text-align:right; } </style>
-                <script
-                    language="JavaScript">
-                    var TestCases = new Array(); var cur;
-                    <xsl:for-each
-                        select="./testsuite">
-                        <xsl:apply-templates
-                            select="properties"/>
-                    </xsl:for-each>
-                </script>
-                <script
-                    language="JavaScript"><![CDATA[
-        function displayProperties (name) {
-          var win = window.open('','JUnitSystemProperties','scrollbars=1,resizable=1');
-          var doc = win.document.open();
-          doc.write("<html><head><title>Properties of " + name + "</title>");
-          doc.write("<style>")
-          doc.write("body {font:normal 68% verdana,arial,helvetica;	color:#000000; }");
-          doc.write("table tr td, table tr th { font-size: 68%; }");
-          doc.write("table.properties { border-collapse:collapse; border-left:solid 1 #cccccc; border-top:solid 1 #cccccc; padding:5px; }");
-          doc.write("table.properties th { text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#eeeeee; }");
-          doc.write("table.properties td { font:normal; text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#fffffff; }");
-          doc.write("h3 { margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica }");
-          doc.write("</style>");
-          doc.write("</head><body>");
-          doc.write("<h3>Properties of " + name + "</h3>");
-          doc.write("<div align=\"right\"><a href=\"javascript:window.close();\">Close</a></div>");
-          doc.write("<table class='properties'>");
-          doc.write("<tr><th>Name</th><th>Value</th></tr>");
-          for (prop in TestCases[name]) {
-            doc.write("<tr><th>" + prop + "</th><td>" + TestCases[name][prop] + "</td></tr>");
-          }
-          doc.write("</table>");
-          doc.write("</body></html>");
-          doc.close();
-          win.focus();
-        }
-      ]]>
-                </script>
-            </HEAD>
-            <body>
-                <a
-                    name="top"></a>
-                <xsl:call-template
-                    name="pageHeader"/>
-
-                <!-- Summary part -->
-                <xsl:call-template
-                    name="summary"/>
-                <hr
-                    size="1"
-                    width="95%"
-                    align="left"/>
-
-                <!-- Package List part -->
-                <xsl:call-template
-                    name="packagelist"/>
-                <hr
-                    size="1"
-                    width="95%"
-                    align="left"/>
-
-                <!-- For each package create its part -->
-                <xsl:call-template
-                    name="packages"/>
-                <hr
-                    size="1"
-                    width="95%"
-                    align="left"/>
-
-                <!-- For each class create the  part -->
-                <xsl:call-template
-                    name="classes"/>
-            </body>
-        </HTML>
-    </xsl:template>
-    <!--
-        ==================================================================
-    -->
-    <!--
-        Write a list of all packages with an hyperlink to the anchor of
-    -->
-    <!--
-        of the package name.
-    -->
-    <!--
-        ==================================================================
-    -->
-    <xsl:template
-        name="packagelist">
-        <h2>Packages</h2>
-        Note: package statistics are not computed recursively, they only
-        sum up all of its testsuites numbers.
-        <table
-            class="details"
-            border="0"
-            cellpadding="5"
-            cellspacing="2"
-            width="95%">
-            <xsl:call-template
-                name="testsuite.test.header"/>
-            <!-- list all packages recursively -->
-            <xsl:for-each
-                select="./testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
-                <xsl:sort
-                    select="@package"/>
-                <xsl:variable
-                    name="testsuites-in-package"
-                    select="/testsuites/testsuite[./@package = current()/@package]"/>
-                <xsl:variable
-                    name="testCount"
-                    select="sum($testsuites-in-package/@tests)"/>
-                <xsl:variable
-                    name="errorCount"
-                    select="sum($testsuites-in-package/@errors)"/>
-                <xsl:variable
-                    name="failureCount"
-                    select="sum($testsuites-in-package/@failures)"/>
-                <xsl:variable
-                    name="timeCount"
-                    select="sum($testsuites-in-package/@time)"/>
-
-                <!-- write a summary for the package -->
-                <tr
-                    valign="top">
-                    <!-- set a nice color depending if there is an error/failure -->
-                    <xsl:attribute
-                        name="class">
-						<xsl:choose>
-							<xsl:when
-                        test="$failureCount &gt; 0">Failure</xsl:when>
-							<xsl:when
-                        test="$errorCount &gt; 0">Error</xsl:when>
-						</xsl:choose>
-					</xsl:attribute>
-                    <td>
-                        <a
-                            href="#{@package}">
-                            <xsl:value-of
-                                select="@package"/>
-                        </a>
-                    </td>
-                    <td>
-                        <xsl:value-of
-                            select="$testCount"/>
-                    </td>
-                    <td>
-                        <xsl:value-of
-                            select="$errorCount"/>
-                    </td>
-                    <td>
-                        <xsl:value-of
-                            select="$failureCount"/>
-                    </td>
-                    <td>
-                        <xsl:call-template
-                            name="display-time">
-                            <xsl:with-param
-                                name="value"
-                                select="$timeCount"/>
-                        </xsl:call-template>
-                    </td>
-                </tr>
-            </xsl:for-each>
-        </table>
-    </xsl:template>
-    <!--
-        ==================================================================
-    -->
-    <!--
-        Write a package level report
-    -->
-    <!--
-        It creates a table with values from the document:
-    -->
-    <!--
-        Name | Tests | Errors | Failures | Time
-    -->
-    <!--
-        ==================================================================
-    -->
-    <xsl:template
-        name="packages">
-        <!-- create an anchor to this package name -->
-        <xsl:for-each
-            select="/testsuites/testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
-            <xsl:sort
-                select="@package"/>
-            <a
-                name="{@package}"></a>
-            <h3>
-                Package
-                <xsl:value-of
-                    select="@package"/>
-            </h3>
-            <table
-                class="details"
-                border="0"
-                cellpadding="5"
-                cellspacing="2"
-                width="95%">
-                <xsl:call-template
-                    name="testsuite.test.header"/>
-
-                <!-- match the testsuites of this package -->
-                <xsl:apply-templates
-                    select="/testsuites/testsuite[./@package = current()/@package]"
-                    mode="print.test"/>
-            </table>
-            <a
-                href="#top">Back to top</a>
-            <p/>
-            <p/>
-        </xsl:for-each>
-    </xsl:template>
-    <xsl:template
-        name="classes">
-        <xsl:for-each
-            select="testsuite">
-            <xsl:sort
-                select="@name"/>
-            <!-- create an anchor to this class name -->
-            <a
-                name="{@name}"></a>
-            <h3>
-                TestCase
-                <xsl:value-of
-                    select="@name"/>
-            </h3>
-            <table
-                class="details"
-                border="0"
-                cellpadding="5"
-                cellspacing="2"
-                width="95%">
-                <xsl:call-template
-                    name="testcase.test.header"/>
-                <!--
-                    test can even not be started at all (failure to load
-                    the class) so report the error directly
-                -->
-                <xsl:if
-                    test="./error">
-                    <tr
-                        class="Error">
-                        <td
-                            colspan="4">
-                            <xsl:apply-templates
-                                select="./error"/>
-                        </td>
-                    </tr>
-                </xsl:if>
-                <xsl:apply-templates
-                    select="./testcase"
-                    mode="print.test"/>
-            </table>
-            <div
-                class="Properties">
-                <a>
-                    <xsl:attribute
-                        name="href">javascript:displayProperties('<xsl:value-of
-                        select="@package"/>.<xsl:value-of
-                        select="@name"/>');</xsl:attribute>
-                    Properties &gt;&gt;
-                </a>
-            </div>
-            <p/>
-            <a
-                href="#top">Back to top</a>
-        </xsl:for-each>
-    </xsl:template>
-    <xsl:template
-        name="summary">
-        <h2>Summary</h2>
-        <xsl:variable
-            name="testCount"
-            select="sum(testsuite/@tests)"/>
-        <xsl:variable
-            name="errorCount"
-            select="sum(testsuite/@errors)"/>
-        <xsl:variable
-            name="failureCount"
-            select="sum(testsuite/@failures)"/>
-        <xsl:variable
-            name="timeCount"
-            select="sum(testsuite/@time)"/>
-        <xsl:variable
-            name="successRate"
-            select="($testCount - $failureCount - $errorCount) div $testCount"/>
-        <table
-            class="details"
-            border="0"
-            cellpadding="5"
-            cellspacing="2"
-            width="95%">
-            <tr
-                valign="top">
-                <th>Tests</th>
-                <th>Failures</th>
-                <th>Errors</th>
-                <th>Success rate</th>
-                <th>Time</th>
-            </tr>
-            <tr
-                valign="top">
-                <xsl:attribute
-                    name="class">
-				<xsl:choose>
-					<xsl:when
-                    test="$failureCount &gt; 0">Failure</xsl:when>
-					<xsl:when
-                    test="$errorCount &gt; 0">Error</xsl:when>
-				</xsl:choose>
-			</xsl:attribute>
-                <td>
-                    <xsl:value-of
-                        select="$testCount"/>
-                </td>
-                <td>
-                    <xsl:value-of
-                        select="$failureCount"/>
-                </td>
-                <td>
-                    <xsl:value-of
-                        select="$errorCount"/>
-                </td>
-                <td>
-                    <xsl:call-template
-                        name="display-percent">
-                        <xsl:with-param
-                            name="value"
-                            select="$successRate"/>
-                    </xsl:call-template>
-                </td>
-                <td>
-                    <xsl:call-template
-                        name="display-time">
-                        <xsl:with-param
-                            name="value"
-                            select="$timeCount"/>
-                    </xsl:call-template>
-                </td>
-            </tr>
-        </table>
-        <table
-            border="0"
-            width="95%">
-            <tr>
-                <td
-                    style="text-align: justify;">
-                    Note:
-                    <i>failures</i>
-                    are anticipated and checked for with assertions
-                    while
-                    <i>errors</i>
-                    are unanticipated.
-                </td>
-            </tr>
-        </table>
-    </xsl:template>
-    <!--
-        Write properties into a JavaScript data structure. This is based
-        on the original idea by Erik Hatcher (erik@hatcher.net)
-    -->
-    <xsl:template
-        match="properties">
-        cur = TestCases['
-        <xsl:value-of
-            select="../@package"/>
-        .
-        <xsl:value-of
-            select="../@name"/>
-        '] = new Array();
-        <xsl:for-each
-            select="property">
-            <xsl:sort
-                select="@name"/>
-            cur['
-            <xsl:value-of
-                select="@name"/>
-            '] = '
-            <xsl:call-template
-                name="JS-escape">
-                <xsl:with-param
-                    name="string"
-                    select="@value"/>
-            </xsl:call-template>
-            ';
-        </xsl:for-each>
-    </xsl:template>
-
-    <!-- Page HEADER -->
-    <xsl:template
-        name="pageHeader">
-        <h1>Unit Test Results</h1>
-        <table
-            width="100%">
-            <tr>
-                <td
-                    align="left"></td>
-                <td
-                    align="right">
-                    Designed for use with
-                    <a
-                        href='http://www.junit.org'>JUnit</a>
-                    and
-                    <a
-                        href='http://jakarta.apache.org/ant'>Ant</a>
-                    .
-                </td>
-            </tr>
-        </table>
-        <hr
-            size="1"/>
-    </xsl:template>
-    <xsl:template
-        match="testsuite"
-        mode="header">
-        <tr
-            valign="top">
-            <th
-                width="80%">Name</th>
-            <th>Tests</th>
-            <th>Errors</th>
-            <th>Failures</th>
-            <th
-                nowrap="nowrap">Time(s)</th>
-        </tr>
-    </xsl:template>
-
-    <!-- class header -->
-    <xsl:template
-        name="testsuite.test.header">
-        <tr
-            valign="top">
-            <th
-                width="80%">Name</th>
-            <th>Tests</th>
-            <th>Errors</th>
-            <th>Failures</th>
-            <th
-                nowrap="nowrap">Time(s)</th>
-        </tr>
-    </xsl:template>
-
-    <!-- method header -->
-    <xsl:template
-        name="testcase.test.header">
-        <tr
-            valign="top">
-            <th>Name</th>
-            <th>Status</th>
-            <th
-                width="80%">Type</th>
-            <th
-                nowrap="nowrap">Time(s)</th>
-        </tr>
-    </xsl:template>
-
-
-    <!-- class information -->
-    <xsl:template
-        match="testsuite"
-        mode="print.test">
-        <tr
-            valign="top">
-            <!-- set a nice color depending if there is an error/failure -->
-            <xsl:attribute
-                name="class">
-			<xsl:choose>
-				<xsl:when
-                test="@failures[.&gt; 0]">Failure</xsl:when>
-				<xsl:when
-                test="@errors[.&gt; 0]">Error</xsl:when>
-			</xsl:choose>
-		</xsl:attribute>
-
-            <!-- print testsuite information -->
-            <td>
-                <a
-                    href="#{@name}">
-                    <xsl:value-of
-                        select="@name"/>
-                </a>
-            </td>
-            <td>
-                <xsl:value-of
-                    select="@tests"/>
-            </td>
-            <td>
-                <xsl:value-of
-                    select="@errors"/>
-            </td>
-            <td>
-                <xsl:value-of
-                    select="@failures"/>
-            </td>
-            <td>
-                <xsl:call-template
-                    name="display-time">
-                    <xsl:with-param
-                        name="value"
-                        select="@time"/>
-                </xsl:call-template>
-            </td>
-        </tr>
-    </xsl:template>
-    <xsl:template
-        match="testcase"
-        mode="print.test">
-        <tr
-            valign="top">
-            <xsl:attribute
-                name="class">
-			<xsl:choose>
-				<xsl:when
-                test="failure | error">Error</xsl:when>
-			</xsl:choose>
-		</xsl:attribute>
-            <td>
-                <xsl:value-of
-                    select="@name"/>
-            </td>
-            <xsl:choose>
-                <xsl:when
-                    test="failure">
-                    <td>Failure</td>
-                    <td>
-                        <xsl:apply-templates
-                            select="failure"/>
-                    </td>
-                </xsl:when>
-                <xsl:when
-                    test="error">
-                    <td>Error</td>
-                    <td>
-                        <xsl:apply-templates
-                            select="error"/>
-                    </td>
-                </xsl:when>
-                <xsl:otherwise>
-                    <td>Success</td>
-                    <td></td>
-                </xsl:otherwise>
-            </xsl:choose>
-            <td>
-                <xsl:call-template
-                    name="display-time">
-                    <xsl:with-param
-                        name="value"
-                        select="@time"/>
-                </xsl:call-template>
-            </td>
-        </tr>
-    </xsl:template>
-    <xsl:template
-        match="failure">
-        <xsl:call-template
-            name="display-failures"/>
-    </xsl:template>
-    <xsl:template
-        match="error">
-        <xsl:call-template
-            name="display-failures"/>
-    </xsl:template>
-
-    <!-- Style for the error and failure in the tescase template -->
-    <xsl:template
-        name="display-failures">
-        <xsl:choose>
-            <xsl:when
-                test="not(@message)">
-                N/A
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of
-                    select="@message"/>
-            </xsl:otherwise>
-        </xsl:choose>
-        <!-- display the stacktrace -->
-        <code>
-            <p/>
-            <xsl:call-template
-                name="br-replace">
-                <xsl:with-param
-                    name="word"
-                    select="."/>
-            </xsl:call-template>
-        </code>
-        <!--
-            the later is better but might be problematic for non-21"
-            monitors...
-        -->
-        <!--pre><xsl:value-of select="."/></pre-->
-    </xsl:template>
-    <xsl:template
-        name="JS-escape">
-        <xsl:param
-            name="string"/>
-        <xsl:choose>
-            <!--
-                something isn't right here, basically all single quotes
-                need to be replaced with backslash-single-quote
-                <xsl:when test="contains($string,'&apos;')">
-                <xsl:value-of
-                select="substring-before($string,'&apos;')"/> \&apos;
-                <xsl:call-template name="JS-escape"> <xsl:with-param
-                name="string"
-                select="substring-after($string,'&apos;')"/>
-                </xsl:call-template> </xsl:when>
-            -->
-            <xsl:when
-                test="contains($string,'\')">
-                <xsl:value-of
-                    select="substring-before($string,'\')"/>
-                \\
-                <xsl:call-template
-                    name="JS-escape">
-                    <xsl:with-param
-                        name="string"
-                        select="substring-after($string,'\')"/>
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of
-                    select="$string"/>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-    <!--
-        template that will convert a carriage return into a br tag
-        @param word the text from which to convert CR to BR tag
-    -->
-    <xsl:template
-        name="br-replace">
-        <xsl:param
-            name="word"/>
-        <xsl:choose>
-            <xsl:when
-                test="contains($word,'&#xA;')">
-                <xsl:value-of
-                    select="substring-before($word,'&#xA;')"/>
-                <br/>
-                <xsl:call-template
-                    name="br-replace">
-                    <xsl:with-param
-                        name="word"
-                        select="substring-after($word,'&#xA;')"/>
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of
-                    select="$word"/>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-    <xsl:template
-        name="display-time">
-        <xsl:param
-            name="value"/>
-        <xsl:value-of
-            select="format-number($value,'0.000')"/>
-    </xsl:template>
-    <xsl:template
-        name="display-percent">
-        <xsl:param
-            name="value"/>
-        <xsl:value-of
-            select="format-number($value,'0.00%')"/>
-    </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/jsdt.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/jsdt.tests/testScripts/test.xml
deleted file mode 100644
index 96c6ddc..0000000
--- a/releng.wtpbuilder/distribution/jsdt.tests/testScripts/test.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<project
-    name="Automated Eclipse Testing"
-    default="all"
-    basedir=".">
-    <property
-        environment="env"/>
-
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-    <echo
-        level="info"
-        message="starting Automated Eclipse Testing"/>
-    <echo
-        level="debug"
-        message="basedir: ${basedir}"/>
-    <echo
-        level="debug"
-        message="testRoot: ${testRoot}"/>
-    <fail
-        message="testRoot must be set"
-        unless="testRoot"/>
-
-    <!--properties file containing the build information-->
-    <property
-        file="${buildDirectory}/label.properties"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-    <!--default directory where test-eclipse will be installed-->
-    <property
-        name="install"
-        value="${testRoot}"/>
-    <!--
-        name that can be added to report name to identify which platform
-        tests results come from
-    -->
-    <property
-        name="platform"
-        value=""/>
-
-    <!-- The root of the eclipse installation -->
-    <property
-        name="eclipse-home"
-        value="${testRoot}${dropinsFolder}/eclipse/"/>
-    <!--
-        The directory that will contain the xml and html results from
-        the tests that are run
-    -->
-    <property
-        name="results"
-        value="${testRoot}/results"/>
-    <property
-        name="library-file"
-        value="${testRoot}/wtp-junit-tests.xml"/>
-    <target
-        name="init">
-    </target>
-    <target
-        name="all"
-        depends="init">
-        <echo
-            level="info"
-            message="Starting Unit Tests"/>
-        <!--
-            unlike other ant tasks, subant defaults to false for
-            inheritall!
-        -->
-        <subant
-            target=""
-            inheritall="true">
-            <fileset
-                dir="${eclipse-home}/plugins/">
-                <exclude
-                    name="**/*performance*/test.xml"/>
-                <include
-                    name="**/test.xml"/>
-            </fileset>
-        </subant>
-        <echo
-            level="info"
-            message="Ended Unit Tests"/>
-        <antcall
-            target="genHtml"/>
-    </target>
-    <target
-        name="genHtml"
-        description="Generates HTML results with provided JUNIT.XSL provided"
-        unless="genHtml.disable">
-        <xslt
-            style="JUNIT.XSL"
-            basedir="${results}/xml"
-            destdir="${results}/html"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/jsdt.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/jsdt.tests/testScripts/wtp-junit-tests.xml
deleted file mode 100644
index 62f4501..0000000
--- a/releng.wtpbuilder/distribution/jsdt.tests/testScripts/wtp-junit-tests.xml
+++ /dev/null
@@ -1,317 +0,0 @@
-<?xml version="1.0"?>
-<project
-    name="JUnit tests"
-    basedir=".">
-    <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-    <target
-        name="init">
-        <property
-            name="junit-report-output"
-            value="${testRoot}/results"/>
-        <mkdir
-            dir="${junit-report-output}/raw"/>
-        <!--
-            if not otherwise set, be sure extraVMargs is at least some
-            string, even if unused string. 
-            
-            Remember, though, extraVMArgs can contain more than one extra arg, 
-            so much be passed to VM as a "line", not "value". 
-        -->
-        <property
-            name="extraVMargs"
-            value="-DextraVMargsunused=notused"/>
-
-        <!-- if not otherwise set, use a unique workspace name -->
-        <property
-            name="data-dir"
-            value="${testRoot}/junitworkspaces/workspace-${classname}"/>
-        <property
-            name="testRoot"
-            value="${testRoot}"/>
-        <!--
-            Some common values, of milliseconds to more recognizable
-            units: 14400000: 4 hours 7200000: 2 hours 3600000: 1 hour
-            1800000: 30 minutes 600000: 10 minutes
-        -->
-        <property
-            name="timeout"
-            value="1800000"/>
-        <property
-            name="junit-report-output"
-            value="${junit-report-output}"/>
-        <property
-            name="formatter"
-            value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter"/>
-        <property
-            name="test-output"
-            value="${junit-report-output}/raw/${classname}.xml"/>
-        <property
-            name="jvm"
-            value="${env.JAVA_6_HOME}/bin/java"/>
-        <dirname
-            file="${ant.file}"
-            property="currentDir"/>
-        <echo
-            level="debug"
-            message="data-dir: ${data-dir}"/>
-        <echo
-            level="debug"
-            message="plugin-name: ${plugin-name}"/>
-        <echo
-            level="debug"
-            message="classname: ${classname}"/>
-        <echo
-            level="info"
-            message="extraVMargs: ${extraVMargs}"/>
-        <echo
-            level="debug"
-            message="timeout: ${timeout}"/>
-        <echo
-            level="debug"
-            message="testRoot: ${testRoot}"/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="debug"
-            message="eclipse-home: ${eclipse-home}"/>
-        <echo
-            level="debug"
-            message="junit-report-output: ${junit-report-output}"/>
-        <echo
-            level="debug"
-            message="test-output: ${test-output}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="buildLabel: ${buildLabel}"/>
-        <echo
-            level="debug"
-            message="jvm: ${jvm}"/>
-    </target>
-    <target
-        name="core-test"
-        depends="init">
-        <echo
-            level="info"
-            message="test-type: core-test"/>
-        <ant
-            antfile="${ant.file}"
-            dir="${currentDir}"
-            target="eclipse-test">
-            <property
-                name="application"
-                value="org.eclipse.test.coretestapplication"/>
-        </ant>
-    </target>
-    <target
-        name="ui-test"
-        depends="init">
-        <echo
-            level="info"
-            message="test-type: ui-test"/>
-        <ant
-            antfile="${ant.file}"
-            dir="${currentDir}"
-            target="eclipse-test">
-            <property
-                name="application"
-                value="org.eclipse.test.uitestapplication"/>
-        </ant>
-    </target>
-    <target
-        name="eclipse-test"
-        description="Runs the specified classname as a plug-in test.">
-        <echo
-            level="info"
-            message="Running ${classname}"/>
-        <echo
-            level="debug"
-            message="Result file: ${junit-report-output}/${classname}.xml."/>
-        <echo
-            level="debug"
-            message="DISPLAY: ${env.DISPLAY}"/>
-        <mkdir
-            dir="${buildDirectory}/${buildLabel}/httplogstest"/>
-        <echo
-            message="http log messages to: ${buildDirectory}/${buildLabel}/httplogstest"/>
-    	
-       <condition
-           property="xulRunnerParam"
-           value="org.eclipse.swt.browser.XULRunnerPath"
-           else="XULRunnerPathNotSpecified">
-           <isset
-               property="env.WTP_XULRUNNER"/>
-       </condition>
-        <echo
-            message="xulRunnerParam: ${xulRunnerParam}"/>
-        <echo
-            message="WTP_XULRUNNER: ${env.WTP_XULRUNNER}"/>
-        <!--
-            If there is not exactly one launcher in the stack, we'd best
-            fail fast, since we are not expecting that, and may indicate
-            an installation that would produce unpredictable results
-        -->
-        <!--
-            requires ant 1.7, and at this point, we're running 1.6 from
-            eclipse ... <condition property="expectedNumberOfLaunchers">
-            <resourcecount when="equal" count="1" > <fileset
-            dir="${testRoot}/eclipse/plugins"> <include
-            name="org.eclipse.equinox.launcher_*.jar" /> </fileset>
-            </resourcecount> </condition> <fail message="Did not find
-            expected number of launcher jars. Check installation."
-            unless="expectedNumberOfLaunchers" />
-        -->
-        <java
-            taskname="suiteUnitTest"
-            fork="true"
-            resultProperty="suitejunitresult"
-            failonerror="false"
-            timeout="${timeout}"
-            dir="${testRoot}/eclipse"
-            jvm="${jvm}"
-            classname="org.eclipse.equinox.launcher.Main">
-            <classpath>
-                <fileset
-                    dir="${testRoot}/eclipse/plugins">
-                    <include
-                        name="org.eclipse.equinox.launcher_*.jar"/>
-                </fileset>
-            </classpath>
-            <jvmarg
-                value="-Xmx512m"/>
-            <jvmarg
-                value="-Dosgi.ws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dosgi.os=${env.BASEOS}"/>
-            <jvmarg
-                value="-Dosgi.arch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-DbuildLabel=${buildLabel}"/>
-            <jvmarg
-                value="-DbuildDirectory=${buildDirectory}"/>
-            <jvmarg
-                value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
-            <jvmarg
-                value="-DurlLogLocation=${buildDirectory}/${buildLabel}/httplogstest/outgoinghttplog-${plugin-name}.log"/>
-            <jvmarg
-                value="-Dwtp.autotest.noninteractive=true"/>
-            <jvmarg
-                line="${extraVMargs}"/>
-            <jvmarg
-                value="-Declipse.consolelog=true"/>
-            <jvmarg
-                value="-Dosgi.debug"/>
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <jvmarg
-                value="-Dprojectname=${projectname}"/>
-        	
-              <jvmarg
-                  value="-D${xulRunnerParam}=${env.WTP_XULRUNNER}"/> 	
-        	
-        	
-            <arg
-                value="-nosplash"/>
-            <arg
-                value="-data"/>
-            <arg
-                value="${data-dir}"/>
-            <arg
-                value="-application"/>
-            <arg
-                value="${application}"/>
-            <arg
-                value="formatter=${formatter},${test-output}"/>
-            <arg
-                value="-testPluginName"/>
-            <arg
-                value="${plugin-name}"/>
-            <arg
-                value="-className"/>
-            <arg
-                value="${classname}"/>
-            <env
-                key="DISPLAY"
-                value="${env.DISPLAY}"/>
-            <redirector
-                output="${junit-report-output}/${classname}.output.txt"
-                error="${junit-report-output}/${classname}.error.txt"/>
-        </java>
-        <echo
-            level="info"
-            message="suitejunitresult: ${suitejunitresult}"/>
-        <antcall
-            target="summarizeFailure"/>
-        <antcall
-            target="collect-results"/>
-    </target>
-    <target
-        name="collect-results">
-        <dirname
-            property="output-dir"
-            file="${test-output}"/>
-        <basename
-            property="output-file-name"
-            file="${test-output}"/>
-        <mkdir
-            dir="${junit-report-output}/xml"/>
-        <junitreport
-            todir="${junit-report-output}/xml"
-            tofile="${classname}.xml">
-            <fileset
-                dir="${output-dir}">
-                <include
-                    name="${output-file-name}"/>
-            </fileset>
-        </junitreport>
-        <mkdir
-            dir="${junit-report-output}/html"/>
-        <xslt
-            style="${testRoot}/JUNIT.XSL"
-            basedir="${junit-report-output}"
-            includes="${classname}.xml"
-            destdir="${junit-report-output}/html"/>
-    </target>
-    <target
-        name="collect">
-        <!--
-            deprecated, each test.xml uses it, and we should remove,
-            eventually
-        -->
-        <echo
-            message="Deprecated. There is no need to call the collect task. It no longer does anything. Please remove from your test.xml file"/>
-    </target>
-    <target
-        name="summarizeFailure"
-        depends="checkFailure"
-        if="doFailure">
-        <echo
-            append="true"
-            file="${buildDirectory}/junitFailureList.log">${plugin-name}${line.separator}</echo>
-    </target>
-    <target
-        name="checkFailure">
-        <condition
-            property="doFailure">
-            <not>
-                <equals
-                    arg1="${suitejunitresult}"
-                    arg2="0"
-                    trim="true"/>
-            </not>
-        </condition>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/jsdt.tests/testdependency.xml b/releng.wtpbuilder/distribution/jsdt.tests/testdependency.xml
deleted file mode 100644
index daf65f4..0000000
--- a/releng.wtpbuilder/distribution/jsdt.tests/testdependency.xml
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-    <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <fail
-        message="Required property file does not exist: ${keyCfgFile}">
-        <condition>
-            <not>
-                <available
-                    file="${keyCfgFile}"/>
-            </not>
-        </condition>
-    </fail>
-    <property
-        file="${keyCfgFile}"/>
-    <condition
-        property="getprereq.eclipse">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.eclipseplatform">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.emf">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.emfxsd">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.emfvalidation">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.gef">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.dtp">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.wst">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.jst">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.wtp">
-        <istrue
-            value="false"/>
-    </condition>
-    <target
-        name="get">
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined, which we do later with
-            statements such if="${groupId}.url"
-        -->
-        <property
-            file="${dependency.properties}"/>
-        <antcall
-            target="prereq.emf"/>
-        <antcall
-            target="prereq.emfxsd"/>
-        <antcall
-            target="prereq.emfvalidation"/>
-        <antcall
-            target="prereq.gef"/>
-        <antcall
-            target="prereq.dtp"/>
-        <antcall
-            target="prereq.wst"/>
-        <antcall
-            target="prereq.jst"/>
-        <antcall
-            target="prereq.wtp"/>
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="eclipseTestFramework"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.eclipse"
-        if="getprereq.eclipse">
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.eclipseplatform"
-        if="getprereq.eclipseplatform">
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="eclipseplatform"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emf"
-        if="getprereq.emf">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfxsd"
-        if="getprereq.emfxsd">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfvalidation"
-        if="getprereq.emfvalidation">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="emfvalidation"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.gef"
-        if="getprereq.gef">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.dtp"
-        if="getprereq.dtp">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="dtp"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wst"
-        if="getprereq.wst">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="wst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.jst"
-        if="getprereq.jst">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="jst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wtp"
-        if="getprereq.wtp">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="wtp"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstallBase"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-    <target
-        name="getAndInstallDropins"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}${dropinsFolder}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches.build/build.xml b/releng.wtpbuilder/distribution/patches.build/build.xml
deleted file mode 100644
index 62ae6ab..0000000
--- a/releng.wtpbuilder/distribution/patches.build/build.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<project
-    default="build"
-    basedir=".">
-    <fail
-        unless="wtp.builder.home"/>
-    <property
-        file="${wtp.builder.home}/build.properties"/>
-    <property
-        environment="env"/>
-
-    <!-- required to get proper value of doCreateFprojZips -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-
-    <!-- main -->
-    <target
-        name="build"
-        depends="getBaseBuilder">
-        <dirname
-            file="${ant.file}"
-            property="distribution.wtp.build.dir"/>
-        <property
-            name="buildTargets"
-            value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
-        <!--
-            if not otherwise set, assume its a legacy case that did not
-            use this
-        -->
-        <property
-            name="env.DEP_DIR"
-            value=""/>
-        <property
-            name="dependency.properties"
-            value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-
-        <!-- calling label.xml to createg label.properties file -->
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-        <echo
-            level="info"
-            message="invoking buildTargets: ${buildTargets} to build for each component"/>
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="wtp-patches"/>
-        </ant>
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="wtp-patches-tests"/>
-        </ant>
-    </target>
-    <target
-        name="getBaseBuilder"
-        if="eclipse.builder.fetch">
-        <dirname
-            file="${ant.file}"
-            property="wtbuilder.dir"/>
-        <property
-            name="buildTargets"
-            value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
-        <!-- delete dir="${pde.builder.path}" failonerror="false"/ -->
-        <ant
-            antfile="${buildTargets}"
-            target="getBaseBuilder"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches.site/build.xml b/releng.wtpbuilder/distribution/patches.site/build.xml
deleted file mode 100644
index 4748e65..0000000
--- a/releng.wtpbuilder/distribution/patches.site/build.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-<project
-    name="Build specific targets and properties"
-    default="build"
-    basedir=".">
-    <!--
-        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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- = = = end standard properties pattern = = = -->
-    <echo
-        message="ant.file: ${ant.file}"/>
-    <target
-        name="build">
-        <java
-            jar="${eclipse.launcher}"
-            fork="true"
-            failonerror="true">
-            <jvmarg
-                value="-Dosgi.ws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dosgi.os=${env.BASEOS}"/>
-            <jvmarg
-                value="-Dosgi.arch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-Dbuild.donottagmaps=${build.donottagmaps}"/>
-            <jvmarg
-                value="-DbuildBranch=${buildBranch}"/>
-            <jvmarg
-                value="-DbuildType=${buildType}"/>
-            <jvmarg
-                value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
-            <jvmarg
-                value="-DurlLogLocation=${buildDirectory}/outgoinghttplogfromsitebuild.log"/>
-            <jvmarg
-                value="-DbuildId=${buildId}"/>
-            <jvmarg
-                value="-DmapVersionTag=${mapVersionTag}"/>
-            <jvmarg
-                value="-Dbuild.distribution=${build.distribution}"/>
-            <jvmarg
-                value="-DbuildDirectory=${buildDirectory}"/>
-            <jvmarg
-                value="-Dwtp.builder.home=${wtp.builder.home}"/>
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <jvmarg
-                value="-Dprojectname=${projectname}"/>
-            <arg
-                value="-data"/>
-            <arg
-                value="${basedir}/workspace"/>
-            <arg
-                value="-application"/>
-            <arg
-                value="org.eclipse.ant.core.antRunner"/>
-            <arg
-                value="-buildfile"/>
-            <arg
-                value="${ant.file}"/>
-            <arg
-                value="publish"/>
-        </java>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Steps to do to publish the build results -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="publish">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-        <property
-            file="${buildDirectory}/label.properties"/>
-        <property
-            name="publish.xml"
-            value="${component.dir}/publish.xml"/>
-        <property
-            name="indexFileName"
-            value="index.php"/>
-        <property
-            name="result"
-            value="${buildDirectory}/${buildLabel}"/>
-        <property
-            name="indexTemplateFilename"
-            value="index.html.template.php"/>
-        <copy
-            file="${wtp.builder.home}/distribution/wtp.site/templateFiles/${indexTemplateFilename}"
-            tofile="${buildDirectory}/${indexFileName}"/>
-        <property
-            name="indexFileName"
-            value="index.php"/>
-        <property
-            name="result"
-            value="${buildDirectory}/${buildLabel}"/>
-        <property
-            name="indexTemplateFilename"
-            value="index.html.template.php"/>
-        <copy
-            file="${wtp.builder.home}/distribution/patches.site/templateFiles/${indexTemplateFilename}"
-            tofile="${buildDirectory}/${indexFileName}"/>
-        <condition
-            property="isBuildTested"
-            value="true">
-            <available
-                file="${buildDirectory}/${buildLabel}/testResults/html"/>
-        </condition>
-        <ant
-            antfile="${publish.xml}"
-            dir="${component.dir}">
-            <property
-                name="dropTokenList"
-                value="%wtpruntime%,%wtpsdk%,%wtptest%,%wst%,%wst-sdk%,%wst-tests%,%jst-tests%,%wst-perf-tests%,%jst-perf-tests%,%jpt-runtime%,%jpt-sdk%,%jpt-tests%"/>
-            <property
-                name="webtoolsDownloadURL"
-                value="http://www.eclipse.org/downloads/download.php?file=/webtools/committers/drops"/>
-            <property
-                name="buildBranch"
-                value="${buildBranch}"/>
-            <property
-                name="isBuildTested"
-                value="${isBuildTested}"/>
-            <property
-                name="indexTemplateFilename"
-                value="${indexTemplateFilename}"/>
-        </ant>
-
-        <!--  Get the build map over for the results to point to. -->
-        <copy
-            file="${buildDirectory}/directory.txt"
-            tofile="${result}/directory.txt"/>
-
-        <!-- Copy info for build identification -->
-        <copy
-            file="${buildDirectory}/buildmachineinfo.properties"
-            tofile="${result}/buildmachineinfo.properties"/>
-
-
-        <!-- http access logs -->
-        <copy
-            todir="${result}/"
-            failonerror="false">
-            <fileset
-                dir="${buildDirectory}"
-                includes="*.log"/>
-        </copy>
-
-        <!-- ant build log, from control directory -->
-        <copy
-            todir="${result}/"
-            failonerror="false">
-            <fileset
-                dir="${env.ANT_WORKING}/${projectname}"
-                includes="antBuilderOutput.log"/>
-        </copy>
-
-
-
-        <!-- final count files -->
-        <countBuildFiles
-            sourceDirectory="${buildDirectory}/${buildLabel}"
-            filterString=".zip,.tar.gz"
-            outputFile="${buildDirectory}/${buildLabel}/files.count"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches.site/compilerXMLOutputToHTML.xsl b/releng.wtpbuilder/distribution/patches.site/compilerXMLOutputToHTML.xsl
deleted file mode 100644
index ffc7905..0000000
--- a/releng.wtpbuilder/distribution/patches.site/compilerXMLOutputToHTML.xsl
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet
-    version="1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-    <xsl:output
-        method="html"
-        indent="yes"/>
-    <xsl:template
-        match="/">
-        <html>
-            <body>
-                <xsl:apply-templates
-                    select="compiler"/>
-            </body>
-        </html>
-    </xsl:template>
-    <xsl:template
-        match="compiler">
-        <h2>Compiler Report</h2>
-        <p>
-            Compiler:
-            <xsl:value-of
-                select="@name"/>
-            <xsl:text>   </xsl:text>
-            Version:
-            <xsl:value-of
-                select="@version"/>
-        </p>
-        <xsl:apply-templates
-            select="stats"/>
-        <xsl:apply-templates
-            select="sources"/>
-    </xsl:template>
-    <xsl:template
-        name="stats"
-        match="stats">
-        <p>
-            Number of source files:
-            <xsl:value-of
-                select="count(..//source)"/>
-            Number of classfiles:
-            <xsl:value-of
-                select="number_of_classfiles/@value"/>
-        </p>
-        <p>
-            Problems:
-            <xsl:value-of
-                select="problem_summary/@problems"/>
-            (Errors:
-            <xsl:value-of
-                select="problem_summary/@errors"/>
-            Warnings:
-            <xsl:value-of
-                select="problem_summary/@warnings"/>
-            )
-        </p>
-    </xsl:template>
-    <xsl:template
-        name="sources"
-        match="sources">
-        <xsl:if
-            test="count(source) > 0">
-            <dl>
-                <xsl:for-each
-                    select="source">
-                    <xsl:variable
-                        name="package"
-                        select="normalize-space(@package)">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="path"
-                        select="normalize-space(@path)">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="classname"
-                        select="substring-after($path, $package)">
-                    </xsl:variable>
-                    <xsl:if
-                        test="count(problems) > 0">
-                        <dt
-                            style="font-weight: bold; color: black">
-                            Source File:
-                            <xsl:value-of
-                                select="$package"/>
-                            <xsl:value-of
-                                select="$classname"/>
-                        </dt>
-                        <xsl:apply-templates
-                            select="problems">
-                            <xsl:with-param
-                                name="classname">
-                                <xsl:value-of
-                                    select="$classname"/>
-                            </xsl:with-param>
-                        </xsl:apply-templates>
-                    </xsl:if>
-                </xsl:for-each>
-            </dl>
-        </xsl:if>
-    </xsl:template>
-    <xsl:template
-        match="problems">
-        <xsl:param
-            name="classname"/>
-        <xsl:for-each
-            select="problem">
-            <dd
-                style="font-weight: normal; color: black">
-                <xsl:value-of
-                    select="position()"/>
-                <xsl:text>.  </xsl:text>
-                <xsl:value-of
-                    select="@severity"/>
-                <xsl:text>:  </xsl:text>
-                <xsl:value-of
-                    select="@id"/>
-                <xsl:variable
-                    name="lineNumber"
-                    select="@line">
-                </xsl:variable>
-                <xsl:for-each
-                    select="message">
-                    <p
-                        style="margin-left: +.5in; font-size: -1; margin-top: 0;margin-bottom:0;">
-                        <small>
-                            <xsl:value-of
-                                select="@value"/>
-                        </small>
-                    </p>
-                </xsl:for-each>
-                <xsl:for-each
-                    select="source_context">
-                    <xsl:variable
-                        name="pre"
-                        select="substring(@value,0,(@sourceStart + 1))">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="main"
-                        select="substring(@value,(@sourceStart + 1),(((@sourceEnd + 1) - (@sourceStart + 1)) + 1))">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="end"
-                        select="substring(@value,(@sourceEnd + 2))">
-                    </xsl:variable>
-                    <p
-                        style="margin-left: +.5in; font-size: -2; margin-top: 0;margin-bottom:0;">
-                        <xsl:value-of
-                            select="substring($classname,2)"/>
-                        :
-                    </p>
-                    <p
-                        style="margin-left: +.5in; font-size: -2;font-family: monospace; margin-top: 0;margin-bottom:0;">
-                        <xsl:value-of
-                            select="$lineNumber"/>
-                        :
-                        <xsl:value-of
-                            select="$pre"/>
-                        <b>
-                            <u>
-                                <xsl:value-of
-                                    select="$main"/>
-                            </u>
-                        </b>
-                        <xsl:value-of
-                            select="$end"/>
-                    </p>
-                </xsl:for-each>
-            </dd>
-        </xsl:for-each>
-    </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches.site/publish.xml b/releng.wtpbuilder/distribution/patches.site/publish.xml
deleted file mode 100644
index 52fd152..0000000
--- a/releng.wtpbuilder/distribution/patches.site/publish.xml
+++ /dev/null
@@ -1,568 +0,0 @@
-<project
-    name="Publish Build"
-    default="default"
-    basedir=".">
-    <!--
-        Properties that must be passed to this script: buildDirectory:
-        Path to perform the build in. (A working directory) buildType:
-        Type of build (nightly, integration etc.) buildId: Build name
-        buildLabel: <buildType>-<buildName>-<timestamp>
-    -->
-    <property
-        environment="env"/>
-    <property
-        name="resultDir"
-        value="${buildDirectory}/${buildLabel}"/>
-    <!--name of generated index page-->
-    <property
-        name="indexFileName"
-        value="index.php"/>
-    <property
-        name="templateDir"
-        value="${wtp.builder.home}/distribution/${build.distribution}.site"/>
-    <property
-        name="resultingIndex"
-        value="${resultDir}/${indexFileName}"/>
-    <echo
-        level="debug"
-        message="resultDir: ${resultDir}"/>
-    <echo
-        level="debug"
-        message="templateDir: ${templateDir}"/>
-    <echo
-        level="debug"
-        message="resultingIndex: ${resultingIndex}"/>
-    <target
-        name="default">
-        <copy
-            overwrite="true"
-            file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/${indexTemplateFilename}"
-            tofile="${resultingIndex}"/>
-        <antcall
-            target="countFiles"/>
-        <antcall
-            target="generateCompileIndex"/>
-        <antcall
-            target="generateJUnitTestsIndex"/>
-        <antcall
-            target="getStaticFiles"/>
-    </target>
-    <target
-        name="generateCompileIndex">
-        <!--
-            <taskdef name="indexResults"
-            classname="org.eclipse.wtp.releng.tools.ResultsSummaryGenerator"
-            />
-        -->
-        <!--
-            isBuildTested: true|false should JUnit plugin test results
-            be used to generate index page dropTokenList: comma
-            separated list of strings which should be replaced by the
-            fileName attribute settings in the testManifest.xml.
-            xmlDirectoryName: path to directory containing JUnit plugin
-            test results in xml format (see doc is org.eclipse.test).
-            dropDirectoryName: path to directory containing the result
-            of the build. testResultsTemplateFileName: path to template
-            file used to generate page with links to JUnit test results
-            testResultsHtmlFileName: name of file which will be
-            generated with links to JUnit test results dropHtmlFileName:
-            name of generated index page hrefTestResultsTargetPath:
-            relative path from index page to directory containing JUnit
-            html test results hrefCompileLogsTargetPath: relative path
-            from index page directory containing compilelogs
-            testManifestFileName: name of xml file containing
-            descriptions of zip types and log files
-        -->
-        <!--
-            if not otherwise set, assume its a legacy case that did not
-            use this
-        -->
-        <property
-            name="env.DEP_DIR"
-            value=""/>
-        <property
-            file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-
-        <!-- create tables of test plugin compiles first -->
-        <summarizeResults
-            isBuildTested="false"
-            includeAll="true"
-            dropTokenList="${dropTokenList}"
-            xmlDirectoryName=""
-            dropDirectoryName="${resultDir}"
-            testResultsTemplateFileName="${templateDir}/templateFiles/testCompileResults.php.template"
-            testResultsHtmlFileName="testCompileResults.php"
-            hrefTestResultsTargetPath=""
-            hrefCompileLogsTargetPath="testcompilelogs"
-            compileLogsDirectoryName="${resultDir}/testcompilelogs"/>
-        <xslt
-            basedir="${resultDir}/testcompilelogs"
-            destdir="${resultDir}/testcompilelogs"
-            includes="**/*.bin.xml"
-            scanincludeddirectories="true"
-            style="compilerXMLOutputToHTML.xsl"
-            force="true"/>
-
-        <!-- create table of code plugins compiles -->
-        <summarizeResults
-            isBuildTested="false"
-            includeAll="true"
-            dropTokenList="${dropTokenList}"
-            xmlDirectoryName=""
-            dropDirectoryName="${resultDir}"
-            testResultsTemplateFileName="${templateDir}/templateFiles/compileResults.php.template"
-            testResultsHtmlFileName="compileResults.php"
-            hrefTestResultsTargetPath="testResults/html"
-            hrefCompileLogsTargetPath="compilelogs"
-            compileLogsDirectoryName="${resultDir}/compilelogs"/>
-        <xslt
-            basedir="${resultDir}/compilelogs"
-            destdir="${resultDir}/compilelogs"
-            includes="**/*.bin.xml"
-            scanincludeddirectories="true"
-            style="compilerXMLOutputToHTML.xsl"
-            force="true"/>
-        <tstamp>
-            <format
-                property="TODAY"
-                pattern="MMMM d, yyyy"/>
-        </tstamp>
-
-        <!--  Insert Build Type descriptor  -->
-        <antcall
-            target="${buildType}"/>
-        <antcall
-            target="writeData"/>
-        <!--
-            Update timestamp on file to permit overwrite through Ant
-            copy task
-        -->
-        <touch
-            file="${resultingIndex}"/>
-    </target>
-    <target
-        name="generateJUnitTestsIndex"
-        depends="checkIfTested"
-        if="doTests">
-        <!--
-            isBuildTested: true|false should JUnit plugin test results
-            be used to generate index page dropTokenList: comma
-            separated list of strings which should be replaced by the
-            fileName attribute settings in the testManifest.xml.
-            xmlDirectoryName: path to directory containing JUnit plugin
-            test results in xml format (see doc is org.eclipse.test).
-            dropDirectoryName: path to directory containing the result
-            of the build. testResultsTemplateFileName: path to template
-            file used to generate page with links to JUnit test results
-            testResultsHtmlFileName: name of file which will be
-            generated with links to JUnit test results dropHtmlFileName:
-            name of generated index page hrefTestResultsTargetPath:
-            relative path from index page to directory containing JUnit
-            html test results hrefCompileLogsTargetPath: relative path
-            from index page directory containing compilelogs
-            testManifestFileName: name of xml file containing
-            descriptions of zip types and log files
-        -->
-        <!--
-            if not otherwise set, assume its a legacy case that did not
-            use this
-        -->
-        <property
-            name="env.DEP_DIR"
-            value=""/>
-        <property
-            file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-
-        <!-- create table of test plugin compiles first -->
-        <!-- set isBuildTested to true for the "compile only" results -->
-        <summarizeResults
-            isBuildTested="true"
-            dropTokenList="${dropTokenList}"
-            dropDirectoryName="${resultDir}"
-            xmlDirectoryName="${resultDir}/testResults/xml"
-            testResultsTemplateFileName="${templateDir}/templateFiles/testResults.php.template"
-            testResultsHtmlFileName="testResults.php"
-            hrefTestResultsTargetPath="testResults/html"
-            compileLogsDirectoryName=""/>
-        <tstamp>
-            <format
-                property="TODAY"
-                pattern="MMMM d, yyyy"/>
-        </tstamp>
-
-        <!--  Insert Build Type descriptor  -->
-        <antcall
-            target="${buildType}"/>
-        <antcall
-            target="writeData"/>
-        <!--
-            Update timestamp on file to permit overwrite through Ant
-            copy task
-        -->
-        <touch
-            file="${resultingIndex}"/>
-    </target>
-    <target
-        name="getStaticFiles">
-        <!--get static files required in the buildLabel directory-->
-        <copy
-            todir="${resultDir}">
-            <fileset
-                dir="${templateDir}/staticDropFiles"/>
-        </copy>
-
-        <!--copy buildnotes from plugin directories-->
-        <mkdir
-            dir="${resultDir}/buildnotes"/>
-        <copy
-            todir="${resultDir}/buildnotes"
-            flatten="true">
-            <fileset
-                dir="${buildDirectory}/plugins"
-                includes="**/buildnotes_*.html"/>
-            <fileset
-                dir="${buildDirectory}/features"
-                includes="**/buildnotes_*.html"/>
-        </copy>
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/full/logIndex.php"/>
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/testLogs/logIndex.php"/>
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/testSysErrorLogs/logIndex.php"/>
-    </target>
-    <target
-        name="updateSite">
-
-
-        <!-- get our authored, tokenized site.xml file -->
-        <copy
-            file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/siteWTP.xml"
-            tofile="${buildDirectory}/${buildLabel}/updateSite/site.xml"
-            overwrite="true"
-            failonerror="true"/>
-        <!--
-            get the ${buildDirectory}/finalPluginsVersions.properties,
-            and read as properties
-        -->
-        <!-- substitute property value for tokens -->
-        <replace
-            file="${buildDirectory}/${buildLabel}/updateSite/site.xml"
-            propertyfile="${buildDirectory}/finalFeaturesVersions.properties">
-            <replacefilter
-                token="@org.eclipse.wst@"
-                property="org.eclipse.wst"/>
-            <replacefilter
-                token="@org.eclipse.wst.sdk@"
-                property="org.eclipse.wst.sdk"/>
-            <replacefilter
-                token="@org.eclipse.jst@"
-                property="org.eclipse.jst"/>
-            <replacefilter
-                token="@org.eclipse.jst.sdk@"
-                property="org.eclipse.jst.sdk"/>
-            <replacefilter
-                token="@org.eclipse.jpt.feature@"
-                property="org.eclipse.jpt.feature"/>
-            <replacefilter
-                token="@org.eclipse.jpt_sdk.feature@"
-                property="org.eclipse.jpt_sdk.feature"/>
-        </replace>
-    </target>
-    <target
-        name="countFiles">
-        <!--
-            files.count is a file that should exist in the drop
-            directory with a count of the zip files in the same
-            directory. It is required to generate a link to the build on
-            the downloads page.
-        -->
-        <countBuildFiles
-            sourceDirectory="${resultDir}"
-            filterString=".zip,.tar.gz"
-            outputFile="${resultDir}/files.count"/>
-    </target>
-
-    <!--Build type descriptors-->
-    <target
-        name="I">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Integration"/>
-    </target>
-    <target
-        name="S">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Stable"/>
-    </target>
-    <target
-        name="N">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Nightly"/>
-    </target>
-    <target
-        name="M">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Maintenance"/>
-    </target>
-    <target
-        name="R">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Release"/>
-    </target>
-    <target
-        name="T">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Test"/>
-    </target>
-    <target
-        name="P">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Patches"/>
-    </target>
-    <target
-        name="U">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Updates"/>
-    </target>
-    <target
-        name="checkIfTested">
-        <echo
-            level="debug"
-            message="isBuildTested: ${isBuildTested}"/>
-        <condition
-            property="doTests">
-            <equals
-                arg1="${isBuildTested}"
-                arg2="true"
-                trim="true"
-                casesensitive="false"/>
-        </condition>
-    </target>
-    <target
-        name="writeData">
-        <!--  Insert Build Date  -->
-        <replace
-            file="${resultingIndex}"
-            token="@date@"
-            value="${TODAY}"/>
-
-        <!--  Insert Build Name  -->
-        <replace
-            file="${resultingIndex}"
-            token="@build@"
-            value="${buildLabel}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@buildBranch@"
-            value="${buildBranch}"/>
-
-        <!--  Insert PreRequsites  -->
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseFile@"
-            value="${eclipse.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseURL@"
-            value="${eclipse.url}/${eclipse.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseBuildURL@"
-            value="${eclipse.url}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilelinux@"
-            value="${eclipse.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilewindows@"
-            value="${eclipse.file.win32-win32-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilemacos@"
-            value="${eclipse.file.macosx-carbon-ppc}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseBuildHome@"
-            value="${eclipse.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipse.mirror.prefixuri@"
-            value="${eclipse.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipse.fspath.prefix@"
-            value="${eclipse.fspath.prefix}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@testURL@"
-            value="${eclipseTestFramework.url}/${eclipseTestFramework.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@testFile@"
-            value="${eclipseTestFramework.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfFile@"
-            value="${emf.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfURL@"
-            value="${emf.url}/${emf.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfBuildHome@"
-            value="${emf.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emf.mirror.prefixuri@"
-            value="${emf.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstFile@"
-            value="${wst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstURL@"
-            value="${wst.url}/${wst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstBuildHome@"
-            value="${wst.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wst.mirror.prefixuri@"
-            value="${wst.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefFile@"
-            value="${gef.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefURL@"
-            value="${gef.url}/${gef.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefBuildHome@"
-            value="${gef.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gef.mirror.prefixuri@"
-            value="${gef.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipserelengFile@"
-            value="${eclipsereleng.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipserelengURL@"
-            value="${eclipsereleng.url}/${eclipsereleng.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipFile@"
-            value="${orbitthirdpartyzip.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipURL@"
-            value="${orbitthirdpartyzip.url}/${orbitthirdpartyzip.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipBuildHome@"
-            value="${orbitthirdpartyzip.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzip.mirror.prefixuri@"
-            value="${orbitthirdpartyzip.mirror.prefixuri}"/>
-
-
-        <!-- no longer used. Post 1.5.5 -->
-        <replace
-            file="${resultingIndex}"
-            token="@jemFile@"
-            value="${jem.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jemURL@"
-            value="${jem.url}/${jem.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jemBuildHome@"
-            value="${jem.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jem.mirror.prefixuri@"
-            value="${jem.mirror.prefixuri}"/>
-        <!--
-            these token/s should not exist in maintenance stream, but do
-            no harm done, so in the interests of keeping builder streams
-            in sync, we'll leave them here as place hold
-        -->
-        <replace
-            file="${resultingIndex}"
-            token="@dtpFile@"
-            value="${dtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtpURL@"
-            value="${dtp.url}/${dtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtpBuildHome@"
-            value="${dtp.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtp.mirror.prefixuri@"
-            value="${dtp.mirror.prefixuri}"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches.site/staticDropFiles/access_err.gif b/releng.wtpbuilder/distribution/patches.site/staticDropFiles/access_err.gif
deleted file mode 100644
index 4f0748a..0000000
--- a/releng.wtpbuilder/distribution/patches.site/staticDropFiles/access_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/patches.site/staticDropFiles/access_warn.gif b/releng.wtpbuilder/distribution/patches.site/staticDropFiles/access_warn.gif
deleted file mode 100644
index 8386e3e..0000000
--- a/releng.wtpbuilder/distribution/patches.site/staticDropFiles/access_warn.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/patches.site/staticDropFiles/buildNotes.php b/releng.wtpbuilder/distribution/patches.site/staticDropFiles/buildNotes.php
deleted file mode 100644
index f666887..0000000
--- a/releng.wtpbuilder/distribution/patches.site/staticDropFiles/buildNotes.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<html>
-<head>
-<?php
-$parts = explode("/", getcwd());
-$parts2 = explode("-", $parts[count($parts) - 1]);
-$buildName = $parts2[1];
-
-echo "<title>Build Notes for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Build Notes</font></b></p>
-
-<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"> Build Notes for <?php echo "$buildName"; ?></font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$hasNotes = false;
-$aDirectory = dir("buildnotes");
-while ($anEntry = $aDirectory->read()) {
-	if ($anEntry != "." && $anEntry != "..") {
-		//print_r($anEntry);
-		//echo "<br />";
-
-		$subject = $anEntry;
-		$pattern = '/^buildnotes_(.*)/i';
-		preg_match($pattern, $subject, $matches);
-		$subject = $matches[1];
-		//print_r($subject);
-		//echo "<br />";
-		$pattern = '/^(.*)\.html$/';
-		preg_match($pattern, $subject, $matches);
-		//print_r($matches);
-		//echo "<br />";
-
-		$component = $matches[1];
-
-		$line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
-		echo "<tr>";
-		echo "$line";
-		echo "</tr>";
-		$hasNotes = true;
-
-	}
-}
-$aDirectory.closedir();
-if (!$hasNotes) {
-	echo "<br>There are no build notes for this build.";
-}
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/patches.site/staticDropFiles/compile_err.gif b/releng.wtpbuilder/distribution/patches.site/staticDropFiles/compile_err.gif
deleted file mode 100644
index c2bfdd6..0000000
--- a/releng.wtpbuilder/distribution/patches.site/staticDropFiles/compile_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/patches.site/staticDropFiles/compile_warn.gif b/releng.wtpbuilder/distribution/patches.site/staticDropFiles/compile_warn.gif
deleted file mode 100644
index cf4fdf9..0000000
--- a/releng.wtpbuilder/distribution/patches.site/staticDropFiles/compile_warn.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/patches.site/staticDropFiles/consoleLogs.php b/releng.wtpbuilder/distribution/patches.site/staticDropFiles/consoleLogs.php
deleted file mode 100644
index 2ee3c36..0000000
--- a/releng.wtpbuilder/distribution/patches.site/staticDropFiles/consoleLogs.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<html>
-<head>
-<?php
-$parts = explode("/", getcwd());
-$parts2 = explode("-", $parts[count($parts) - 1]);
-$buildName = $parts2[1];
-
-echo "<title>Test Console Output for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-<title>Console Logs from Running JUnit Plug-in Tests</title>
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b></p>
-
-<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">Console output from running
-		JUnit plugin tests for <?php echo "$buildName"; ?> </font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$rootDir = "testResults/consolelogs";
-$hasNotes = false;
-$aDirectory = dir($rootDir);
-$index = 0;
-$dirindex = 0;
-while ($anEntry = $aDirectory->read()) {
-	if ($anEntry != "." && $anEntry != "..") {
-		if (is_file("$rootDir/$anEntry")) {
-			$entries[$index] = $anEntry;
-			$index++;
-		} else if (is_dir("$rootDir/$anEntry")) {
-			$direntries[$dirindex] = $anEntry;
-			$dirindex++;
-		}
-	}
-}
-$aDirectory->close();
-
-
-sort($entries);
-sort($direntries);
-
-for ($i = 0; $i < $dirindex; $i++) {
-	$anEntry = $direntries[$i];
-	$line = "<td><a href=\"testResults/consolelogs/$anEntry/logIndex.php\">$anEntry</a></td>";
-	echo "<tr>";
-	echo "$line";
-	echo "</tr>";
-}
-for ($i = 0; $i < $index; $i++) {
-	$anEntry = $entries[$i];
-	$logsize = filesize("testResults/consolelogs/$anEntry");
-
-
-	$level = 0;
-	if ($logsize > 20000) {
-		$level = 2;
-	}
-	else if ($logsize > 2000) {
-		$level = 1;
-	}
-
-	if ($level == 0) {
-		$line = "<td><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-	}
-	else if ($level == 1) {
-		$line = "<td><em><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-	} else if ($level == 2) {
-		$line = "<td><strong><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-	}
-
-
-	echo "<tr>";
-	echo "$line";
-	echo "</tr>";
-	$hasNotes = true;
-}
-
-if (!$hasNotes) {
-	echo "<br>There are no test logs for this build.";
-}
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/patches.site/staticDropFiles/junit_err.gif b/releng.wtpbuilder/distribution/patches.site/staticDropFiles/junit_err.gif
deleted file mode 100644
index 1b7ff9d..0000000
--- a/releng.wtpbuilder/distribution/patches.site/staticDropFiles/junit_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/patches.site/staticDropFiles/logIndex.php b/releng.wtpbuilder/distribution/patches.site/staticDropFiles/logIndex.php
deleted file mode 100644
index 721ca00..0000000
--- a/releng.wtpbuilder/distribution/patches.site/staticDropFiles/logIndex.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<html>
-<head>
-<?php
-
-function endsWith( $str, $sub ) {
-
-	return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub );
-}
-
-$parts = explode("/", getcwd());
-$parts2 = explode("-", $parts[count($parts) - 1]);
-$buildName = $parts2[1];
-
-echo "<title>Test Console Output for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-<title>Console Logs from Running JUnit Plug-in Tests</title>
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b></p>
-
-<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">Console output from running
-		JUnit plugin tests for <?php echo "$buildName"; ?> </font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$hasNotes = false;
-$aDirectory = dir(".");
-$index = 0;
-while ($anEntry = $aDirectory->read()) {
-	if ($anEntry != "." && $anEntry != ".." && !endsWith(__FILE__, $anEntry)) {
-		$entries[$index] = $anEntry;
-		$index++;
-	}
-}
-aDirectory.closedir();
-
-
-sort($entries);
-
-for ($i = 0; $i < $index; $i++) {
-	$anEntry = $entries[$i];
-	$logsize = filesize("$anEntry");
-
-
-	$level = 0;
-	if ($logsize > 20000) {
-		$level = 2;
-	}
-	else if ($logsize > 2000) {
-		$level = 1;
-	}
-
-	if ($level == 0) {
-		$line = "<td><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-	}
-	else if ($level == 1) {
-		$line = "<td><em><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-	} else if ($level == 2) {
-		$line = "<td><strong><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-	}
-
-
-	echo "<tr>";
-	echo "$line";
-	echo "</tr>";
-	$hasNotes = true;
-}
-
-if (!$hasNotes) {
-	echo "<br>There are no test logs for this build.";
-}
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/patches.site/staticDropFiles/miscUtil.php b/releng.wtpbuilder/distribution/patches.site/staticDropFiles/miscUtil.php
deleted file mode 100644
index 97c454e..0000000
--- a/releng.wtpbuilder/distribution/patches.site/staticDropFiles/miscUtil.php
+++ /dev/null
@@ -1,218 +0,0 @@
-<?php
-
-// todo: unsure if can handle filenames that are URLs?
-// handy constant to compute file size in megabytes
-
-function fileSizeInMegs($filename) {
-	$onemeg=1024*1024;
-	$zipfilesize=filesize($filename);
-	$zipfilesize=round($zipfilesize/$onemeg, 0);
-	return $zipfilesize;
-}
-
-function fileSizeForDisplay($filename) {
-	$onekilo=1024;
-	$onemeg=$onekilo * $onekilo;
-	$criteria = 10 * $onemeg;
-	$scaleChar = "M";
-	$zipfilesize=filesize($filename);
-	if ($zipfilesize > $criteria) {
-		$zipfilesize=round($zipfilesize/$onemeg, 0);
-		$scaleChar = "M";
-	}
-	else {
-		$zipfilesize=round($zipfilesize/$onekilo, 0);
-		$scaleChar = "K";
-	}
-	$result =  "(" . $zipfilesize . $scaleChar . ")";
-	return $result;
-}
-
-
-function displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription) {
-	echo "<td align=\"right\" valign=\"top\" width=\"10%\">";
-	echo "<a href=\"$downloadprefix$filename\">" . $fileShortDescription . "</a>";
-	echo "</td><td align=\"right\" valign=\"top\" width=\"5%\">";
-	echo $zipfilesize;
-	echo "</td>";
-	echo "<td align=\"right\" valign=\"top\" width=\"5%\">";
-	echo "[<a href=\"checksum/$filename.md5\">md5</a>]";
-	echo "</td>";
-}
-
-function resourceExist($url, $mirrorPrefixuri, $prereqfilename, $eclipseFSpathPrefix)
-{
-	$result = false;
-
-	$allowURLopen = ini_get('allow_url_fopen');
-
-	if ($allowURLopen && stream_last_modified($url)) {
-		$result = true;
-	}
-	else {
-		// TODO: for now, we'll do a raw check on the whole file name, since enable_url_open
-		// is off. better would be to check if we are on build.eclipse.org or download.eclipse.org?
-		$wholePath = trim($eclipseFSpathPrefix) . "/" . trim($mirrorPrefixuri) . "/" . trim($prereqfilename);
-		if (file_exists($wholePath)) {
-			$result = true;
-		} else {
-			$wholePath = "/home/data/httpd/archive.eclipse.org/" . trim($mirrorPrefixuri) . "/" . trim($prereqfilename);
-			if (file_exists($wholePath)) {
-				$result = true;
-			}
-		}
-	}
-	return $result;
-}
-
-function stream_last_modified($url)
-{
-	if (function_exists('version_compare') && version_compare(phpversion(), '4.3.0') > 0)
-	{
-		if (!($fp = @fopen($url, 'r')))
-		return NULL;
-
-		$meta = stream_get_meta_data($fp);
-		for ($j = 0; isset($meta['wrapper_data'][$j]); $j++)
-		{
-			if (strstr(strtolower($meta['wrapper_data'][$j]), 'last-modified'))
-			{
-				$modtime = substr($meta['wrapper_data'][$j], 15);
-				break;
-			}
-		}
-		fclose($fp);
-	}
-	else
-	{
-		$parts = parse_url($url);
-		$host  = $parts['host'];
-		$path  = $parts['path'];
-
-		if (!($fp = @fsockopen($host, 80)))
-		return NULL;
-
-		$req = "HEAD $path HTTP/1.0\r\nUser-Agent: PHP/".phpversion()."\r\nHost: $host:80\r\nAccept: */*\r\n\r\n";
-		fputs($fp, $req);
-
-		while (!feof($fp))
-		{
-			$str = fgets($fp, 4096);
-			if (strstr(strtolower($str), 'last-modified'))
-			{
-				$modtime = substr($str, 15);
-				break;
-			}
-		}
-		fclose($fp);
-	}
-	return isset($modtime) ? strtotime($modtime) : time();
-}
-
-function isMirrored($uriToCheck) {
-	global $debugScript;
-	global $debugFunctions;
-	$localuri = $uriToCheck;
-
-	$debugMirrorList = false;
-	if ($debugScript) {
-		echo "uriToCheck: " . $localuri . "<br />";
-	}
-
-	$xmlcount = 0;
-
-	/* This method true and accurate method of parsing mirror results
-	 * may be expensive, and would
-	 * likely cause artificially high counts of "downloads".
-	 * Could maybe use if somehow only checked once ever 5 minutes or something.
-
-
-	 // turn off warnings, as sometimes HTML is returned, which causes lots of warnings
-	 $holdLevel = error_reporting(E_ERROR);
-	 $mirrorsxml=simplexml_load_file(rawurlencode($localuri) . urlencode("&format=xml"));
-	 error_reporting($holdLevel);
-
-
-	 if ($mirrorsxml) {
-		if ($debugFunctions) {
-		echo "root node: " . $mirrorsxml->getName() . "<br />";
-		}
-		if (strcmp($mirrorsxml->getName(), "mirrors") == 0) {
-		foreach ($mirrorsxml->children() as $mirror) {
-		if (strcmp($mirror->getName(),"mirror") == 0) {
-		$xmlcount=$xmlcount+1;
-		}
-		if ($debugMirrorList) {
-		print_r($mirror);
-		echo "<br />";
-		}
-		}
-		}
-		if ($debugFunctions) {
-		echo "Mirror count: " . $xmlcount . "<br />";
-		}
-		}
-	 */
-	/*
-	 * Use simple heuristic based on pattern
-	 * in the URI ... if it contains "/downloads/" then assume it's mirrored
-	 */
-	if (strpos($uriToCheck, "webtools/downloads/") > 0) {
-		$xmlcount = 1;
-	}
-	return ($xmlcount > 0);
-
-}
-
-// TODO: replace with Phoenix variables
-function getPlatform () {
-	global $debugScript;
-	global $debugFunctions;
-	// getBrowser is expensive, so cache the data
-	static $browser;
-	$platform = "unknown";
-
-
-	if(ini_get("browscap")) {
-		if(!isset($browser)){
-			$browser = get_browser(null, true);
-		}
-
-		if ($browser) {
-			$rawPlatform = $browser['platform'];
-			if ($debugFunctions) {
-				echo "browser platfrom: " . $rawPlatform . "<br />" ;
-			}
-
-			if ($debugFunctions) {
-				$browserKeys = array_keys($browser);
-				foreach ($browserKeys as $key) {
-					echo $key . ": " . $browser[$key] . "<br />";
-				}
-			}
-		}
-		if (strpos($rawPlatform, "Win") === 0) {
-			$platform="windows";
-		} else if (strpos($rawPlatform, "Linux") === 0) {
-			$platform="linux";
-		} else if (strpos($rawPlatform, "Mac") === 0) {
-			$platform="mac";
-		}
-	}
-	return $platform;
-}
-
-function getPrereqReferenceOrName($eclipseMirrorScript, $mirrorPrefixuri, $prerequrl, $prereqfilename, $eclipseFSpathPrefix) {
-	// todo: we really only need "if exists" so could make a bit more efficient
-	// I tried "file_exists" but is didn't seem to work on my test server
-	// For these pre-reqs, we assume if they exist, they are mirrored. This is true
-	// 99% of the time.
-
-	if (resourceExist($prerequrl, $mirrorPrefixuri, $prereqfilename, $eclipseFSpathPrefix)) {
-		$reflink="<a href=\"" . $eclipseMirrorScript . $mirrorPrefixuri . "/" . $prereqfilename . "\">" . $prereqfilename . "</a>";
-	} else {
-		$reflink=$prereqfilename;
-	}
-	return $reflink;
-}
-?>
diff --git a/releng.wtpbuilder/distribution/patches.site/staticDropFiles/pending.gif b/releng.wtpbuilder/distribution/patches.site/staticDropFiles/pending.gif
deleted file mode 100644
index 66db2a6..0000000
--- a/releng.wtpbuilder/distribution/patches.site/staticDropFiles/pending.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/patches.site/staticDropFiles/pending1.gif b/releng.wtpbuilder/distribution/patches.site/staticDropFiles/pending1.gif
deleted file mode 100644
index 1b2ea6e..0000000
--- a/releng.wtpbuilder/distribution/patches.site/staticDropFiles/pending1.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/patches.site/staticDropFiles/report2.php b/releng.wtpbuilder/distribution/patches.site/staticDropFiles/report2.php
deleted file mode 100644
index cb68e7b..0000000
--- a/releng.wtpbuilder/distribution/patches.site/staticDropFiles/report2.php
+++ /dev/null
@@ -1,45 +0,0 @@
-
-<?php
-
-function parse_testResults($filename)
-{
-	$junitFailures = 0;
-	if (is_file($filename)) {
-		$handle = @fopen($filename, "r");
-		if ($handle)
-		{
-			$size = filesize($filename);
-			$content = fread($handle, $size);
-			fclose($handle);
-			$junitStart = strpos($content, "Errors &amp; Failures");
-			$junitEnd = strpos($content, "</table>", $junitStart);
-			$junitInfo = substr($content, $junitStart, $junitEnd - $junitStart);
-			$start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">");
-			while ($start !== false)
-			{
-				$start += 29;
-				$stop = strpos($junitInfo, "</font></b></td>", $start);
-				if ($stop !== false)
-				{
-					$result = substr($junitInfo, $start, $stop - $start);
-					if (is_numeric($result))
-					{
-						$junitFailures += $result;
-					}
-					else if (strcmp($result, "DNF") == 0)
-					{
-						$junitFailures++;
-					}
-				}
-				$start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">", $stop);
-			}
-			$results = array($junitFailures);
-			return $results;
-		}
-	}
-}
-
-
-?>
-
-
diff --git a/releng.wtpbuilder/distribution/patches.site/templateFiles/compileResults.php.template b/releng.wtpbuilder/distribution/patches.site/templateFiles/compileResults.php.template
deleted file mode 100644
index f785771..0000000
--- a/releng.wtpbuilder/distribution/patches.site/templateFiles/compileResults.php.template
+++ /dev/null
@@ -1,76 +0,0 @@
-<html>
-<head>
-
-<?php
-        $parts = explode("/", getcwd());
-        $parts2 = explode("-", $parts[count($parts) - 1]);
-        $buildName = $parts2[1];
-
-        echo "<title>Compile Logs: Code Bundles for $buildName</title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2%;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-}
-</style>
-</head>
-<body>
-
-<?php
-        echo "<h1>Compile Logs: Code Bundles for $buildName</h1>";
-?>
-
-
-<table id=tabledata align = "center" width="75%" border="1">
-  <tr>
-    <td class="bold" align="center">Compile Logs</td>
-    <td class="bold" align="center">Compile Errors</td>
-    <td class="bold" align="center">Compiler Warnings</td>
-    <td class="bold" align="center">Access Violations</td>
-    <td class="bold" align="center">Access Warnings</td>
-  </tr>
-
-  %compilelogs%
-
-</table>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/patches.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/patches.site/templateFiles/index.html.template.php
deleted file mode 100644
index f020709..0000000
--- a/releng.wtpbuilder/distribution/patches.site/templateFiles/index.html.template.php
+++ /dev/null
@@ -1,456 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<title>WTP Downloads</title>
-
-
-<?php
-
-$buildBranch="@buildBranch@";
-$build="@build@";
-$type="@type@";
-$builddate="@date@";
-
-$eclipseMirrorPrefixuri="@eclipse.mirror.prefixuri@";
-$eclipseFSpathPrefix="@eclipse.fspath.prefix@";
-
-$eclipsefilelinux="@eclipsefilelinux@";
-$eclipsefilewindows="@eclipsefilewindows@";
-$eclipsefilemacosx="@eclipsefilemacos@";
-
-$eclipseURL="@eclipseURL@";
-$eclipseFile="@eclipseFile@";
-$eclipseBuildURL="@eclipseBuildURL@";
-$eclipseBuildHome="@eclipseBuildHome@";
-$testURL="@testURL@";
-$testFile="@testFile@";
-
-$wstURL="@wstURL@";
-$wstFile="@wstFile@";
-$wstMirrorPrefixuri="@wst.mirror.prefixuri@";
-$wstBuildHome="@wstBuildHome@";
-
-
-$gefURL="@gefURL@";
-$gefFile="@gefFile@";
-$gefMirrorPrefixuri="@gef.mirror.prefixuri@";
-$gefBuildHome="@gefBuildHome@";
-
-$emfURL="@emfURL@";
-$emfFile="@emfFile@";
-$emfMirrorPrefixuri="@emf.mirror.prefixuri@";
-$emfBuildHome="@emfBuildHome@";
-
-$dtpURL="@dtpURL@";
-$dtpFile="@dtpFile@";
-$dtpMirrorPrefixuri="@dtp.mirror.prefixuri@";
-$dtpBuildHome="@dtpBuildHome@";
-
-
-$eclipserelengFile="@eclipserelengFile@";
-$eclipserelengURL="@eclipserelengURL@";
-$orbitthirdpartyzipFile="@orbitthirdpartyzipFile@";
-$orbitthirdpartyzipURL="@orbitthirdpartyzipURL@";
-$orbitthirdpartyzipBuildHome="@orbitthirdpartyzipBuildHome@";
-$orbitthirdpartyzipMirrorPrefixuri="@orbitthirdpartyzip.mirror.prefixuri@";
-
-
-
-
-include("miscUtil.php");
-
-
-
-//ini_set("display_errors", "true");
-//error_reporting (E_ALL);
-
-
-$debugScript = false;
-$debugFunctions = false;
-
-$defaultMirrorScript="";
-$defaultWTPMirrorPrefix="./";
-
-$eclipseMirrorScript="http://www.eclipse.org/downloads/download.php?file=";
-
-// TODO: improve so this hard coding isn't required.
-// This depends on the declare script changing webtools/committers to webtools/downloads
-// And, the logic is such that if it is not mirrored, this URI is not used at all, just
-// a relative reference only
-$eclipseWTPMirrorPrefix="/webtools/committers/drops/$buildBranch/$build/";
-
-
-$mirrorScript=$defaultMirrorScript;
-$downloadprefix=$defaultWTPMirrorPrefix;
-
-
-$keytestMirrorString=$eclipseMirrorScript . "$eclipseWTPMirrorPrefix/wtp-sdk-$build.zip";
-if (isMirrored($keytestMirrorString) ) {
-	$mirrorScript=$eclipseMirrorScript;
-	$downloadprefix="${mirrorScript}${eclipseWTPMirrorPrefix}";
-}
-
-if ($debugScript)  {
-	echo "inferred platform: " . getPlatform();
-}
-
-
-// our summary results handling requires php 5 (for simple xml file loading)
-// so, if not php 5, just don't display any summary results
-// This was found to be required, since some mirror our whole site (e.g. IBM)
-// and not all mirrors use PHP 5
-$displayTestSummary=false;
-if (phpversion() >= 5) {
-
-	$displayTestSummary=true;
-	// expecting grandTotalErrors and grandTotalTests
-	$filename = "unitTestsSummary.xml";
-	if (file_exists($filename)) {
-		$prefix = "unitTests_";
-		$unitTestsSummary = simplexml_load_file($filename);
-		foreach ($unitTestsSummary->summaryItem as $summaryItem) {
-			$name = $summaryItem->name;
-			$value = $summaryItem->value;
-			$code= "\$" . $prefix . $name . " = " . $value . ";";
-			//echo "<br />code: " . $code;
-			eval($code);
-		}
-	}
-
-	$filename = "compilelogsSummary.xml";
-	$prefix = "code_";
-	$compileSummary = simplexml_load_file($filename);
-	foreach ($compileSummary->summaryItem as $summaryItem) {
-		$name = $summaryItem->name;
-		$value = $summaryItem->value;
-		$code= "\$" . $prefix . $name . " = " . $value . ";";
-		//echo "<br />code: " . $code;
-		eval($code);
-	}
-
-	$filename = "testcompilelogsSummary.xml";
-	$prefix = "test_";
-	$compileSummary = simplexml_load_file($filename);
-	foreach ($compileSummary->summaryItem as $summaryItem) {
-		$name = $summaryItem->name;
-		$value = $summaryItem->value;
-		$code= "\$" . $prefix . $name . " = " . $value . ";";
-		//echo "<br />code: " . $code;
-		eval($code);
-	}
-}
-
-
-?>
-
-
-</head>
-
-<body>
-
-<?php
-
-// tiny banner to remind when looking at "local" machine results
-$serverName = $_SERVER["SERVER_NAME"];
-
-if (!stristr($serverName, "eclipse.org") && !stristr($serverName,"you.are.at.eclipsecon.org")) {
-	echo '<center>
-          <p>
-          Reminder: this is <font color="#FF0000">' . 
-	$serverName .
-    '</font>
-          See also 
-          <a href="http://download.eclipse.org/webtools/downloads" target="_top">the live public Eclipse site</a>.
-          </p>
-          <hr />
-          </center>';
-
-}
-?>
-<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH="100%">
-	<tr>
-		<td ALIGN=left><font face="'Bitstream Vera',Helvetica,Arial" size="+2"><b><?php echo "$type";?>
-		Build: <?php echo "$build";?></b></font></td>
-	
-	
-	<tr>
-		<td><font size="-1"><?php echo "$builddate";?></font></td>
-	</tr>
-	<tr>
-		<td>
-		<p>The Eclipse Web Tools Platform Project provides tools for Web
-		Development, and is a platform for adopters making add-on tools for
-		Web Development.</p>
-		</td>
-	</tr>
-</table>
-
-<!-- ***********  Required Prerequisites **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-	<tr>
-		<td align="left" valign="top" bgcolor="#0080C0"><font
-			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Required
-		Prerequisites and Handy Extras</font></td>
-	</tr>
-	<tr>
-		<td>
-		<p>These are the prerequisites to install and run the Web Tools
-		Platform. Also listed are some frequently needed links for
-		committer-required packages when creating new development
-		environments, or targets to run against.</p>
-		<p>Note that WTP requires Java 5 or higher (and, for some things,
-		actually requires a JDK rather than only a JRE) even though many other
-		<a href="http://www.eclipse.org/downloads/">Eclipse Projects</a> can
-		run with <a href="http://www.eclipse.org/downloads/moreinfo/jre.php">other
-		JRE levels</a>.</p>
-		</td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=1 cellpadding=1 width="90%" align="center">
-			<tr valign="top">
-				<td width="10%"></td>
-				<td width="55%">Eclipse Platform (Platform, JDT)</td>
-				<?php
-				//customize page depending on user's browser/platform, if we can detect it
-				$usersPlatform = getPlatform();
-				// assume windows by default, since likely most frequent, even for cases where
-				// platform is "unknown". I've noticed Opera reports 'unknown' :(
-				$recommendedFile=$eclipsefilewindows;
-				if (strcmp($usersPlatform,"linux")== 0) {
-					$recommendedFile=$eclipsefilelinux;
-				} else if (strcmp($usersPlatform,"mac") == 0) {
-					$recommendedFile=$eclipsefilemacosx;
-				}
-				?>
-				<td align="right" width="35%"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $eclipseBuildURL . "\">appropriate platform</a>";
-				echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>Eclipse Modeling Framework (EMF, XSD InfoSet)</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfMirrorPrefixuri, $emfURL, $emfFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $emfBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>Graphical Editing Framework (GEF)</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $gefMirrorPrefixuri, $gefURL, $gefFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $gefBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>Eclipse Test Framework (required only for Automated JUnit tests)</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $testURL, $testFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>Eclipse releng tool (required only for committers to more easily
-				"release" code to a build)</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipserelengURL, $eclipserelengFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-
-		</table>
-		</td>
-	</tr>
-</table>
-
-<!-- ***********  WTP **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-	<tr>
-		<td align=left valign=top colspan="5" bgcolor="#0080C0"><font
-			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF"> Web Tools
-		Platform Patches</font></td>
-	</tr>
-
-	<tr>
-		<td align="left" valign="top" colspan="5">
-		<p>The Zip files contain patches</p>
-		</td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
-
-
-			<tr>
-				<td align="left" valign="top" width="10%"><b>Patch</b></td>
-				<td align="left" valign="top">
-				<p>Remember, care is needed in using patches from this page. These
-				patches are specific to particular use-cases or adopters and not
-				well tested for general cases.</p>
-				</td>
-				<?php
-				$zipfilename="wtp-@build@";
-				$filename=$zipfilename.".zip";
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription="@build@";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-				?>
-			</tr>
-		</table>
-		</td>
-	
-	
-	<tr>
-
-</table>
-
-
-
-
-
-
-
-<!-- ***********  Build Status **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-	<tr>
-		<td align=left valign=top bgcolor="#0080C0"><font
-			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Status, tests
-		and other interesting details</font></td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
-
-			<tr>
-				<td><a href="buildNotes.php">Build notes</a> <br />
-				<a href="directory.txt">map files</a> <br />
-				<?php
-
-				if ($displayTestSummary) {
-
-
-					if (isset($unitTests_grandTotalErrors)) {
-						$errorColor="green";
-						if ($unitTests_grandTotalErrors > 0) {
-							$errorColor="red";
-						}
-						echo "<a href=\"testResults.php\">Unit test results</a>&nbsp;";
-						echo "<img src=\"junit_err.gif\"/><font color=\"" . $errorColor . "\">" . $unitTests_grandTotalErrors . "</font>&nbsp;&nbsp;Total: " . $unitTests_grandTotalTests;
-					}
-					else {
-						echo "<br /><font color=\"orange\">Unit tests are pending</font>&nbsp;&nbsp;<img src=\"pending.gif\"/>";
-					}
-
-					echo "<br />";
-					echo "<a href=\"compileResults.php\">Compile logs: Code Bundles</a>";
-
-					echo "&nbsp;&nbsp;($code_totalBundles)&nbsp;&nbsp;";
-					echo "<img src=\"compile_err.gif\"/><font color=red>$code_totalErrors</font>&nbsp;";
-					echo "<img src=\"compile_warn.gif\"/><font color=orange>$code_totalWarnings</font>&nbsp;";
-					echo "<img src=\"access_err.gif\"/><font color=red>$code_totalforbiddenAccessWarningCount</font>&nbsp;";
-					echo "<img src=\"access_warn.gif\"/><font color=orange>$code_totaldiscouragedAccessWarningCount</font>&nbsp;";
-
-					echo "<br />";
-					echo "<a href=\"testCompileResults.php\">Compile logs: Test Bundles</a>";
-
-					echo "&nbsp;&nbsp;($test_totalBundles)&nbsp;&nbsp;";
-					echo "<img src=\"compile_err.gif\"/><font color=red>$test_totalErrors</font>&nbsp;";
-					echo "<img src=\"compile_warn.gif\"/><font color=orange>$test_totalWarnings</font>&nbsp;";
-					echo "<img src=\"access_err.gif\"/><font color=red>$test_totalforbiddenAccessWarningCount</font>&nbsp;";
-					echo "<img src=\"access_warn.gif\"/><font color=orange>$test_totaldiscouragedAccessWarningCount</font>&nbsp;";
-				}
-
-				?> <br />
-
-				<?php
-				if (file_exists("versioningReportName.php")) {
-					include "versioningReportName.php";
-					$fname="${versionReportFilename}.html";
-					if (file_exists($fname)) {
-						echo "<br /> <a href='$fname'>Versioning Information</a>";
-					}
-}
-?> <?php
-echo "<br />";
-if (file_exists("./apiresults/api-progress.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-progress.html\">API Progress Report</a>";
-}
-if (file_exists("./apiresults/api-info-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-info-summary.html\">APIs Defined by Each Component</a>";
-}
-if (file_exists("./apiresults/api-ref-compatibility.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-ref-compatibility.html\">Adopter Breakage Report</a>";
-}
-if (file_exists("./apiresults/api-violation-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-violation-summary.html\">API Violations</a>";
-}
-if (file_exists("./apiresults/component-api-violation-all.html"))
-{
-	echo "<br /> <a href=\"apiresults/component-api-violation-all.html\">Non-API dependencies</a>";
-}
-if (file_exists("./apiresults/api-tc-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-tc-summary.html\">API Test Coverage</a>";
-}
-if (file_exists("./apiresults/api-javadoc-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-javadoc-summary.html\">API Javadoc Coverage</a>";
-}
-if (file_exists("./apiresults/api-tc-summary.html"))
-{
-	echo "<br /><br /> <a href=\"apiresults/full_test_coverage/api-tc-summary.html\">Test Coverage for All Classes and Methods</a>";
-}
-?> <?php
-if (file_exists("./perfresults/graph/performance.php"))
-{
-	echo "<br />";
-	echo "<br /> <a href=\"perfresults/graph/performance.php\">Performance Results</a>";
-	echo "<br />";
-}
-?></td>
-			</tr>
-
-
-		</table>
-		</td>
-	</tr>
-</table>
-
-
-
-<!-- footer -->
-<center>
-<hr>
-<p>All downloads are provided under the terms and conditions of the <a
-	href="http://www.eclipse.org/legal/notice.html">Eclipse.org Software
-User Agreement</a> unless otherwise specified.</p>
-
-<p>If you have problems downloading the drops, contact the <font
-	face="'Bitstream Vera',Helvetica,Arial" size="-1"><a
-	href="mailto:webmaster@eclipse.org">webmaster</a></font>.</p>
-
-</center>
-<!-- end footer -->
-
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/patches.site/templateFiles/siteEnablingFeatures.xml b/releng.wtpbuilder/distribution/patches.site/templateFiles/siteEnablingFeatures.xml
deleted file mode 100644
index cc3ed81..0000000
--- a/releng.wtpbuilder/distribution/patches.site/templateFiles/siteEnablingFeatures.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-    <description> The update site contains the enabling features. </description>
-    <category-def
-        name="Enabling Features"
-        label="Enabling Features">
-        <description> This category contains features used by several
-            projects that enable some functionality, but which by
-            themselves are not very interesting. </description>
-    </category-def>
-</site>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches.site/templateFiles/siteWTP.xml b/releng.wtpbuilder/distribution/patches.site/templateFiles/siteWTP.xml
deleted file mode 100644
index f94e83f..0000000
--- a/releng.wtpbuilder/distribution/patches.site/templateFiles/siteWTP.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site
-    pack200="true"
-    mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/webtools/testUpdates/site.xml&amp;format=xml"
-    digestURL="http://download.eclipse.org/webtools/testUpdates/">
-    <description
-        url="http://download.eclipse.org/webtools/declaredUpdates/index.html"> The update site contains the features of the of Eclipse Web
-        Tools Project (WTP) </description>
-    <feature
-        url="features/org.eclipse.wst_@org.eclipse.wst@.jar"
-        id="org.eclipse.wst"
-        version="@org.eclipse.wst@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.wst.sdk_@org.eclipse.wst.sdk@.jar"
-        id="org.eclipse.wst.sdk"
-        version="@org.eclipse.wst.sdk@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jst_@org.eclipse.jst@.jar"
-        id="org.eclipse.jst"
-        version="@org.eclipse.jst@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jst.sdk_@org.eclipse.jst.sdk@.jar"
-        id="org.eclipse.jst.sdk"
-        version="@org.eclipse.jst.sdk@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jpt.feature_@org.eclipse.jpt.feature@.jar"
-        id="org.eclipse.jpt.feature"
-        version="@org.eclipse.jpt.feature@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jpt_sdk.feature_@org.eclipse.jpt_sdk.feature@.jar"
-        id="org.eclipse.jpt_sdk.feature"
-        version="@org.eclipse.jpt_sdk.feature@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <category-def
-        name="Web Tools Platform (WTP)"
-        label="Web Tools Platform (WTP)">
-        <description> This category contains the features of the Eclipse
-            Web Tools Project (WTP). </description>
-    </category-def>
-</site>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches.site/templateFiles/testCompileResults.php.template b/releng.wtpbuilder/distribution/patches.site/templateFiles/testCompileResults.php.template
deleted file mode 100644
index 48c5085..0000000
--- a/releng.wtpbuilder/distribution/patches.site/templateFiles/testCompileResults.php.template
+++ /dev/null
@@ -1,76 +0,0 @@
-<html>

-<head>

-

-<?php

-        $parts = explode("/", getcwd());

-        $parts2 = explode("-", $parts[count($parts) - 1]);

-        $buildName = $parts2[1];

-

-        echo "<title>Compile Logs: Test Bundles for $buildName</title>";

-?>

-

-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">

-

-<style>

-.bold, .bold TD, .bold TH, .bold TR

-{

-font-weight:bold;

-}

-.numeric, .numeric TD

-{

-text-align:right;

-padding-right:2em;

-}

-.normaltable, .normaltable TD, .normaltable TH

-{

-font-family:Bitstream Vera Sans Mono, monospace;

-font-size:0.9em;

-color:Black;

-background-color:White;

-}

-.errorltable, .errortable TD, .errortable TH

-{

-font-family:Bitstream Vera Sans Mono, monospace;

-font-size:0.9em;

-color:Black;

-background-color:Red;

-font-weight:Bold;

-}

-.warningtable, .warningtable TD, .warningtable TH

-{

-font-family:Bitstream Vera Sans Mono, monospace;

-font-size:0.9em;

-color:Black;

-background-color:khaki;

-}

-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH

-{

-font-family:Bitstream Vera Sans Mono, monospace;

-font-size:0.9em;

-color:Black;

-background-color:Yellow;

-}

-</style>

-</head>

-<body>

-

-<?php

-        echo "<h1>Compile Logs: Test Bundles for $buildName</h1>";

-?>

-

-

-<table id=tabledata align = "center" width="75%" border="1">

-  <tr>

-    <td class="bold" align="center">Compile Logs</td>

-    <td class="bold" align="center">Compile Errors</td>

-    <td class="bold" align="center">Compiler Warnings</td>

-    <td class="bold" align="center">Access Violations</td>

-    <td class="bold" align="center">Access Warnings</td>

-  </tr>

-

-  %compilelogs%

-

-</table>

-

-</body>

-</html>

diff --git a/releng.wtpbuilder/distribution/patches.site/templateFiles/testResults.php.template b/releng.wtpbuilder/distribution/patches.site/templateFiles/testResults.php.template
deleted file mode 100644
index 2f2fba8..0000000
--- a/releng.wtpbuilder/distribution/patches.site/templateFiles/testResults.php.template
+++ /dev/null
@@ -1,118 +0,0 @@
-<html>
-<head>
-
-<?php
-	$parts = explode("/", getcwd());
-	$parts2 = explode("-", $parts[count($parts) - 1]);
-	$buildName = $parts2[1];
-	
-	echo "<title>Test Results for $buildName </title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2em;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:Bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-
-}
-</style>
-
-
-</head>
-<body>
-<p><b><font face="Verdana" size="+3">Test Results</font></b> </p>
-
-<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">
-    Unit Test Results for <?php echo "$buildName"; ?> on Various Platforms and JRE</font></b></td>
-  </tr>
-</table>
-
-<?php
-if (file_exists("testResults"))
-{
-$dir = dir("testResults");
-while ($anEntry = $dir->read())
-{
-  if ($anEntry != "." && $anEntry != ".." && $anEntry != "consolelogs" && $anEntry != "html" && $anEntry != "xml")
-  {
-    $link = "testResults/".$anEntry."/results/index.php";
-    echo "<p><a href=\"$link\">$anEntry</a></p>";
-  }
-}
-}
-?>
-
-<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">Unit 
-      Test Results for <?php echo "$buildName"; ?> </font></b></td>
-  </tr>
-</table>
-
-<table id=tableunittestdata align = "center" width="75%" border="1">
-  <tr> 
-    <td class="bold" align="center" width="70%">Test Suite</td>
-    <td class="bold" align="center" width="15%">Errors &amp; Failures</td>
-    <td class="bold" align="center" width="15%">Total Tests</td>
-  </tr>
-  
-  
-  %testresults%
-  
-</table>
-<p></p>
-<br>
-<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"> 
-      Console output logs 
-      <?php echo "$buildName"; ?>
-      </font></b></td>
-  </tr>
-</table>
-<br>
-These <a href="consoleLogs.php">logs</a> contain the console output captured while 
-running the JUnit automated tests. <br>
-<br>
-
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/patches.site/transformReportToHTML.xml b/releng.wtpbuilder/distribution/patches.site/transformReportToHTML.xml
deleted file mode 100644
index 9231345..0000000
--- a/releng.wtpbuilder/distribution/patches.site/transformReportToHTML.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-    name="xsl-conversion"
-    default="main"
-    basedir=".">
-    <target
-        name="main"
-        description="example.bin.xml to produce example.html">
-        <xslt
-            basedir="."
-            destdir="."
-            includes="*.bin.xml"
-            scanincludeddirectories="true"
-            style="compilerXMLOutputToHTML.xsl"
-            force="true"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches.tests/build.xml b/releng.wtpbuilder/distribution/patches.tests/build.xml
deleted file mode 100644
index 95d39be..0000000
--- a/releng.wtpbuilder/distribution/patches.tests/build.xml
+++ /dev/null
@@ -1,332 +0,0 @@
-<project
-    name="Build specific targets and properties"
-    default="runTest">
-    <!--
-        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"/>
-    <fail
-        message="testRoot must be set for this task"
-        unless="testRoot"/>
-    <!--
-        =====================================================================
-    -->
-    <!-- Steps to do after the build is done. -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="test">
-        <dirname
-            file="${ant.file}"
-            property="currentDirectory"/>
-        <ant
-            antfile="${ant.file}"
-            target="runTest"
-            dir="${currentDirectory}"/>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Steps to do to test the build results -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="runTest">
-        <dirname
-            file="${ant.file}"
-            property="test.component.dir"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-        <property
-            file="${buildDirectory}/label.properties"/>
-        <property
-            file="${wtp.builder.home}/build.properties"/>
-        <fail
-            message="testRoot must be set for this task"
-            unless="testRoot"/>
-        <mkdir
-            dir="${testRoot}"/>
-
-        <!-- if results already exist, delete them -->
-        <delete
-            dir="${testRoot}/results"
-            failOnError="false"/>
-        <mkdir
-            dir="${testRoot}/results"/>
-        <mkdir
-            dir="${testRoot}/results/consolelogs"/>
-        <copy
-            todir="${testRoot}"
-            overwrite="true">
-            <fileset
-                dir="${test.component.dir}/testScripts"></fileset>
-        </copy>
-        <echo
-            message="BASEOS: ${env.BASEOS}   BASEWS: ${env.BASEWS}   BASEARCH: ${env.BASEARCH} "/>
-        <ant
-            antfile="${test.component.dir}/testdependency.xml"
-            target="get">
-            <!--
-                if not otherwise set, assume its a legacy case that did
-                not use this
-            -->
-            <property
-                name="env.DEP_DIR"
-                value=""/>
-            <property
-                name="dependency.properties"
-                value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-            <property
-                name="base.install.dir"
-                value="${testRoot}"/>
-        </ant>
-        <antcall
-            target="unzipTests"/>
-        <antcall
-            target="runTestEclipse">
-            <param
-                name="testTarget"
-                value="all"/>
-        </antcall>
-        <antcall
-            target="postRunTestEclipse">
-            <param
-                name="testTarget"
-                value="all"/>
-        </antcall>
-    </target>
-    <target
-        name="unzipTests">
-        <!--
-            unzip the builds and junit tests we use 'unzip' here, so we
-            can continue on error (such as if zip was not created, due
-            to other failures or options).
-        -->
-        <exec
-            dir="${buildDirectory}/${buildLabel}"
-            executable="unzip"
-            failonerror="false">
-            <arg
-                line="-o -qq wtp-${buildLabel}.zip -d ${testRoot}"/>
-        </exec>
-        <exec
-            dir="${buildDirectory}/${buildLabel}"
-            executable="unzip"
-            failonerror="false">
-            <arg
-                line="-o -qq wtp-patches-tests-${buildLabel}.zip -d ${testRoot}"/>
-        </exec>
-    </target>
-    <!--
-        time out may need to be set/adjust for api or performance tests?
-        This testTimeLimit is the whole, overall limit on tests. There's
-        a shorter one for individual suites. some common values, of
-        milliseconds to more recognizable units: 7200000: 2 hours
-        3600000: 1 hour 1800000: 30 minutes 600000: 10 minutes
-    -->
-    <property
-        name="testTimeLimit"
-        value="7200000"/>
-    <property
-        name="testFailOnError"
-        value="false"/>
-    <target
-        name="runTestEclipse"
-        description="Run our JUnit's within an instance of antRunner">
-        <property
-            name="test-vm"
-            value="${env.JAVA_5_HOME}/bin/java"/>
-        <property
-            name="plugin-path"
-            value="${testRoot}/eclipse/plugins"/>
-        <property
-            name="vmargs"
-            value="-Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm}  -Dperf.buildId=${buildType}${date}-${time}"/>
-        <!--
-            set path to eclipse folder. If local folder, use '.';
-            otherwise, use c:\path\to\eclipse or /path/to/eclipse/
-        -->
-        <property
-            name="eclipse.home"
-            value="${testRoot}"/>
-        <echo
-            message="Running junits"/>
-        <!--
-            If there is not exactly one launcher in the stack, we'd best
-            fail fast, since we are not expecting that, and may indicate
-            an installation that would produce unpredictable results
-        -->
-        <!--
-            requires ant 1.7, and at this point, we're running 1.6 from
-            eclipse ... <condition property="expectedNumberOfLaunchers">
-            <resourcecount when="equal" count="1" > <fileset
-            dir="${testRoot}/eclipse/plugins"> <include
-            name="org.eclipse.equinox.launcher_*.jar" /> </fileset>
-            </resourcecount> </condition> <fail message="Did not find
-            expected number of launcher jars. Check installation."
-            unless="expectedNumberOfLaunchers" />
-        -->
-        <!--
-            Remember: using -debug for org.eclipse.ant.core.antRunner
-            produces ant debug info to be output ... which is a TON of
-            stuff
-        -->
-        <echo
-            message="eclipse.launcher: ${eclipse.launcher}"/>
-        <java
-            jar="${eclipse.launcher}"
-            taskname="unit-test-masterprocess"
-            fork="true"
-            resultProperty="wtpmasterjunitresult"
-            failonerror="false"
-            timeout="${testTimeLimit}"
-            dir="${testRoot}/eclipse"
-            jvm="${env.JAVA_5_HOME}/bin/java">
-            <jvmarg
-                value="-Xmx512m"/>
-            <jvmarg
-                value="-Declipse.launcher=${testRoot}/eclipse/startup.jar"/>
-            <jvmarg
-                value="-Dosgi.ws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dosgi.os=${env.BASEOS}"/>
-            <jvmarg
-                value="-Dosgi.arch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-Dws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dos=${env.BASEOS}"/>
-            <jvmarg
-                value="-Darch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-Dosgi.debug"/>
-            <jvmarg
-                value="-DbuildBranch=${buildBranch}"/>
-            <jvmarg
-                value="-DbuildType=${buildType}"/>
-            <jvmarg
-                value="-DbuildId=${buildId}"/>
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <jvmarg
-                value="-Dprojectname=${projectname}"/>
-            <arg
-                value="-nosplash"/>
-            <arg
-                value="-consolelog"/>
-            <arg
-                value="-data"/>
-            <arg
-                value="${testRoot}/overallTestWorkspace"/>
-            <arg
-                value="-application"/>
-            <arg
-                value="org.eclipse.ant.core.antRunner"/>
-            <arg
-                value="-file"/>
-            <arg
-                value="${testRoot}/test.xml"/>
-            <arg
-                value="-logger"/>
-            <arg
-                value="org.apache.tools.ant.DefaultLogger"/>
-            <env
-                key="DISPLAY"
-                value="${env.DISPLAY}"/>
-            <redirector
-                output="${testRoot}/results/fullOutput.txt"
-                error="${testRoot}/results/fullErrorLog.txt"/>
-            <sysproperty
-                key="build.home"
-                value="${env.BUILD_HOME}"/>
-            <sysproperty
-                key="buildDirectory"
-                value="${buildDirectory}"/>
-            <sysproperty
-                key="buildLabel"
-                value="${buildLabel}"/>
-            <sysproperty
-                key="baseLocation"
-                value="${baseLocation}"/>
-            <sysproperty
-                key="testRoot"
-                value="${testRoot}"/>
-            <sysproperty
-                key="testDir"
-                value="${testRoot}"/>
-            <sysproperty
-                key="perf.buildId"
-                value="${buildType}${date}-${time}"/>
-            <sysproperty
-                key="eclipseBuilderDirectory"
-                value="${pde.builder.path}"/>
-            <sysproperty
-                key="buildLabel"
-                value="${buildLabel}"/>
-        </java>
-        <echo
-            message="wtpmasterjunitresult ${wtpmasterjunitresult}"/>
-    </target>
-    <target
-        name="postRunTestEclipse">
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/consolelogs/testLogs"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results">
-                <include
-                    name="*output.txt"/>
-            </fileset>
-        </copy>
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/consolelogs/testSysErrorLogs"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results">
-                <include
-                    name="*error.txt"/>
-            </fileset>
-        </copy>
-        <copy
-            file="${testRoot}/results/fullOutput.txt"
-            toDir="${buildDirectory}/${buildLabel}/testResults/consolelogs/full"
-            overwrite="true"
-            failonerror="false">
-        </copy>
-        <copy
-            file="${testRoot}/results/fullErrorLog.txt"
-            toDir="${buildDirectory}/${buildLabel}/testResults/consolelogs/full"
-            overwrite="true"
-            failonerror="false">
-        </copy>
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/xml"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results/xml">
-                <include
-                    name="*.xml"/>
-            </fileset>
-        </copy>
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/html"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results/html">
-                <include
-                    name="*.html"/>
-            </fileset>
-        </copy>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches.tests/templateFiles/index.php b/releng.wtpbuilder/distribution/patches.tests/templateFiles/index.php
deleted file mode 100644
index a42c883..0000000
--- a/releng.wtpbuilder/distribution/patches.tests/templateFiles/index.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<html>
-<head>
-
-<?php
-$parts = explode("/", realpath(".."));
-$label = $parts[count($parts) - 1];
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-</head>
-<body>
-<p><b><font face="Verdana" size="+3">Test Results</font></b></p>
-<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">Unit Test Results for <?php echo "$label"; ?>
-		</font></b></td>
-	</tr>
-</table>
-<p></p>
-<table border="0">
-</table>
-
-<table width="77%" border="1">
-	<tr>
-		<td width="81%"><b>Tests Performed</b></td>
-		<td width="19%"><b>Errors &amp; Failures</b></td>
-	</tr>
-
-	<?
-	$dir = dir("html");
-	while ($anEntry = $dir->read())
-	{
-		if ($anEntry != "." && $anEntry != "..")
-		{
-			$link = "html/".$anEntry;
-			$xml = "xml/".substr($anEntry, 0, strlen($anEntry)-4)."xml";
-			$count = 0;
-			$fileHandle = fopen($xml, "r");
-			while (!feof($fileHandle))
-			{
-				$aLine = fgets($fileHandle, 4096); // Length parameter only optional after 4.2.0
-				$count = $count + substr_count($aLine, '<error');
-			}
-			fclose($fileHandle);
-			if ($count > 0)
-			{
-				echo "<tr><td><a href=\"$link\"><b><font color=\"red\">";
-				echo "$anEntry";
-				echo "</font></b></a></td>";
-				echo "<td><b><font color=\"red\">$count</font></b></td></tr>";
-			}
-			else
-			{
-				echo "<tr><td><a href=\"$link\">";
-				echo "$anEntry";
-				echo "</a></td>";
-				echo "<td>$count</td></tr>";
-			}
-		}
-	}
-	?>
-
-</table>
-<p></p>
-<br>
-<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"> Console output logs <?php echo "$label"; ?>
-		</font></b></td>
-	</tr>
-</table>
-<br>
-These
-<a href="consolelogs/wtptestlog.txt">logs</a>
-contain the console output captured while running the JUnit automated
-tests.
-<br>
-<br>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/patches.tests/testScripts/ComputePluginVersion.jar b/releng.wtpbuilder/distribution/patches.tests/testScripts/ComputePluginVersion.jar
deleted file mode 100644
index ad06a45..0000000
--- a/releng.wtpbuilder/distribution/patches.tests/testScripts/ComputePluginVersion.jar
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/patches.tests/testScripts/JUNIT.XSL b/releng.wtpbuilder/distribution/patches.tests/testScripts/JUNIT.XSL
deleted file mode 100644
index 9cdd80e..0000000
--- a/releng.wtpbuilder/distribution/patches.tests/testScripts/JUNIT.XSL
+++ /dev/null
@@ -1,703 +0,0 @@
-<xsl:stylesheet
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="1.0">
-    <xsl:output
-        method="html"
-        indent="yes"/>
-    <xsl:decimal-format
-        decimal-separator="."
-        grouping-separator=","/>
-    <xsl:template
-        match="testsuites">
-        <HTML>
-            <HEAD>
-                <style
-                    type="text/css"> body { font:normal 68%
-                    verdana,arial,helvetica; color:#000000; } table tr
-                    td, table tr th { font-size: 68%; } table.details tr
-                    th{ font-weight: bold; text-align:left;
-                    background:#a6caf0; } table.details tr td{
-                    background:#eeeee0; } p { line-height:1.5em;
-                    margin-top:0.5em; margin-bottom:1.0em; } h1 {
-                    margin: 0px 0px 5px; font: 165%
-                    verdana,arial,helvetica } h2 { margin-top: 1em;
-                    margin-bottom: 0.5em; font: bold 125%
-                    verdana,arial,helvetica } h3 { margin-bottom: 0.5em;
-                    font: bold 115% verdana,arial,helvetica } h4 {
-                    margin-bottom: 0.5em; font: bold 100%
-                    verdana,arial,helvetica } h5 { margin-bottom: 0.5em;
-                    font: bold 100% verdana,arial,helvetica } h6 {
-                    margin-bottom: 0.5em; font: bold 100%
-                    verdana,arial,helvetica } .Error { font-weight:bold;
-                    color:red; } .Failure { font-weight:bold;
-                    color:purple; } .Properties { text-align:right; } </style>
-                <script
-                    language="JavaScript">
-                    var TestCases = new Array(); var cur;
-                    <xsl:for-each
-                        select="./testsuite">
-                        <xsl:apply-templates
-                            select="properties"/>
-                    </xsl:for-each>
-                </script>
-                <script
-                    language="JavaScript"><![CDATA[
-        function displayProperties (name) {
-          var win = window.open('','JUnitSystemProperties','scrollbars=1,resizable=1');
-          var doc = win.document.open();
-          doc.write("<html><head><title>Properties of " + name + "</title>");
-          doc.write("<style>")
-          doc.write("body {font:normal 68% verdana,arial,helvetica;	color:#000000; }");
-          doc.write("table tr td, table tr th { font-size: 68%; }");
-          doc.write("table.properties { border-collapse:collapse; border-left:solid 1 #cccccc; border-top:solid 1 #cccccc; padding:5px; }");
-          doc.write("table.properties th { text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#eeeeee; }");
-          doc.write("table.properties td { font:normal; text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#fffffff; }");
-          doc.write("h3 { margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica }");
-          doc.write("</style>");
-          doc.write("</head><body>");
-          doc.write("<h3>Properties of " + name + "</h3>");
-          doc.write("<div align=\"right\"><a href=\"javascript:window.close();\">Close</a></div>");
-          doc.write("<table class='properties'>");
-          doc.write("<tr><th>Name</th><th>Value</th></tr>");
-          for (prop in TestCases[name]) {
-            doc.write("<tr><th>" + prop + "</th><td>" + TestCases[name][prop] + "</td></tr>");
-          }
-          doc.write("</table>");
-          doc.write("</body></html>");
-          doc.close();
-          win.focus();
-        }
-      ]]>
-                </script>
-            </HEAD>
-            <body>
-                <a
-                    name="top"></a>
-                <xsl:call-template
-                    name="pageHeader"/>
-
-                <!-- Summary part -->
-                <xsl:call-template
-                    name="summary"/>
-                <hr
-                    size="1"
-                    width="95%"
-                    align="left"/>
-
-                <!-- Package List part -->
-                <xsl:call-template
-                    name="packagelist"/>
-                <hr
-                    size="1"
-                    width="95%"
-                    align="left"/>
-
-                <!-- For each package create its part -->
-                <xsl:call-template
-                    name="packages"/>
-                <hr
-                    size="1"
-                    width="95%"
-                    align="left"/>
-
-                <!-- For each class create the  part -->
-                <xsl:call-template
-                    name="classes"/>
-            </body>
-        </HTML>
-    </xsl:template>
-    <!--
-        ==================================================================
-    -->
-    <!--
-        Write a list of all packages with an hyperlink to the anchor of
-    -->
-    <!--
-        of the package name.
-    -->
-    <!--
-        ==================================================================
-    -->
-    <xsl:template
-        name="packagelist">
-        <h2>Packages</h2>
-        Note: package statistics are not computed recursively, they only
-        sum up all of its testsuites numbers.
-        <table
-            class="details"
-            border="0"
-            cellpadding="5"
-            cellspacing="2"
-            width="95%">
-            <xsl:call-template
-                name="testsuite.test.header"/>
-            <!-- list all packages recursively -->
-            <xsl:for-each
-                select="./testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
-                <xsl:sort
-                    select="@package"/>
-                <xsl:variable
-                    name="testsuites-in-package"
-                    select="/testsuites/testsuite[./@package = current()/@package]"/>
-                <xsl:variable
-                    name="testCount"
-                    select="sum($testsuites-in-package/@tests)"/>
-                <xsl:variable
-                    name="errorCount"
-                    select="sum($testsuites-in-package/@errors)"/>
-                <xsl:variable
-                    name="failureCount"
-                    select="sum($testsuites-in-package/@failures)"/>
-                <xsl:variable
-                    name="timeCount"
-                    select="sum($testsuites-in-package/@time)"/>
-
-                <!-- write a summary for the package -->
-                <tr
-                    valign="top">
-                    <!-- set a nice color depending if there is an error/failure -->
-                    <xsl:attribute
-                        name="class">
-						<xsl:choose>
-							<xsl:when
-                        test="$failureCount &gt; 0">Failure</xsl:when>
-							<xsl:when
-                        test="$errorCount &gt; 0">Error</xsl:when>
-						</xsl:choose>
-					</xsl:attribute>
-                    <td>
-                        <a
-                            href="#{@package}">
-                            <xsl:value-of
-                                select="@package"/>
-                        </a>
-                    </td>
-                    <td>
-                        <xsl:value-of
-                            select="$testCount"/>
-                    </td>
-                    <td>
-                        <xsl:value-of
-                            select="$errorCount"/>
-                    </td>
-                    <td>
-                        <xsl:value-of
-                            select="$failureCount"/>
-                    </td>
-                    <td>
-                        <xsl:call-template
-                            name="display-time">
-                            <xsl:with-param
-                                name="value"
-                                select="$timeCount"/>
-                        </xsl:call-template>
-                    </td>
-                </tr>
-            </xsl:for-each>
-        </table>
-    </xsl:template>
-    <!--
-        ==================================================================
-    -->
-    <!--
-        Write a package level report
-    -->
-    <!--
-        It creates a table with values from the document:
-    -->
-    <!--
-        Name | Tests | Errors | Failures | Time
-    -->
-    <!--
-        ==================================================================
-    -->
-    <xsl:template
-        name="packages">
-        <!-- create an anchor to this package name -->
-        <xsl:for-each
-            select="/testsuites/testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
-            <xsl:sort
-                select="@package"/>
-            <a
-                name="{@package}"></a>
-            <h3>
-                Package
-                <xsl:value-of
-                    select="@package"/>
-            </h3>
-            <table
-                class="details"
-                border="0"
-                cellpadding="5"
-                cellspacing="2"
-                width="95%">
-                <xsl:call-template
-                    name="testsuite.test.header"/>
-
-                <!-- match the testsuites of this package -->
-                <xsl:apply-templates
-                    select="/testsuites/testsuite[./@package = current()/@package]"
-                    mode="print.test"/>
-            </table>
-            <a
-                href="#top">Back to top</a>
-            <p/>
-            <p/>
-        </xsl:for-each>
-    </xsl:template>
-    <xsl:template
-        name="classes">
-        <xsl:for-each
-            select="testsuite">
-            <xsl:sort
-                select="@name"/>
-            <!-- create an anchor to this class name -->
-            <a
-                name="{@name}"></a>
-            <h3>
-                TestCase
-                <xsl:value-of
-                    select="@name"/>
-            </h3>
-            <table
-                class="details"
-                border="0"
-                cellpadding="5"
-                cellspacing="2"
-                width="95%">
-                <xsl:call-template
-                    name="testcase.test.header"/>
-                <!--
-                    test can even not be started at all (failure to load
-                    the class) so report the error directly
-                -->
-                <xsl:if
-                    test="./error">
-                    <tr
-                        class="Error">
-                        <td
-                            colspan="4">
-                            <xsl:apply-templates
-                                select="./error"/>
-                        </td>
-                    </tr>
-                </xsl:if>
-                <xsl:apply-templates
-                    select="./testcase"
-                    mode="print.test"/>
-            </table>
-            <div
-                class="Properties">
-                <a>
-                    <xsl:attribute
-                        name="href">javascript:displayProperties('<xsl:value-of
-                        select="@package"/>.<xsl:value-of
-                        select="@name"/>');</xsl:attribute>
-                    Properties &gt;&gt;
-                </a>
-            </div>
-            <p/>
-            <a
-                href="#top">Back to top</a>
-        </xsl:for-each>
-    </xsl:template>
-    <xsl:template
-        name="summary">
-        <h2>Summary</h2>
-        <xsl:variable
-            name="testCount"
-            select="sum(testsuite/@tests)"/>
-        <xsl:variable
-            name="errorCount"
-            select="sum(testsuite/@errors)"/>
-        <xsl:variable
-            name="failureCount"
-            select="sum(testsuite/@failures)"/>
-        <xsl:variable
-            name="timeCount"
-            select="sum(testsuite/@time)"/>
-        <xsl:variable
-            name="successRate"
-            select="($testCount - $failureCount - $errorCount) div $testCount"/>
-        <table
-            class="details"
-            border="0"
-            cellpadding="5"
-            cellspacing="2"
-            width="95%">
-            <tr
-                valign="top">
-                <th>Tests</th>
-                <th>Failures</th>
-                <th>Errors</th>
-                <th>Success rate</th>
-                <th>Time</th>
-            </tr>
-            <tr
-                valign="top">
-                <xsl:attribute
-                    name="class">
-				<xsl:choose>
-					<xsl:when
-                    test="$failureCount &gt; 0">Failure</xsl:when>
-					<xsl:when
-                    test="$errorCount &gt; 0">Error</xsl:when>
-				</xsl:choose>
-			</xsl:attribute>
-                <td>
-                    <xsl:value-of
-                        select="$testCount"/>
-                </td>
-                <td>
-                    <xsl:value-of
-                        select="$failureCount"/>
-                </td>
-                <td>
-                    <xsl:value-of
-                        select="$errorCount"/>
-                </td>
-                <td>
-                    <xsl:call-template
-                        name="display-percent">
-                        <xsl:with-param
-                            name="value"
-                            select="$successRate"/>
-                    </xsl:call-template>
-                </td>
-                <td>
-                    <xsl:call-template
-                        name="display-time">
-                        <xsl:with-param
-                            name="value"
-                            select="$timeCount"/>
-                    </xsl:call-template>
-                </td>
-            </tr>
-        </table>
-        <table
-            border="0"
-            width="95%">
-            <tr>
-                <td
-                    style="text-align: justify;">
-                    Note:
-                    <i>failures</i>
-                    are anticipated and checked for with assertions
-                    while
-                    <i>errors</i>
-                    are unanticipated.
-                </td>
-            </tr>
-        </table>
-    </xsl:template>
-    <!--
-        Write properties into a JavaScript data structure. This is based
-        on the original idea by Erik Hatcher (erik@hatcher.net)
-    -->
-    <xsl:template
-        match="properties">
-        cur = TestCases['
-        <xsl:value-of
-            select="../@package"/>
-        .
-        <xsl:value-of
-            select="../@name"/>
-        '] = new Array();
-        <xsl:for-each
-            select="property">
-            <xsl:sort
-                select="@name"/>
-            cur['
-            <xsl:value-of
-                select="@name"/>
-            '] = '
-            <xsl:call-template
-                name="JS-escape">
-                <xsl:with-param
-                    name="string"
-                    select="@value"/>
-            </xsl:call-template>
-            ';
-        </xsl:for-each>
-    </xsl:template>
-
-    <!-- Page HEADER -->
-    <xsl:template
-        name="pageHeader">
-        <h1>Unit Test Results</h1>
-        <table
-            width="100%">
-            <tr>
-                <td
-                    align="left"></td>
-                <td
-                    align="right">
-                    Designed for use with
-                    <a
-                        href='http://www.junit.org'>JUnit</a>
-                    and
-                    <a
-                        href='http://jakarta.apache.org/ant'>Ant</a>
-                    .
-                </td>
-            </tr>
-        </table>
-        <hr
-            size="1"/>
-    </xsl:template>
-    <xsl:template
-        match="testsuite"
-        mode="header">
-        <tr
-            valign="top">
-            <th
-                width="80%">Name</th>
-            <th>Tests</th>
-            <th>Errors</th>
-            <th>Failures</th>
-            <th
-                nowrap="nowrap">Time(s)</th>
-        </tr>
-    </xsl:template>
-
-    <!-- class header -->
-    <xsl:template
-        name="testsuite.test.header">
-        <tr
-            valign="top">
-            <th
-                width="80%">Name</th>
-            <th>Tests</th>
-            <th>Errors</th>
-            <th>Failures</th>
-            <th
-                nowrap="nowrap">Time(s)</th>
-        </tr>
-    </xsl:template>
-
-    <!-- method header -->
-    <xsl:template
-        name="testcase.test.header">
-        <tr
-            valign="top">
-            <th>Name</th>
-            <th>Status</th>
-            <th
-                width="80%">Type</th>
-            <th
-                nowrap="nowrap">Time(s)</th>
-        </tr>
-    </xsl:template>
-
-
-    <!-- class information -->
-    <xsl:template
-        match="testsuite"
-        mode="print.test">
-        <tr
-            valign="top">
-            <!-- set a nice color depending if there is an error/failure -->
-            <xsl:attribute
-                name="class">
-			<xsl:choose>
-				<xsl:when
-                test="@failures[.&gt; 0]">Failure</xsl:when>
-				<xsl:when
-                test="@errors[.&gt; 0]">Error</xsl:when>
-			</xsl:choose>
-		</xsl:attribute>
-
-            <!-- print testsuite information -->
-            <td>
-                <a
-                    href="#{@name}">
-                    <xsl:value-of
-                        select="@name"/>
-                </a>
-            </td>
-            <td>
-                <xsl:value-of
-                    select="@tests"/>
-            </td>
-            <td>
-                <xsl:value-of
-                    select="@errors"/>
-            </td>
-            <td>
-                <xsl:value-of
-                    select="@failures"/>
-            </td>
-            <td>
-                <xsl:call-template
-                    name="display-time">
-                    <xsl:with-param
-                        name="value"
-                        select="@time"/>
-                </xsl:call-template>
-            </td>
-        </tr>
-    </xsl:template>
-    <xsl:template
-        match="testcase"
-        mode="print.test">
-        <tr
-            valign="top">
-            <xsl:attribute
-                name="class">
-			<xsl:choose>
-				<xsl:when
-                test="failure | error">Error</xsl:when>
-			</xsl:choose>
-		</xsl:attribute>
-            <td>
-                <xsl:value-of
-                    select="@name"/>
-            </td>
-            <xsl:choose>
-                <xsl:when
-                    test="failure">
-                    <td>Failure</td>
-                    <td>
-                        <xsl:apply-templates
-                            select="failure"/>
-                    </td>
-                </xsl:when>
-                <xsl:when
-                    test="error">
-                    <td>Error</td>
-                    <td>
-                        <xsl:apply-templates
-                            select="error"/>
-                    </td>
-                </xsl:when>
-                <xsl:otherwise>
-                    <td>Success</td>
-                    <td></td>
-                </xsl:otherwise>
-            </xsl:choose>
-            <td>
-                <xsl:call-template
-                    name="display-time">
-                    <xsl:with-param
-                        name="value"
-                        select="@time"/>
-                </xsl:call-template>
-            </td>
-        </tr>
-    </xsl:template>
-    <xsl:template
-        match="failure">
-        <xsl:call-template
-            name="display-failures"/>
-    </xsl:template>
-    <xsl:template
-        match="error">
-        <xsl:call-template
-            name="display-failures"/>
-    </xsl:template>
-
-    <!-- Style for the error and failure in the tescase template -->
-    <xsl:template
-        name="display-failures">
-        <xsl:choose>
-            <xsl:when
-                test="not(@message)">
-                N/A
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of
-                    select="@message"/>
-            </xsl:otherwise>
-        </xsl:choose>
-        <!-- display the stacktrace -->
-        <code>
-            <p/>
-            <xsl:call-template
-                name="br-replace">
-                <xsl:with-param
-                    name="word"
-                    select="."/>
-            </xsl:call-template>
-        </code>
-        <!--
-            the later is better but might be problematic for non-21"
-            monitors...
-        -->
-        <!--pre><xsl:value-of select="."/></pre-->
-    </xsl:template>
-    <xsl:template
-        name="JS-escape">
-        <xsl:param
-            name="string"/>
-        <xsl:choose>
-            <!--
-                something isn't right here, basically all single quotes
-                need to be replaced with backslash-single-quote
-                <xsl:when test="contains($string,'&apos;')">
-                <xsl:value-of
-                select="substring-before($string,'&apos;')"/> \&apos;
-                <xsl:call-template name="JS-escape"> <xsl:with-param
-                name="string"
-                select="substring-after($string,'&apos;')"/>
-                </xsl:call-template> </xsl:when>
-            -->
-            <xsl:when
-                test="contains($string,'\')">
-                <xsl:value-of
-                    select="substring-before($string,'\')"/>
-                \\
-                <xsl:call-template
-                    name="JS-escape">
-                    <xsl:with-param
-                        name="string"
-                        select="substring-after($string,'\')"/>
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of
-                    select="$string"/>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-    <!--
-        template that will convert a carriage return into a br tag
-        @param word the text from which to convert CR to BR tag
-    -->
-    <xsl:template
-        name="br-replace">
-        <xsl:param
-            name="word"/>
-        <xsl:choose>
-            <xsl:when
-                test="contains($word,'&#xA;')">
-                <xsl:value-of
-                    select="substring-before($word,'&#xA;')"/>
-                <br/>
-                <xsl:call-template
-                    name="br-replace">
-                    <xsl:with-param
-                        name="word"
-                        select="substring-after($word,'&#xA;')"/>
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of
-                    select="$word"/>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-    <xsl:template
-        name="display-time">
-        <xsl:param
-            name="value"/>
-        <xsl:value-of
-            select="format-number($value,'0.000')"/>
-    </xsl:template>
-    <xsl:template
-        name="display-percent">
-        <xsl:param
-            name="value"/>
-        <xsl:value-of
-            select="format-number($value,'0.00%')"/>
-    </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/patches.tests/testScripts/test.xml
deleted file mode 100644
index b0e3470..0000000
--- a/releng.wtpbuilder/distribution/patches.tests/testScripts/test.xml
+++ /dev/null
@@ -1,1003 +0,0 @@
-<project
-    name="Automated Eclipse Testing"
-    default="all"
-    basedir=".">
-    <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-    <echo
-        level="info"
-        message="starting Automated Eclipse Testing"/>
-    <echo
-        level="debug"
-        message="basedir: ${basedir}"/>
-    <echo
-        level="debug"
-        message="testRoot: ${testRoot}"/>
-    <fail
-        message="testRoot must be set"
-        unless="testRoot"/>
-
-    <!--properties file containing the some server name properties -->
-    <property
-        file="${testRoot}/testServer.properties"/>
-
-    <!--properties file containing the build information-->
-    <property
-        file="${buildDirectory}/label.properties"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-    <!--default directory where test-eclipse will be installed-->
-    <property
-        name="install"
-        value="${testRoot}"/>
-    <!--
-        name that can be added to report name to identify which platform
-        tests results come from
-    -->
-    <property
-        name="platform"
-        value=""/>
-
-    <!-- The root of the eclipse installation -->
-    <property
-        name="eclipse-home"
-        value="${testRoot}/eclipse"/>
-    <!--
-        The directory that will contain the xml and html results from
-        the tests that are run
-    -->
-    <property
-        name="results"
-        value="${testRoot}/results"/>
-    <property
-        name="library-file"
-        value="${testRoot}/wtp-junit-tests.xml"/>
-
-    <!-- jonas install directory -->
-    <!-- TODO: why do this twice? Here and in init? -->
-    <property
-        name="jonas432Dir"
-        value="${testRoot}/${jonas432DirName}"/>
-    <target
-        name="init">
-        <antcall
-            target="setPropertyJOnAS432Dir"/>
-        <antcall
-            target="computePluginVersion"/>
-        <property
-            file="${testRoot}/test2.properties"/>
-    </target>
-    <target
-        name="setPropertyJOnAS432Dir"
-        unless="jonas432Dir">
-        <property
-            name="jonas432Dir"
-            value="${testRoot}/${jonas432DirName}"/>
-    </target>
-    <target
-        name="setup"
-        if="clean"
-        description="Reinstall the test Eclipse installation if specified by user">
-        <delete
-            dir="${install}"/>
-        <mkdir
-            dir="${install}"/>
-        <exec
-            dir="."
-            executable="unzip">
-            <arg
-                line="-o -qq ../downloads/*.zip -d ${install}"/>
-        </exec>
-        <exec
-            dir="."
-            executable="unzip">
-            <arg
-                line="-o -qq  wtp-wst-tests-feature*.zip -d ${install}"/>
-        </exec>
-    </target>
-    <target
-        name="runapitests"
-        depends="setup">
-        <antcall
-            target="runtests"/>
-    </target>
-    <target
-        name="runtests"
-        depends="setup"
-        description="Runs ant on the test.xml for a specified plugin.">
-        <available
-            file="${eclipse-home}/plugins/${testPlugin}/test.xml"
-            property="test.xml.exists"/>
-        <antcall
-            target="runtests2"/>
-    </target>
-    <target
-        name="runtests2"
-        if="test.xml.exists">
-        <antcall
-            target="runtests-normal"/>
-        <copy
-            file="${eclipse-home}/${report}.xml"
-            tofile="${results}/xml/${report}_${platform}.xml"
-            failonerror="false"/>
-        <antcall
-            target="genHtml"/>
-    </target>
-    <target
-        name="runtests-normal">
-        <ant
-            antfile="${eclipse-home}/plugins/${testPlugin}/test.xml"
-            dir="${eclipse-home}">
-            <property
-                name="library-file"
-                value="${testRoot}/wtp-junit-tests.xml"/>
-        </ant>
-        <copy
-            file="${eclipse-home}/${report}.xml"
-            tofile="${results}/xml/${report}_${platform}.xml"
-            failonerror="false"/>
-        <antcall
-            target="genHtml"/>
-    </target>
-    <target
-        name="wst-server-tests"
-        depends="init"
-        description="Runs the org.eclipse.wst.server.*.tests test.xml">
-        <antcall
-            target="runapitests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.server.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.server.core.tests"/>
-            <param
-                name="package.includes"
-                value="org.eclipse.wst.server"/>
-        </antcall>
-        <antcall
-            target="runapitests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.server.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.server.ui.tests"/>
-            <param
-                name="package.includes"
-                value="org.eclipse.wst.server"/>
-        </antcall>
-    </target>
-    <target
-        name="wst-monitor-tests"
-        depends="init"
-        description="Runs the org.eclipse.wst.internet.monitor.*.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.internet.monitor.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.internet.monitor.core.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.internet.monitor.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.internet.monitor.ui.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="wst-cache-tests"
-        depends="init"
-        description="Runs the org.eclipse.wst.internet.cache.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.internet.cache.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.internet.cache.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="jst-server-tests"
-        depends="init"
-        description="Runs the org.eclipse.jst.server.*.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.server.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.server.core.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.server.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.server.ui.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="jst-server-tomcat-tests"
-        depends="init"
-        description="Runs the org.eclipse.jst.server.tomcat.*.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.server.tomcat.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.server.tomcat.core.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.server.tomcat.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.server.tomcat.ui.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="jst-server-generic-tests"
-        depends="init"
-        description="Runs the org.eclipse.jst.server.generic.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.server.generic.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.server.generic.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="jst-server-geronimo-tests"
-        depends="init"
-        description="Runs the org.eclipse.jst.server.geronimo.*.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.server.geronimo.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.server.geronimo.core.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.server.geronimo.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.server.geronimo.ui.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="jst-jem-tests"
-        depends="init"
-        description="Runs the org.eclipse.jem.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jem.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jem.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="jst-j2ee-core-tests"
-        depends="init"
-        description="Runs the org.eclipse.jst.j2ee.core.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.j2ee.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.j2ee.core.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="jst-j2ee-tests"
-        depends="init"
-        description="Runs the org.eclipse.jst.j2ee.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.j2ee.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.j2ee.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="wst-common-tests"
-        depends="init"
-        description="Runs the org.eclipse.jst.j2ee.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.common.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.common.tests"/>
-            <param
-                name="debug"
-                value="false"/>
-        </antcall>
-    </target>
-    <target
-        name="wst-common-snippets-tests"
-        depends="init">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.common.snippets.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.common.snippets.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="jst-servlet-tests"
-        depends="init"
-        description="Runs the org.eclipse.jst.servlet.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.servlet.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.servlet.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="jst-validation-framework-tests"
-        depends="init"
-        description="Runs the org.eclipse.jst.validation.test test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.validation.test}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.validation.test"/>
-        </antcall>
-    </target>
-
-    <!-- JSP TESTS -->
-    <target
-        name="jst-jsp-tests"
-        depends="init"
-        description="Runs test.xml for JSP tests">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.jsp.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.jsp.core.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.jsp.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.jsp.ui.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.jsp.tests.encoding}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.jsp.tests.encoding"/>
-        </antcall>
-    </target>
-
-    <!-- SSE TESTS -->
-    <target
-        name="wst-sse-tests"
-        depends="init"
-        description="Runs test.xml for SSE tests">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.sse.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.sse.core.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.sse.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.sse.ui.tests"/>
-        </antcall>
-    </target>
-
-    <!-- XML TESTS -->
-    <target
-        name="wst-xml-tests"
-        depends="init"
-        description="Runs test.xml for XML tests">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.xml.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.xml.core.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.xml.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.xml.ui.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.xml.tests.encoding}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.xml.tests.encoding"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.xml.validation.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.xml.validation.tests"/>
-        </antcall>
-    </target>
-
-    <!-- WSDL TESTS -->
-    <target
-        name="wst-wsdl-tests"
-        depends="init"
-        description="Runs test.xml for WSDL ">
-        <antcall
-            target="runapitests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.wsdl.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.wsdl.tests"/>
-            <param
-                name="package.includes"
-                value="org.eclipse.wst.wsdl"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.wsdl.validation.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.wsdl.validation.tests"/>
-        </antcall>
-    </target>
-
-    <!-- WSI TESTS -->
-    <target
-        name="wst-wsi-tests"
-        depends="init"
-        description="Runs test.xml for WSI tests">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.wsi.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.wsi.tests"/>
-        </antcall>
-    </target>
-
-    <!-- XSD TESTS -->
-    <target
-        name="wst-xsd-tests"
-        depends="init"
-        description="Runs test.xml for XSD tests ">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.xsd.validation.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.xsd.validation.tests"/>
-        </antcall>
-    </target>
-
-    <!-- HTML TESTS -->
-    <target
-        name="wst-html-tests"
-        depends="init"
-        description="Runs test.xml for HTML tests">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.html.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.html.core.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.html.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.html.ui.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.html.tests.encoding}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.html.tests.encoding"/>
-        </antcall>
-    </target>
-
-    <!-- DTD Tests -->
-    <target
-        name="wst-dtd-tests"
-        depends="init">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.dtd.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.dtd.ui.tests"/>
-        </antcall>
-    </target>
-
-    <!-- CSS TESTS -->
-    <target
-        name="wst-css-tests"
-        depends="init"
-        description="Runs test.xml for
-                                                                                                org.eclipse.wst.css.core.tests
-                                                                                                org.eclipse.wst.css.ui.tests
-                                                                                                org.eclipse.wst.css.tests.encoding">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.css.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.css.core.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.css.tests.encoding}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.css.tests.encoding"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.css.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.css.ui.tests"/>
-        </antcall>
-    </target>
-
-    <!-- JSF TESTS -->
-    <target
-        name="jsf-tests"
-        depends="init"
-        description="Runs test.xml for org.eclipse.jst.jsf.core.tests, org.eclipse.jst.jsf.ui.tests">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.jsf.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.jsf.core.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.jsf.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.jsf.ui.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.jsf.metadata.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.jsf.metadata.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.jsf.contentassist.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.jsf.contentassist.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.jsf.context.symbol.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.jsf.context.symbol.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.jsf.designtime.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.jsf.designtime.tests"/>
-        </antcall>
-    </target>
-
-    <!-- WS TESTS -->
-    <target
-        name="wst-ws-tests"
-        depends="init"
-        description="Runs the org.eclipse.wst.ws.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.ws.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.ws.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="jst-ws-tests"
-        depends="init"
-        description="Runs the org.eclipse.jst.ws.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.ws.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.ws.tests"/>
-        </antcall>
-    </target>
-
-    <!-- Faceted Project Framework Tests -->
-    <target
-        name="wst-facets-tests"
-        depends="init"
-        description="Runs the Faceted Project Framework tests.">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.common.project.facet.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.common.project.facet.core.tests"/>
-        </antcall>
-    </target>
-
-    <!-- Dali tests -->
-    <target
-        name="jpt-utility-tests"
-        depends="init"
-        description="Runs the org.eclipse.jpt.utility.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jpt.utility.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jpt.utility.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="dali-core-tests"
-        description="Runs the org.eclipse.jpt.core.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jpt.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jpt.core.tests"/>
-        </antcall>
-    </target>
-
-    <!-- releng Tests -->
-    <target
-        name="releng-tests"
-        depends="init"
-        description="Runs the releng tests.">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wtp.releng.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wtp.releng.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="all"
-        depends="init">
-        <echo
-            level="info"
-            message="Starting WTP Unit Tests"/>
-        <echo
-            level="info"
-            message="Starting releng tests"/>
-        <antcall
-            target="releng-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-server-tests"/>
-        <antcall
-            target="wst-server-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-monitor-tests"/>
-        <antcall
-            target="wst-monitor-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-cache-tests"/>
-        <antcall
-            target="wst-cache-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-common-tests"/>
-        <antcall
-            target="wst-common-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-common-snippets-tests"/>
-        <antcall
-            target="wst-common-snippets-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-sse-tests"/>
-        <antcall
-            target="wst-sse-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-xml-tests"/>
-        <antcall
-            target="wst-xml-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-wsdl-tests"/>
-        <antcall
-            target="wst-wsdl-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-wsi-tests"/>
-        <antcall
-            target="wst-wsi-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-xsd-tests"/>
-        <antcall
-            target="wst-xsd-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-html-tests"/>
-        <antcall
-            target="wst-html-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-dtd-tests"/>
-        <antcall
-            target="wst-dtd-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-css-tests"/>
-        <antcall
-            target="wst-css-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-ws-tests"/>
-        <antcall
-            target="wst-ws-tests"/>
-        <echo
-            level="info"
-            message="Starting jst-server-tests"/>
-        <antcall
-            target="jst-server-tests"/>
-        <echo
-            level="info"
-            message="Starting jst-server-tomcat-tests"/>
-        <antcall
-            target="jst-server-tomcat-tests"/>
-        <echo
-            level="info"
-            message="Starting jst-server-geronimo-tests"/>
-        <antcall
-            target="jst-server-geronimo-tests"/>
-        <echo
-            level="info"
-            message="Starting jst-server-generic-tests"/>
-        <antcall
-            target="jst-server-generic-tests"/>
-        <echo
-            level="info"
-            message="Starting jst-jem-tests"/>
-        <antcall
-            target="jst-jem-tests"/>
-        <echo
-            level="info"
-            message="Starting jst-j2ee-core-tests"/>
-        <antcall
-            target="jst-j2ee-core-tests"/>
-        <echo
-            level="info"
-            message="Starting jst-j2ee-tests"/>
-        <antcall
-            target="jst-j2ee-tests"/>
-        <echo
-            level="info"
-            message="Starting jst-validation-framework-tests"/>
-        <antcall
-            target="jst-validation-framework-tests"/>
-        <echo
-            level="info"
-            message="Starting jst-jsp-tests"/>
-        <antcall
-            target="jst-jsp-tests"/>
-        <echo
-            level="info"
-            message="Starting jst-ws-tests"/>
-        <antcall
-            target="jst-ws-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-facets-tests"/>
-        <antcall
-            target="wst-facets-tests"/>
-        <echo
-            level="info"
-            message="Starting JPT Unit Tests"/>
-        <echo
-            level="info"
-            message="Starting jpt-utility-tests"/>
-        <antcall
-            target="jpt-utility-tests"/>
-        <echo
-            level="info"
-            message="Starting dali-core-tests"/>
-        <antcall
-            target="dali-core-tests"/>
-        <echo
-            level="info"
-            message="Ended JPT Unit Tests"/>
-        <echo
-            level="info"
-            message="Starting JSF Tests"/>
-        <antcall
-            target="jsf-tests"/>
-        <echo
-            level="info"
-            message="Ended WTP Unit Tests"/>
-    </target>
-    <target
-        name="genHtml"
-        description="Generates HTML results with provided JUNIT.XSL provided"
-        unless="genHtml.disable">
-        <xslt
-            style="JUNIT.XSL"
-            basedir="${results}/xml"
-            destdir="${results}/html"/>
-    </target>
-    <target
-        name="computePluginVersion"
-        depends="test2properties"
-        unless="test2propertiesexists">
-        <java
-            classname="org.eclipse.wtp.releng.test.ComputePluginVersion">
-            <classpath>
-                <pathelement
-                    location="ComputePluginVersion.jar"/>
-            </classpath>
-            <arg
-                value="${eclipse-home}/plugins"/>
-            <arg
-                value="${testRoot}/test2.properties"/>
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-        </java>
-    </target>
-    <target
-        name="test2properties">
-        <condition
-            property="test2propertiesexists">
-            <available
-                file="${testRoot}/test2.properties"/>
-        </condition>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches.tests/testScripts/testServer.properties b/releng.wtpbuilder/distribution/patches.tests/testScripts/testServer.properties
deleted file mode 100644
index be77c9b..0000000
--- a/releng.wtpbuilder/distribution/patches.tests/testScripts/testServer.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-
-# Tomcat dirs
-tomcat50Dir=jakarta-tomcat-5.0.28
-
-# Jonas dirs
-#jonas432Dir=
-jonas432DirName=JONAS_4_3_2
-
-# SWT
-#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
-
-# JSF Runtime Library directory
-jsf1.1Dir=myfaces-core-1.1.5/lib
-
-# JPT Persistence Runtime Library path
-jpt-persistence-jar=jpt/jpt-persistence-2.0-preview/lib/javax.persistence_2.0_preview.jar
-jpt-eclipselink-jar=jpt/jpt-eclipselink-2.0.0/lib/eclipselink.jar
-
-jpt-persistence10-jar=jpt/persistence-1.0/lib/persistence.jar
-jpt-eclipselink110-jar=jpt/eclipselink-1.1.0/lib/eclipselink.jar
diff --git a/releng.wtpbuilder/distribution/patches.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/patches.tests/testScripts/wtp-junit-tests.xml
deleted file mode 100644
index 74744d6..0000000
--- a/releng.wtpbuilder/distribution/patches.tests/testScripts/wtp-junit-tests.xml
+++ /dev/null
@@ -1,309 +0,0 @@
-<?xml version="1.0"?>
-<project
-    name="JUnit tests"
-    basedir=".">
-    <property
-        environment="env"/>
-
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-    <target
-        name="init">
-        <property
-            name="junit-report-output"
-            value="${testRoot}/results"/>
-        <mkdir
-            dir="${junit-report-output}/raw"/>
-        <!--
-            if not otherwise set, be sure extraVMargs is at least some
-            string, even if unused string. Remember, though, extraVMArgs
-            can contain more than one extra arg, so much be passed to VM
-            as a "line", not "value".
-        -->
-        <property
-            name="extraVMargs"
-            value="-DextraVMargsunused=notused"/>
-
-        <!-- if not otherwise set, use a unique workspace name -->
-        <property
-            name="data-dir"
-            value="${testRoot}/junitworkspaces/workspace-${classname}"/>
-        <property
-            name="testRoot"
-            value="${testRoot}"/>
-        <!--
-            Some common values, of milliseconds to more recognizable
-            units: 14400000: 4 hours 7200000: 2 hours 3600000: 1 hour
-            1800000: 30 minutes 600000: 10 minutes
-        -->
-        <property
-            name="timeout"
-            value="3600000"/>
-        <property
-            name="junit-report-output"
-            value="${junit-report-output}"/>
-        <property
-            name="formatter"
-            value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter"/>
-        <property
-            name="test-output"
-            value="${junit-report-output}/raw/${classname}.xml"/>
-        <property
-            name="jvm"
-            value="${env.JAVA_5_HOME}/bin/java"/>
-        <dirname
-            file="${ant.file}"
-            property="currentDir"/>
-        <echo
-            level="debug"
-            message="data-dir: ${data-dir}"/>
-        <echo
-            level="debug"
-            message="plugin-name: ${plugin-name}"/>
-        <echo
-            level="debug"
-            message="testPlugin: ${testPlugin}"/>
-        <echo
-            level="debug"
-            message="classname: ${classname}"/>
-        <echo
-            level="info"
-            message="extraVMargs: ${extraVMargs}"/>
-        <echo
-            level="debug"
-            message="timeout: ${timeout}"/>
-        <echo
-            level="debug"
-            message="testRoot: ${testRoot}"/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="debug"
-            message="eclipse-home: ${eclipse-home}"/>
-        <echo
-            level="debug"
-            message="junit-report-output: ${junit-report-output}"/>
-        <echo
-            level="debug"
-            message="test-output: ${test-output}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="buildLabel: ${buildLabel}"/>
-        <echo
-            level="debug"
-            message="jvm: ${jvm}"/>
-    </target>
-    <target
-        name="core-test"
-        depends="init">
-        <echo
-            level="info"
-            message="test-type: core-test"/>
-        <ant
-            antfile="${ant.file}"
-            dir="${currentDir}"
-            target="eclipse-test">
-            <property
-                name="application"
-                value="org.eclipse.test.coretestapplication"/>
-        </ant>
-    </target>
-    <target
-        name="ui-test"
-        depends="init">
-        <echo
-            level="info"
-            message="test-type: ui-test"/>
-        <ant
-            antfile="${ant.file}"
-            dir="${currentDir}"
-            target="eclipse-test">
-            <property
-                name="application"
-                value="org.eclipse.test.uitestapplication"/>
-        </ant>
-    </target>
-    <target
-        name="eclipse-test"
-        description="Runs the specified classname as a plug-in test.">
-        <echo
-            level="info"
-            message="Running ${classname}"/>
-        <echo
-            level="debug"
-            message="Result file: ${junit-report-output}/${classname}.xml."/>
-        <echo
-            level="debug"
-            message="DISPLAY: ${env.DISPLAY}"/>
-        <mkdir
-            dir="${buildDirectory}/${buildLabel}/httplogstest"/>
-        <echo
-            message="http log messages to: ${buildDirectory}/${buildLabel}/httplogstest"/>
-        <condition
-            property="xulRunnerParam"
-            value="org.eclipse.swt.browser.XULRunnerPath"
-            else="XULRunnerPathNotSpecified">
-            <isset
-                property="env.WTP_XULRUNNER"/>
-        </condition>
-        <echo
-            message="xulRunnerParam: ${xulRunnerParam}"/>
-        <echo
-            message="WTP_XULRUNNER: ${env.WTP_XULRUNNER}"/>
-        <!--
-            If there is not exactly one launcher in the stack, we'd best
-            fail fast, since we are not expecting that, and may indicate
-            an installation that would produce unpredictable results
-        -->
-        <!--
-            requires ant 1.7, and at this point, we're running 1.6 from
-            eclipse ... <condition property="expectedNumberOfLaunchers">
-            <resourcecount when="equal" count="1" > <fileset
-            dir="${testRoot}/eclipse/plugins"> <include
-            name="org.eclipse.equinox.launcher_*.jar" /> </fileset>
-            </resourcecount> </condition> <fail message="Did not find
-            expected number of launcher jars. Check installation."
-            unless="expectedNumberOfLaunchers" />
-        -->
-        <java
-            jar="${eclipse.launcher}"
-            taskname="suiteUnitTest"
-            fork="true"
-            resultProperty="suitejunitresult"
-            failonerror="false"
-            timeout="${timeout}"
-            dir="${testRoot}/eclipse"
-            jvm="${jvm}">
-            <jvmarg
-                value="-Xmx758m"/>
-            <jvmarg
-                value="-Dosgi.ws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dosgi.os=${env.BASEOS}"/>
-            <jvmarg
-                value="-Dosgi.arch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-DbuildLabel=${buildLabel}"/>
-            <jvmarg
-                value="-DbuildDirectory=${buildDirectory}"/>
-            <jvmarg
-                value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
-            <jvmarg
-                value="-DurlLogLocation=${buildDirectory}/outgoinghttplogfromtests.log"/>
-            <jvmarg
-                value="-Dwtp.autotest.noninteractive=true"/>
-            <jvmarg
-                line="${extraVMargs}"/>
-            <jvmarg
-                value="-Declipse.consolelog=true"/>
-            <jvmarg
-                value="-Dosgi.debug"/>
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <jvmarg
-                value="-Dprojectname=${projectname}"/>
-            <jvmarg
-                value="-D${xulRunnerParam}=${env.WTP_XULRUNNER}"/>
-            <arg
-                value="-nosplash"/>
-            <arg
-                value="-data"/>
-            <arg
-                value="${data-dir}"/>
-            <arg
-                value="-application"/>
-            <arg
-                value="${application}"/>
-            <arg
-                value="formatter=${formatter},${test-output}"/>
-            <arg
-                value="-testPluginName"/>
-            <arg
-                value="${plugin-name}"/>
-            <arg
-                value="-className"/>
-            <arg
-                value="${classname}"/>
-            <env
-                key="DISPLAY"
-                value="${env.DISPLAY}"/>
-            <redirector
-                output="${junit-report-output}/${classname}.output.txt"
-                error="${junit-report-output}/${classname}.error.txt"/>
-        </java>
-        <echo
-            level="info"
-            message="suitejunitresult: ${suitejunitresult}"/>
-        <antcall
-            target="summarizeFailure"/>
-        <antcall
-            target="collect-results"/>
-    </target>
-    <target
-        name="collect-results">
-        <dirname
-            property="output-dir"
-            file="${test-output}"/>
-        <basename
-            property="output-file-name"
-            file="${test-output}"/>
-        <mkdir
-            dir="${junit-report-output}/xml"/>
-        <junitreport
-            todir="${junit-report-output}/xml"
-            tofile="${classname}.xml">
-            <fileset
-                dir="${output-dir}">
-                <include
-                    name="${output-file-name}"/>
-            </fileset>
-        </junitreport>
-        <mkdir
-            dir="${junit-report-output}/html"/>
-        <xslt
-            style="${testRoot}/JUNIT.XSL"
-            basedir="${junit-report-output}"
-            includes="${classname}.xml"
-            destdir="${junit-report-output}/html"/>
-    </target>
-    <target
-        name="collect">
-        <!--
-            deprecated, each test.xml uses it, and we should remove,
-            eventually
-        -->
-        <echo
-            message="Deprecated. There is no need to call the collect task. It no longer does anything. Please remove from your test.xml file"/>
-    </target>
-    <target
-        name="summarizeFailure"
-        depends="checkFailure"
-        if="doFailure">
-        <echo
-            append="true"
-            file="${buildDirectory}/junitFailureList.log">${plugin-name}${line.separator}</echo>
-    </target>
-    <target
-        name="checkFailure">
-        <condition
-            property="doFailure">
-            <not>
-                <equals
-                    arg1="${suitejunitresult}"
-                    arg2="0"
-                    trim="true"/>
-            </not>
-        </condition>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches.tests/testdependency.xml b/releng.wtpbuilder/distribution/patches.tests/testdependency.xml
deleted file mode 100644
index 3996002..0000000
--- a/releng.wtpbuilder/distribution/patches.tests/testdependency.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-    <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <fail
-        message="Required property file does not exist: ${keyCfgFile}">
-        <condition>
-            <not>
-                <available
-                    file="${keyCfgFile}"/>
-            </not>
-        </condition>
-    </fail>
-    <property
-        file="${keyCfgFile}"/>
-    <target
-        name="get">
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined, which we do later with
-            statements such if="${groupId}.url"
-        -->
-        <property
-            file="${dependency.properties}"/>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipseTestFramework"/>
-        </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>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp-wst-test"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp-jst-test"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstall"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches2.build/build.xml b/releng.wtpbuilder/distribution/patches2.build/build.xml
deleted file mode 100644
index 08d5baf..0000000
--- a/releng.wtpbuilder/distribution/patches2.build/build.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<project
-    default="build"
-    basedir=".">
-
-    <target
-        name="build"
-        depends="getBaseBuilder">
-        <dirname
-            file="${ant.file}"
-            property="distribution.wtp.build.dir" />
-        <property file="${wtp.builder.home}/build.properties" />
-        <property
-            name="buildTargets"
-            value="${wtp.builder.home}/scripts/build/runbuild.xml" />
-
-        <ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
-        <ant antfile="${buildTargets}">
-            <property
-                name="component"
-                value="wtp-patches2" />
-        </ant>
-        <ant antfile="${buildTargets}">
-            <property
-                name="component"
-                value="wtp-patches2-tests" />
-        </ant>
-    </target>
-
-    <target
-        name="getBaseBuilder"
-        if="eclipse.builder.fetch">
-        <dirname
-            file="${ant.file}"
-            property="wtbuilder.dir" />
-        <property
-            name="buildTargets"
-            value="${wtp.builder.home}/scripts/build/runbuild.xml" />
-        <!-- delete dir="${pde.builder.path}" failonerror="false"/ -->
-        <ant
-            antfile="${buildTargets}"
-            target="getBaseBuilder" />
-    </target>
-
-</project>
diff --git a/releng.wtpbuilder/distribution/patches2.site/build.xml b/releng.wtpbuilder/distribution/patches2.site/build.xml
deleted file mode 100644
index 4d757f4..0000000
--- a/releng.wtpbuilder/distribution/patches2.site/build.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<project
-    name="Build specific targets and properties"
-    default="build"
-    basedir=".">
-
-    <!-- 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" />
-    <!-- 
-        Let users override standard properties, if desired.
-        If directory, file, or some properties do not exist,  
-        then standard properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties" />
-
-    <!-- = = = end standard properties pattern = = = -->
-
-    <echo message="ant.file: ${ant.file}" />
-    <target name="build">
-        <java
-            jar="${eclipse.launcher}"
-            fork="true"
-            failonerror="true">
-            <jvmarg value="-Dosgi.ws=${env.BASEWS}" />
-            <jvmarg value="-Dosgi.os=${env.BASEOS}" />
-            <jvmarg value="-Dosgi.arch=${env.BASEARCH}" />
-            <jvmarg value="-Dbuild.donottagmaps=${build.donottagmaps}" />
-            <jvmarg value="-DbuildBranch=${buildBranch}" />
-            <jvmarg value="-DbuildType=${buildType}" />
-
-          <jvmarg
-               value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol" />
-           <jvmarg
-               value="-DurlLogLocation=${buildDirectory}/outgoinghttplogfromsitebuild.log" />
-            <jvmarg
-                value="-Dprojectname=${projectname}" />
-        	  <jvmarg value="-DbuildId=${buildId}" />
-            <jvmarg value="-DmapVersionTag=${mapVersionTag}" />
-            <jvmarg value="-Dbuild.distribution=${build.distribution}" />
-            <jvmarg value="-DbuildDirectory=${buildDirectory}" />
-            <jvmarg value="-Dwtp.builder.home=${wtp.builder.home}" />
-            <jvmarg value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}" />
-        	  <arg value="-data" />
-            <arg value="${basedir}/workspace" />
-            <arg value="-application" />
-            <arg value="org.eclipse.ant.core.antRunner" />
-            <arg value="-buildfile" />
-            <arg value="${ant.file}" />
-            <arg value="publish" />
-        </java>
-    </target>
-
-    <!-- ===================================================================== -->
-    <!-- Steps to do to publish the build results -->
-    <!-- ===================================================================== -->
-    <target name="publish">
-        <dirname
-            file="${ant.file}"
-            property="component.dir" />
-        <ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
-        <property file="${buildDirectory}/label.properties" />
-
-        <property
-            name="publish.xml"
-            value="${component.dir}/publish.xml" />
-
-        <property
-            name="indexFileName"
-            value="index.php" />
-        <property
-            name="result"
-            value="${buildDirectory}/${buildLabel}" />
-        <property
-            name="indexTemplateFilename"
-            value="index.html.template.php" />
-
-        <copy
-            file="${wtp.builder.home}/distribution/wtp.site/templateFiles/${indexTemplateFilename}"
-            tofile="${buildDirectory}/${indexFileName}" />
-
-        <property
-            name="indexFileName"
-            value="index.php" />
-        <property
-            name="result"
-            value="${buildDirectory}/${buildLabel}" />
-        <property
-            name="indexTemplateFilename"
-            value="index.html.template.php" />
-
-        <copy
-            file="${wtp.builder.home}/distribution/patches.site/templateFiles/${indexTemplateFilename}"
-            tofile="${buildDirectory}/${indexFileName}" />
-
-
-        <condition
-            property="isBuildTested"
-            value="true">
-            <available
-                file="${buildDirectory}/${buildLabel}/testResults/html" />
-        </condition>
-
-        <ant
-            antfile="${publish.xml}"
-            dir="${component.dir}">
-            <property
-                name="dropTokenList"
-                value="%wtpruntime%,%wtpsdk%,%wtptest%,%wst%,%wst-sdk%,%wst-tests%,%jst-tests%,%wst-perf-tests%,%jst-perf-tests%,%jpt-runtime%,%jpt-sdk%,%jpt-tests%" />
-            <property
-                name="webtoolsDownloadURL"
-                value="http://www.eclipse.org/downloads/download.php?file=/webtools/committers/drops" />
-
-            <property
-                name="buildBranch"
-                value="${buildBranch}" />
-            <property
-                name="isBuildTested"
-                value="${isBuildTested}" />
-            <property
-                name="indexTemplateFilename"
-                value="${indexTemplateFilename}" />
-        </ant>
-
-        <!--  Get the build map over for the results to point to. -->
-        <copy
-            file="${buildDirectory}/directory.txt"
-            tofile="${result}/directory.txt" />
-
-        <!-- Copy info for build identification -->
-        <copy
-            file="${buildDirectory}/buildmachineinfo.properties"
-            tofile="${result}/buildmachineinfo.properties" />
-
-
-      <!-- http access logs -->
-      <copy todir="${result}/" failonerror="false">
-        <fileset dir="${buildDirectory}" includes="*.log" />
-      </copy>
-      
-      <!-- ant build log, from control directory -->
-      <copy todir="${result}/" failonerror="false">
-        <fileset dir="${env.ANT_WORKING}/${projectname}" includes="antBuilderOutput.log" />
-      </copy>
-
- 
-    	
-        <!-- final count files -->
-        <countBuildFiles
-            sourceDirectory="${buildDirectory}/${buildLabel}"
-            filterString=".zip,.tar.gz"
-            outputFile="${buildDirectory}/${buildLabel}/files.count" />
-
-    </target>
-
-
-</project>
diff --git a/releng.wtpbuilder/distribution/patches2.site/compilerXMLOutputToHTML.xsl b/releng.wtpbuilder/distribution/patches2.site/compilerXMLOutputToHTML.xsl
deleted file mode 100644
index 4f6809e..0000000
--- a/releng.wtpbuilder/distribution/patches2.site/compilerXMLOutputToHTML.xsl
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet
-    version="1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-    <xsl:output
-        method="html"
-        indent="yes" />
-
-    <xsl:template match="/">
-        <html>
-            <body>
-                <xsl:apply-templates select="compiler" />
-            </body>
-        </html>
-    </xsl:template>
-
-    <xsl:template match="compiler">
-        <h2>Compiler Report</h2>
-        <p>
-            Compiler:
-            <xsl:value-of select="@name" />
-            <xsl:text>   </xsl:text>
-            Version:
-            <xsl:value-of select="@version" />
-        </p>
-
-        <xsl:apply-templates select="stats" />
-
-        <xsl:apply-templates select="sources" />
-    </xsl:template>
-
-    <xsl:template
-        name="stats"
-        match="stats">
-
-        <p>
-            Number of source files:
-            <xsl:value-of select="count(..//source)" />
-            Number of classfiles:
-            <xsl:value-of select="number_of_classfiles/@value" />
-        </p>
-        <p>
-            Problems:
-            <xsl:value-of select="problem_summary/@problems" />
-            (Errors:
-            <xsl:value-of select="problem_summary/@errors" />
-            Warnings:
-            <xsl:value-of select="problem_summary/@warnings" />
-            )
-        </p>
-    </xsl:template>
-
-
-    <xsl:template
-        name="sources"
-        match="sources">
-
-        <xsl:if test="count(source) > 0">
-
-            <dl>
-                <xsl:for-each select="source">
-
-                    <xsl:variable
-                        name="package"
-                        select="normalize-space(@package)">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="path"
-                        select="normalize-space(@path)">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="classname"
-                        select="substring-after($path, $package)">
-                    </xsl:variable>
-                    <xsl:if test="count(problems) > 0">
-                        <dt style="font-weight: bold; color: black">
-                            Source File:
-                            <xsl:value-of select="$package" />
-                            <xsl:value-of select="$classname" />
-                        </dt>
-                        <xsl:apply-templates select="problems">
-                            <xsl:with-param name="classname">
-                                <xsl:value-of select="$classname" />
-                            </xsl:with-param>
-                        </xsl:apply-templates>
-                    </xsl:if>
-                </xsl:for-each>
-            </dl>
-
-        </xsl:if>
-
-    </xsl:template>
-
-    <xsl:template match="problems">
-        <xsl:param name="classname" />
-        <xsl:for-each select="problem">
-
-            <dd style="font-weight: normal; color: black">
-                <xsl:value-of select="position()" />
-                <xsl:text>.  </xsl:text>
-                <xsl:value-of select="@severity" />
-                <xsl:text>:  </xsl:text>
-                <xsl:value-of select="@id" />
-                <xsl:variable
-                    name="lineNumber"
-                    select="@line">
-                </xsl:variable>
-                <xsl:for-each select="message">
-                    <p
-                        style="margin-left: +.5in; font-size: -1; margin-top: 0;margin-bottom:0;">
-                        <small>
-                            <xsl:value-of select="@value" />
-                        </small>
-                    </p>
-                </xsl:for-each>
-                <xsl:for-each select="source_context">
-                    <xsl:variable
-                        name="pre"
-                        select="substring(@value,0,(@sourceStart + 1))">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="main"
-                        select="substring(@value,(@sourceStart + 1),(((@sourceEnd + 1) - (@sourceStart + 1)) + 1))">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="end"
-                        select="substring(@value,(@sourceEnd + 2))">
-                    </xsl:variable>
-
-                    <p
-                        style="margin-left: +.5in; font-size: -2; margin-top: 0;margin-bottom:0;">
-                        <xsl:value-of select="substring($classname,2)" />
-                        :
-                    </p>
-                    <p
-                        style="margin-left: +.5in; font-size: -2;font-family: monospace; margin-top: 0;margin-bottom:0;">
-                        <xsl:value-of select="$lineNumber" />
-                        :
-                        <xsl:value-of select="$pre" />
-                        <b>
-                            <u>
-                                <xsl:value-of select="$main" />
-                            </u>
-                        </b>
-                        <xsl:value-of select="$end" />
-                    </p>
-                </xsl:for-each>
-            </dd>
-        </xsl:for-each>
-
-
-    </xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches2.site/publish.xml b/releng.wtpbuilder/distribution/patches2.site/publish.xml
deleted file mode 100644
index f6abb0a..0000000
--- a/releng.wtpbuilder/distribution/patches2.site/publish.xml
+++ /dev/null
@@ -1,555 +0,0 @@
-<project
-    name="Publish Build"
-    default="default"
-    basedir=".">
-
-    <!-- Properties that must be passed to this script:
-        buildDirectory: Path to perform the build in.  (A working directory)
-        buildType:		Type of build (nightly, integration etc.)
-        buildId:		Build name
-        buildLabel:		<buildType>-<buildName>-<timestamp>
-    -->
-
-    <property environment="env" />
-
-    <property
-        name="resultDir"
-        value="${buildDirectory}/${buildLabel}" />
-    <!--name of generated index page-->
-    <property
-        name="indexFileName"
-        value="index.php" />
-
-    <property
-        name="templateDir"
-        value="${wtp.builder.home}/distribution/${build.distribution}.site" />
-    <property
-        name="resultingIndex"
-        value="${resultDir}/${indexFileName}" />
-
-    <echo
-        level="debug"
-        message="resultDir: ${resultDir}" />
-    <echo
-        level="debug"
-        message="templateDir: ${templateDir}" />
-    <echo
-        level="debug"
-        message="resultingIndex: ${resultingIndex}" />
-
-
-
-    <target name="default">
-        <copy
-            overwrite="true"
-            file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/${indexTemplateFilename}"
-            tofile="${resultingIndex}" />
-        <antcall target="countFiles" />
-        <antcall target="generateCompileIndex" />
-        <antcall target="generateJUnitTestsIndex" />
-        <antcall target="getStaticFiles" />
-    </target>
-
-    <target name="generateCompileIndex">
-
-
-        <!--
-            <taskdef name="indexResults" classname="org.eclipse.wtp.releng.tools.ResultsSummaryGenerator" />
-        -->
-
-        <!--
-            isBuildTested:  true|false  should JUnit plugin test results be used to generate index page
-            dropTokenList:  comma separated list of strings which should be replaced by the fileName attribute settings in the testManifest.xml.
-            xmlDirectoryName:  path to directory containing JUnit plugin test results in xml format (see doc is org.eclipse.test).
-            dropDirectoryName: path to directory containing the result of the build.
-            testResultsTemplateFileName:  path to template file used to generate page with links to JUnit test results	
-            testResultsHtmlFileName:  name of file which will be generated with links to JUnit test results
-            dropHtmlFileName:  name of generated index page
-            hrefTestResultsTargetPath:  relative path from index page to directory containing JUnit html test results
-            hrefCompileLogsTargetPath:  relative path from index page directory containing compilelogs
-            testManifestFileName:	name of xml file containing descriptions of zip types and log files
-            
-            
-            
-        -->
-    	<property
-    	            file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties" />
-
-        <!-- create tables of test plugin compiles first -->
-        <summarizeResults
-            isBuildTested="false"
-            includeAll="true"
-            dropTokenList="${dropTokenList}"
-            xmlDirectoryName=""
-            dropDirectoryName="${resultDir}"
-            testResultsTemplateFileName="${templateDir}/templateFiles/testCompileResults.php.template"
-            testResultsHtmlFileName="testCompileResults.php"
-            hrefTestResultsTargetPath=""
-            hrefCompileLogsTargetPath="testcompilelogs"
-            compileLogsDirectoryName="${resultDir}/testcompilelogs" />
-
-        <xslt
-            basedir="${resultDir}/testcompilelogs"
-            destdir="${resultDir}/testcompilelogs"
-            includes="**/*.bin.xml"
-            scanincludeddirectories="true"
-            style="compilerXMLOutputToHTML.xsl"
-            force="true" />
-
-        <!-- create table of code plugins compiles -->
-        <summarizeResults
-            isBuildTested="false"
-            includeAll="true"
-            dropTokenList="${dropTokenList}"
-            xmlDirectoryName=""
-            dropDirectoryName="${resultDir}"
-            testResultsTemplateFileName="${templateDir}/templateFiles/compileResults.php.template"
-            testResultsHtmlFileName="compileResults.php"
-            hrefTestResultsTargetPath="testResults/html"
-            hrefCompileLogsTargetPath="compilelogs"
-            compileLogsDirectoryName="${resultDir}/compilelogs" />
-
-
-        <xslt
-            basedir="${resultDir}/compilelogs"
-            destdir="${resultDir}/compilelogs"
-            includes="**/*.bin.xml"
-            scanincludeddirectories="true"
-            style="compilerXMLOutputToHTML.xsl"
-            force="true" />
-
-        <tstamp>
-            <format
-                property="TODAY"
-                pattern="MMMM d, yyyy" />
-        </tstamp>
-
-        <!--  Insert Build Type descriptor  -->
-        <antcall target="${buildType}" />
-
-        <antcall target="writeData" />
-
-        <!--  Update timestamp on file to permit overwrite through Ant copy task  -->
-        <touch file="${resultingIndex}" />
-    </target>
-
-    <target
-        name="generateJUnitTestsIndex"
-        depends="checkIfTested"
-        if="doTests">
-
-        <!--
-            isBuildTested:  true|false  should JUnit plugin test results be used to generate index page
-            dropTokenList:  comma separated list of strings which should be replaced by the fileName attribute settings in the testManifest.xml.
-            xmlDirectoryName:  path to directory containing JUnit plugin test results in xml format (see doc is org.eclipse.test).
-            dropDirectoryName: path to directory containing the result of the build.
-            testResultsTemplateFileName:  path to template file used to generate page with links to JUnit test results	
-            testResultsHtmlFileName:  name of file which will be generated with links to JUnit test results
-            dropHtmlFileName:  name of generated index page
-            hrefTestResultsTargetPath:  relative path from index page to directory containing JUnit html test results
-            hrefCompileLogsTargetPath:  relative path from index page directory containing compilelogs
-            testManifestFileName:	name of xml file containing descriptions of zip types and log files
-            
-            
-            
-        -->
-        <property
-            file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties" />
-
-        <!-- create table of test plugin compiles first -->
-        <!-- set isBuildTested to true for the "compile only" results -->
-
-        <summarizeResults
-            isBuildTested="true"
-            dropTokenList="${dropTokenList}"
-            dropDirectoryName="${resultDir}"
-            xmlDirectoryName="${resultDir}/testResults/xml"
-            testResultsTemplateFileName="${templateDir}/templateFiles/testResults.php.template"
-            testResultsHtmlFileName="testResults.php"
-            hrefTestResultsTargetPath="testResults/html"
-            compileLogsDirectoryName="" />
-
-
-        <tstamp>
-            <format
-                property="TODAY"
-                pattern="MMMM d, yyyy" />
-        </tstamp>
-
-        <!--  Insert Build Type descriptor  -->
-        <antcall target="${buildType}" />
-
-        <antcall target="writeData" />
-
-        <!--  Update timestamp on file to permit overwrite through Ant copy task  -->
-        <touch file="${resultingIndex}" />
-    </target>
-
-
-    <target name="getStaticFiles">
-        <!--get static files required in the buildLabel directory-->
-        <copy todir="${resultDir}">
-            <fileset dir="${templateDir}/staticDropFiles" />
-        </copy>
-
-        <!--copy buildnotes from plugin directories-->
-        <mkdir dir="${resultDir}/buildnotes" />
-        <copy
-            todir="${resultDir}/buildnotes"
-            flatten="true">
-            <fileset
-                dir="${buildDirectory}/plugins"
-                includes="**/buildnotes_*.html" />
-            <fileset
-                dir="${buildDirectory}/features"
-                includes="**/buildnotes_*.html" />
-        </copy>
-
-
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/full/logIndex.php" />
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/testLogs/logIndex.php" />
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/testSysErrorLogs/logIndex.php" />
-
-
-    </target>
-
-    <target name="updateSite">
-
-
-        <!-- get our authored, tokenized site.xml file -->
-        <copy
-            file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/siteWTP.xml"
-            tofile="${buildDirectory}/${buildLabel}/updateSite/site.xml"
-            overwrite="true"
-            failonerror="true" />
-        <!-- get the ${buildDirectory}/finalPluginsVersions.properties, and 
-            read as properties -->
-        <!-- substitute property value for tokens -->
-        <replace
-            file="${buildDirectory}/${buildLabel}/updateSite/site.xml"
-            propertyfile="${buildDirectory}/finalFeaturesVersions.properties">
-            <replacefilter
-                token="@org.eclipse.wst@"
-                property="org.eclipse.wst" />
-            <replacefilter
-                token="@org.eclipse.wst.sdk@"
-                property="org.eclipse.wst.sdk" />
-            <replacefilter
-                token="@org.eclipse.jst@"
-                property="org.eclipse.jst" />
-            <replacefilter
-                token="@org.eclipse.jst.sdk@"
-                property="org.eclipse.jst.sdk" />
-
-            <replacefilter
-                token="@org.eclipse.jpt.feature@"
-                property="org.eclipse.jpt.feature" />
-            <replacefilter
-                token="@org.eclipse.jpt_sdk.feature@"
-                property="org.eclipse.jpt_sdk.feature" />
-        </replace>
-
-    </target>
-
-    <target name="countFiles">
-        <!--	
-            files.count is a file that should exist in the drop directory with a count of the zip files in the same directory.
-            It is required to generate a link to the build on the downloads page.
-        -->
-
-        <countBuildFiles
-            sourceDirectory="${resultDir}"
-            filterString=".zip,.tar.gz"
-            outputFile="${resultDir}/files.count" />
-
-    </target>
-
-    <!--Build type descriptors-->
-    <target name="I">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" " />
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Integration" />
-    </target>
-
-    <target name="S">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" " />
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Stable" />
-    </target>
-
-    <target name="N">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" " />
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Nightly" />
-    </target>
-
-    <target name="M">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" " />
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Maintenance" />
-    </target>
-
-    <target name="R">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" " />
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Release" />
-    </target>
-
-
-    <target name="T">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" " />
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Test" />
-    </target>
-
-    <target name="P">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" " />
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Patches" />
-    </target>
-
-    <target name="checkIfTested">
-        <echo
-            level="debug"
-            message="isBuildTested: ${isBuildTested}" />
-        <condition property="doTests">
-            <equals
-                arg1="${isBuildTested}"
-                arg2="true"
-                trim="true"
-                casesensitive="false" />
-        </condition>
-    </target>
-
-
-    <target name="writeData">
-        <!--  Insert Build Date  -->
-        <replace
-            file="${resultingIndex}"
-            token="@date@"
-            value="${TODAY}" />
-
-        <!--  Insert Build Name  -->
-        <replace
-            file="${resultingIndex}"
-            token="@build@"
-            value="${buildLabel}" />
-
-        <replace
-            file="${resultingIndex}"
-            token="@buildBranch@"
-            value="${buildBranch}" />
-
-        <!--  Insert PreRequsites  -->
-
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseFile@"
-            value="${eclipse.file.linux-gtk-x86}" />
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseURL@"
-            value="${eclipse.url}/${eclipse.file.linux-gtk-x86}" />
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseBuildURL@"
-            value="${eclipse.url}" />
-
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilelinux@"
-            value="${eclipse.file.linux-gtk-x86}" />
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilewindows@"
-            value="${eclipse.file.win32-win32-x86}" />
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilemacos@"
-            value="${eclipse.file.macosx-carbon-ppc}" />
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseBuildHome@"
-            value="${eclipse.build.home}" />
-        <replace
-            file="${resultingIndex}"
-            token="@eclipse.mirror.prefixuri@"
-            value="${eclipse.mirror.prefixuri}" />
-
-        <replace
-            file="${resultingIndex}"
-          token="@eclipse.fspath.prefix@"
-          value="${eclipse.fspath.prefix}" />
-    	
-        <replace
-            file="${resultingIndex}"
-            token="@testURL@"
-            value="${eclipseTestFramework.url}/${eclipseTestFramework.file}" />
-        <replace
-            file="${resultingIndex}"
-            token="@testFile@"
-            value="${eclipseTestFramework.file}" />
-
-        <replace
-            file="${resultingIndex}"
-            token="@emfFile@"
-            value="${emf.file}" />
-        <replace
-            file="${resultingIndex}"
-            token="@emfURL@"
-            value="${emf.url}/${emf.file}" />
-        <replace
-            file="${resultingIndex}"
-            token="@emfBuildHome@"
-            value="${emf.build.home}" />
-        <replace
-            file="${resultingIndex}"
-            token="@emf.mirror.prefixuri@"
-            value="${emf.mirror.prefixuri}" />
-
-      <replace
-          file="${resultingIndex}"
-          token="@wstFile@"
-          value="${wst.file}" />
-      <replace
-          file="${resultingIndex}"
-          token="@wstURL@"
-          value="${wst.url}/${wst.file}" />
-      <replace
-          file="${resultingIndex}"
-          token="@wstBuildHome@"
-          value="${wst.build.home}" />
-      <replace
-          file="${resultingIndex}"
-          token="@wst.mirror.prefixuri@"
-          value="${wst.mirror.prefixuri}" />
-
-
-        <replace
-            file="${resultingIndex}"
-            token="@gefFile@"
-            value="${gef.file}" />
-        <replace
-            file="${resultingIndex}"
-            token="@gefURL@"
-            value="${gef.url}/${gef.file}" />
-        <replace
-            file="${resultingIndex}"
-            token="@gefBuildHome@"
-            value="${gef.build.home}" />
-        <replace
-            file="${resultingIndex}"
-            token="@gef.mirror.prefixuri@"
-            value="${gef.mirror.prefixuri}" />
-
-        <replace
-            file="${resultingIndex}"
-            token="@eclipserelengFile@"
-            value="${eclipsereleng.file}" />
-        <replace
-            file="${resultingIndex}"
-            token="@eclipserelengURL@"
-            value="${eclipsereleng.url}/${eclipsereleng.file}" />
-
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipFile@"
-            value="${orbitthirdpartyzip.file}" />
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipURL@"
-            value="${orbitthirdpartyzip.url}/${orbitthirdpartyzip.file}" />
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipBuildHome@"
-            value="${orbitthirdpartyzip.build.home}" />
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzip.mirror.prefixuri@"
-            value="${orbitthirdpartyzip.mirror.prefixuri}" />
-
-
-        <!-- no longer used. Post 1.5.5 -->
-        <replace
-            file="${resultingIndex}"
-            token="@jemFile@"
-            value="${jem.file}" />
-        <replace
-            file="${resultingIndex}"
-            token="@jemURL@"
-            value="${jem.url}/${jem.file}" />
-        <replace
-            file="${resultingIndex}"
-            token="@jemBuildHome@"
-            value="${jem.build.home}" />
-        <replace
-            file="${resultingIndex}"
-            token="@jem.mirror.prefixuri@"
-            value="${jem.mirror.prefixuri}" />
-        <!-- 
-            these token/s should not exist in maintenance stream, but 
-            do no harm done, so in the interests of keeping builder 
-            streams in sync, we'll leave them here as place hold
-        -->
-        <replace
-            file="${resultingIndex}"
-            token="@dtpFile@"
-            value="${dtp.file}" />
-        <replace
-            file="${resultingIndex}"
-            token="@dtpURL@"
-            value="${dtp.url}/${dtp.file}" />
-        <replace
-            file="${resultingIndex}"
-            token="@dtpBuildHome@"
-            value="${dtp.build.home}" />
-        <replace
-            file="${resultingIndex}"
-            token="@dtp.mirror.prefixuri@"
-            value="${dtp.mirror.prefixuri}" />
-
-    </target>
-
-
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches2.site/staticDropFiles/access_err.gif b/releng.wtpbuilder/distribution/patches2.site/staticDropFiles/access_err.gif
deleted file mode 100644
index 4f0748a..0000000
--- a/releng.wtpbuilder/distribution/patches2.site/staticDropFiles/access_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/patches2.site/staticDropFiles/access_warn.gif b/releng.wtpbuilder/distribution/patches2.site/staticDropFiles/access_warn.gif
deleted file mode 100644
index 8386e3e..0000000
--- a/releng.wtpbuilder/distribution/patches2.site/staticDropFiles/access_warn.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/patches2.site/staticDropFiles/buildNotes.php b/releng.wtpbuilder/distribution/patches2.site/staticDropFiles/buildNotes.php
deleted file mode 100644
index e843ecf..0000000
--- a/releng.wtpbuilder/distribution/patches2.site/staticDropFiles/buildNotes.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<html>
-<head>
-<?php
-$parts = explode("/", getcwd());
-$parts2 = explode("-", $parts[count($parts) - 1]);
-$buildName = $parts2[1];
-
-echo "<title>Build Notes for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Build Notes</font></b></p>
-
-<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"> Build Notes for <?php echo "$buildName"; ?></font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$hasNotes = false;
-$aDirectory = dir("buildnotes");
-while ($anEntry = $aDirectory->read()) {
-    if ($anEntry != "." && $anEntry != "..") {
-        //print_r($anEntry);
-        //echo "<br />";
-
-        $subject = $anEntry;
-        $pattern = '/^buildnotes_(.*)/i';
-        preg_match($pattern, $subject, $matches);
-        $subject = $matches[1];
-        //print_r($subject);
-        //echo "<br />";
-        $pattern = '/^(.*)\.html$/';
-        preg_match($pattern, $subject, $matches);
-        //print_r($matches);
-        //echo "<br />";
-
-        $component = $matches[1];
-
-        $line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
-        echo "<tr>";
-        echo "$line";
-        echo "</tr>";
-        $hasNotes = true;
-
-    }
-}
-$aDirectory.closedir();
-if (!$hasNotes) {
-    echo "<br>There are no build notes for this build.";
-}
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/patches2.site/staticDropFiles/compile_err.gif b/releng.wtpbuilder/distribution/patches2.site/staticDropFiles/compile_err.gif
deleted file mode 100644
index c2bfdd6..0000000
--- a/releng.wtpbuilder/distribution/patches2.site/staticDropFiles/compile_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/patches2.site/staticDropFiles/compile_warn.gif b/releng.wtpbuilder/distribution/patches2.site/staticDropFiles/compile_warn.gif
deleted file mode 100644
index cf4fdf9..0000000
--- a/releng.wtpbuilder/distribution/patches2.site/staticDropFiles/compile_warn.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/patches2.site/staticDropFiles/consoleLogs.php b/releng.wtpbuilder/distribution/patches2.site/staticDropFiles/consoleLogs.php
deleted file mode 100644
index 7dd5f42..0000000
--- a/releng.wtpbuilder/distribution/patches2.site/staticDropFiles/consoleLogs.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<html>
-<head>
-<?php
-$parts = explode("/", getcwd());
-$parts2 = explode("-", $parts[count($parts) - 1]);
-$buildName = $parts2[1];
-
-echo "<title>Test Console Output for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-<title>Console Logs from Running JUnit Plug-in Tests</title>
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b></p>
-
-<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">Console output from running
-		JUnit plugin tests for <?php echo "$buildName"; ?> </font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$rootDir = "testResults/consolelogs";
-$hasNotes = false;
-$aDirectory = dir($rootDir);
-$index = 0;
-$dirindex = 0;
-while ($anEntry = $aDirectory->read()) {
-    if ($anEntry != "." && $anEntry != "..") {
-        if (is_file("$rootDir/$anEntry")) {
-            $entries[$index] = $anEntry;
-            $index++;
-        } else if (is_dir("$rootDir/$anEntry")) {
-            $direntries[$dirindex] = $anEntry;
-            $dirindex++;
-        }
-    }
-}
-$aDirectory->close();
-
-
-sort($entries);
-sort($direntries);
-
-for ($i = 0; $i < $dirindex; $i++) {
-    $anEntry = $direntries[$i];
-    $line = "<td><a href=\"testResults/consolelogs/$anEntry/logIndex.php\">$anEntry</a></td>";
-    echo "<tr>";
-    echo "$line";
-    echo "</tr>";
-}
-for ($i = 0; $i < $index; $i++) {
-    $anEntry = $entries[$i];
-    $logsize = filesize("testResults/consolelogs/$anEntry");
-
-
-    $level = 0;
-    if ($logsize > 20000) {
-        $level = 2;
-    }
-    else if ($logsize > 2000) {
-        $level = 1;
-    }
-
-    if ($level == 0) {
-        $line = "<td><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-    }
-    else if ($level == 1) {
-        $line = "<td><em><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-    } else if ($level == 2) {
-        $line = "<td><strong><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-    }
-
-
-    echo "<tr>";
-    echo "$line";
-    echo "</tr>";
-    $hasNotes = true;
-}
-
-if (!$hasNotes) {
-    echo "<br>There are no test logs for this build.";
-}
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/patches2.site/staticDropFiles/junit_err.gif b/releng.wtpbuilder/distribution/patches2.site/staticDropFiles/junit_err.gif
deleted file mode 100644
index 1b7ff9d..0000000
--- a/releng.wtpbuilder/distribution/patches2.site/staticDropFiles/junit_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/patches2.site/staticDropFiles/logIndex.php b/releng.wtpbuilder/distribution/patches2.site/staticDropFiles/logIndex.php
deleted file mode 100644
index 0b36334..0000000
--- a/releng.wtpbuilder/distribution/patches2.site/staticDropFiles/logIndex.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<html>
-<head>
-<?php
-
-function endsWith( $str, $sub ) {
-
-   return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub );
-}
-
-        $parts = explode("/", getcwd());
-        $parts2 = explode("-", $parts[count($parts) - 1]);
-        $buildName = $parts2[1];
-
-        echo "<title>Test Console Output for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" type="text/css">
-<title>Console Logs from Running JUnit Plug-in Tests</title></head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b> </p>
-
-<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">Console
-      output from running JUnit plugin tests for
-      <?php echo "$buildName"; ?>
-      </font></b></td>
-  </tr>
-</table>
-<table border="0">
-
-<?php
-        $hasNotes = false;
-        $aDirectory = dir(".");
-        $index = 0;
-        while ($anEntry = $aDirectory->read()) {
-                if ($anEntry != "." && $anEntry != ".." && !endsWith(__FILE__, $anEntry)) {
-                        $entries[$index] = $anEntry;
-                        $index++;
-                }
-        }
-        aDirectory.closedir();
-
-
-        sort($entries);
-
-        for ($i = 0; $i < $index; $i++) {
-                $anEntry = $entries[$i];
-                $logsize = filesize("$anEntry");
-
-
-                $level = 0;
-                if ($logsize > 20000) {
-                        $level = 2;
-                }
-                else if ($logsize > 2000) {
-                        $level = 1;
-                }
-
-                if ($level == 0) {
-                        $line = "<td><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-                }
-                else if ($level == 1) {
-                        $line = "<td><em><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-                } else if ($level == 2) {
-                        $line = "<td><strong><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-                }
-
-
-                echo "<tr>";
-                echo "$line";
-                echo "</tr>";
-                $hasNotes = true;
-        }
-
-        if (!$hasNotes) {
-                echo "<br>There are no test logs for this build.";
-        }
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/patches2.site/staticDropFiles/miscUtil.php b/releng.wtpbuilder/distribution/patches2.site/staticDropFiles/miscUtil.php
deleted file mode 100644
index 91bbb8f..0000000
--- a/releng.wtpbuilder/distribution/patches2.site/staticDropFiles/miscUtil.php
+++ /dev/null
@@ -1,218 +0,0 @@
-<?php
-
-// todo: unsure if can handle filenames that are URLs?
-// handy constant to compute file size in megabytes
-
-function fileSizeInMegs($filename) {
-	$onemeg=1024*1024;
-	$zipfilesize=filesize($filename);
-	$zipfilesize=round($zipfilesize/$onemeg, 0);
-	return $zipfilesize;
-}
-
-function fileSizeForDisplay($filename) {
-	$onekilo=1024;
-	$onemeg=$onekilo * $onekilo;
-	$criteria = 10 * $onemeg;
-	$scaleChar = "M";
-	$zipfilesize=filesize($filename);
-	if ($zipfilesize > $criteria) {
-		$zipfilesize=round($zipfilesize/$onemeg, 0);
-		$scaleChar = "M";
-	}
-	else {
-		$zipfilesize=round($zipfilesize/$onekilo, 0);
-		$scaleChar = "K";
-	}
-	$result =  "(" . $zipfilesize . $scaleChar . ")";
-	return $result;
-}
-
-
-function displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription) {
-	echo "<td align=\"right\" valign=\"top\" width=\"10%\">";
-	echo "<a href=\"$downloadprefix$filename\">" . $fileShortDescription . "</a>";
-	echo "</td><td align=\"right\" valign=\"top\" width=\"5%\">";
-	echo $zipfilesize;
-	echo "</td>";
-	echo "<td align=\"right\" valign=\"top\" width=\"5%\">";
-	echo "[<a href=\"checksum/$filename.md5\">md5</a>]";
-	echo "</td>";
-}
-
-function resourceExist($url, $mirrorPrefixuri, $prereqfilename, $eclipseFSpathPrefix)
-{
-	$result = false;
-
-	$allowURLopen = ini_get('allow_url_fopen');
-
-	if ($allowURLopen && stream_last_modified($url)) {
-		$result = true;
-	}
-	else {
-		// TODO: for now, we'll do a raw check on the whole file name, since enable_url_open
-		// is off. better would be to check if we are on build.eclipse.org or download.eclipse.org?
-    $wholePath = trim($eclipseFSpathPrefix) . "/" . trim($mirrorPrefixuri) . "/" . trim($prereqfilename);
-    if (file_exists($wholePath)) {
-    	$result = true;
-    } else {
-    	$wholePath = "/home/data/httpd/archive.eclipse.org/" . trim($mirrorPrefixuri) . "/" . trim($prereqfilename);
-    	if (file_exists($wholePath)) {
-    		$result = true;
-    	}
-    }
-	}
-	return $result;
-}
-
-function stream_last_modified($url)
-{
-	if (function_exists('version_compare') && version_compare(phpversion(), '4.3.0') > 0)
-	{
-		if (!($fp = @fopen($url, 'r')))
-		return NULL;
-
-		$meta = stream_get_meta_data($fp);
-		for ($j = 0; isset($meta['wrapper_data'][$j]); $j++)
-		{
-			if (strstr(strtolower($meta['wrapper_data'][$j]), 'last-modified'))
-			{
-				$modtime = substr($meta['wrapper_data'][$j], 15);
-				break;
-			}
-		}
-		fclose($fp);
-	}
-	else
-	{
-		$parts = parse_url($url);
-		$host  = $parts['host'];
-		$path  = $parts['path'];
-
-		if (!($fp = @fsockopen($host, 80)))
-		return NULL;
-
-		$req = "HEAD $path HTTP/1.0\r\nUser-Agent: PHP/".phpversion()."\r\nHost: $host:80\r\nAccept: */*\r\n\r\n";
-		fputs($fp, $req);
-
-		while (!feof($fp))
-		{
-			$str = fgets($fp, 4096);
-			if (strstr(strtolower($str), 'last-modified'))
-			{
-				$modtime = substr($str, 15);
-				break;
-			}
-		}
-		fclose($fp);
-	}
-	return isset($modtime) ? strtotime($modtime) : time();
-}
-
-function isMirrored($uriToCheck) {
-	global $debugScript;
-	global $debugFunctions;
-	$localuri = $uriToCheck;
-
-	$debugMirrorList = false;
-	if ($debugScript) {
-		echo "uriToCheck: " . $localuri . "<br />";
-	}
-
-	$xmlcount = 0;
-
-	/* This method true and accurate method of parsing mirror results
-	 * may be expensive, and would
-	 * likely cause artificially high counts of "downloads".
-	 * Could maybe use if somehow only checked once ever 5 minutes or something.
-
-
-	// turn off warnings, as sometimes HTML is returned, which causes lots of warnings
-	$holdLevel = error_reporting(E_ERROR);
-	$mirrorsxml=simplexml_load_file(rawurlencode($localuri) . urlencode("&format=xml"));
-	error_reporting($holdLevel);
-
-
-	if ($mirrorsxml) {
-		if ($debugFunctions) {
-			echo "root node: " . $mirrorsxml->getName() . "<br />";
-		}
-		if (strcmp($mirrorsxml->getName(), "mirrors") == 0) {
-			foreach ($mirrorsxml->children() as $mirror) {
-				if (strcmp($mirror->getName(),"mirror") == 0) {
-					$xmlcount=$xmlcount+1;
-				}
-				if ($debugMirrorList) {
-					print_r($mirror);
-					echo "<br />";
-				}
-			}
-		}
-		if ($debugFunctions) {
-			echo "Mirror count: " . $xmlcount . "<br />";
-		}
-	}
-	 */
-	/*
-	 * Use simple heuristic based on pattern
-	 * in the URI ... if it contains "/downloads/" then assume it's mirrored
-	 */
-	if (strpos($uriToCheck, "webtools/downloads/") > 0) {
-		$xmlcount = 1;
-	}
-	return ($xmlcount > 0);
-
-}
-
-// TODO: replace with Phoenix variables
-function getPlatform () {
-	global $debugScript;
-	global $debugFunctions;
-	// getBrowser is expensive, so cache the data
-	static $browser;
-	$platform = "unknown";
-
-
-	if(ini_get("browscap")) {
-		if(!isset($browser)){
-			$browser = get_browser(null, true);
-		}
-
-		if ($browser) {
-			$rawPlatform = $browser['platform'];
-			if ($debugFunctions) {
-				echo "browser platfrom: " . $rawPlatform . "<br />" ;
-			}
-
-			if ($debugFunctions) {
-				$browserKeys = array_keys($browser);
-				foreach ($browserKeys as $key) {
-					echo $key . ": " . $browser[$key] . "<br />";
-				}
-			}
-		}
-		if (strpos($rawPlatform, "Win") === 0) {
-			$platform="windows";
-		} else if (strpos($rawPlatform, "Linux") === 0) {
-			$platform="linux";
-		} else if (strpos($rawPlatform, "Mac") === 0) {
-			$platform="mac";
-		}
-	}
-	return $platform;
-}
-
-function getPrereqReferenceOrName($eclipseMirrorScript, $mirrorPrefixuri, $prerequrl, $prereqfilename, $eclipseFSpathPrefix) {
-	// todo: we really only need "if exists" so could make a bit more efficient
-	// I tried "file_exists" but is didn't seem to work on my test server
-	// For these pre-reqs, we assume if they exist, they are mirrored. This is true
-	// 99% of the time.
-  
-	if (resourceExist($prerequrl, $mirrorPrefixuri, $prereqfilename, $eclipseFSpathPrefix)) {
-		$reflink="<a href=\"" . $eclipseMirrorScript . $mirrorPrefixuri . "/" . $prereqfilename . "\">" . $prereqfilename . "</a>";
-	} else {
-		$reflink=$prereqfilename;
-	}
-	return $reflink;
-}
-?>
diff --git a/releng.wtpbuilder/distribution/patches2.site/staticDropFiles/pending.gif b/releng.wtpbuilder/distribution/patches2.site/staticDropFiles/pending.gif
deleted file mode 100644
index 66db2a6..0000000
--- a/releng.wtpbuilder/distribution/patches2.site/staticDropFiles/pending.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/patches2.site/staticDropFiles/pending1.gif b/releng.wtpbuilder/distribution/patches2.site/staticDropFiles/pending1.gif
deleted file mode 100644
index 1b2ea6e..0000000
--- a/releng.wtpbuilder/distribution/patches2.site/staticDropFiles/pending1.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/patches2.site/staticDropFiles/report2.php b/releng.wtpbuilder/distribution/patches2.site/staticDropFiles/report2.php
deleted file mode 100644
index 52d2284..0000000
--- a/releng.wtpbuilder/distribution/patches2.site/staticDropFiles/report2.php
+++ /dev/null
@@ -1,45 +0,0 @@
-
-        <?php
-
-function parse_testResults($filename)
-{
-        $junitFailures = 0;
-        if (is_file($filename)) {
-                $handle = @fopen($filename, "r");
-                if ($handle)
-                {
-                        $size = filesize($filename);
-                        $content = fread($handle, $size);
-                        fclose($handle);
-                        $junitStart = strpos($content, "Errors &amp; Failures");
-                        $junitEnd = strpos($content, "</table>", $junitStart);
-                        $junitInfo = substr($content, $junitStart, $junitEnd - $junitStart);
-                        $start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">");
-                        while ($start !== false)
-                        {
-                                $start += 29;
-                                $stop = strpos($junitInfo, "</font></b></td>", $start);
-                                if ($stop !== false)
-                                {
-                                        $result = substr($junitInfo, $start, $stop - $start);
-                                        if (is_numeric($result))
-                                        {
-                                                $junitFailures += $result;
-                                        }
-                                        else if (strcmp($result, "DNF") == 0)
-                                        {
-                                                $junitFailures++;
-                                        }
-                                }
-                                $start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">", $stop);
-                        }
-                        $results = array($junitFailures);
-                        return $results;
-                }
-        }
-}
-
-
-?>
-
-
diff --git a/releng.wtpbuilder/distribution/patches2.site/templateFiles/compileResults.php.template b/releng.wtpbuilder/distribution/patches2.site/templateFiles/compileResults.php.template
deleted file mode 100644
index f785771..0000000
--- a/releng.wtpbuilder/distribution/patches2.site/templateFiles/compileResults.php.template
+++ /dev/null
@@ -1,76 +0,0 @@
-<html>
-<head>
-
-<?php
-        $parts = explode("/", getcwd());
-        $parts2 = explode("-", $parts[count($parts) - 1]);
-        $buildName = $parts2[1];
-
-        echo "<title>Compile Logs: Code Bundles for $buildName</title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2%;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-}
-</style>
-</head>
-<body>
-
-<?php
-        echo "<h1>Compile Logs: Code Bundles for $buildName</h1>";
-?>
-
-
-<table id=tabledata align = "center" width="75%" border="1">
-  <tr>
-    <td class="bold" align="center">Compile Logs</td>
-    <td class="bold" align="center">Compile Errors</td>
-    <td class="bold" align="center">Compiler Warnings</td>
-    <td class="bold" align="center">Access Violations</td>
-    <td class="bold" align="center">Access Warnings</td>
-  </tr>
-
-  %compilelogs%
-
-</table>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/patches2.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/patches2.site/templateFiles/index.html.template.php
deleted file mode 100644
index ffd4feb..0000000
--- a/releng.wtpbuilder/distribution/patches2.site/templateFiles/index.html.template.php
+++ /dev/null
@@ -1,456 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<title>WTP Downloads</title>
-
-
-<?php
-
-$buildBranch="@buildBranch@";
-$build="@build@";
-$type="@type@";
-$builddate="@date@";
-
-$eclipseMirrorPrefixuri="@eclipse.mirror.prefixuri@";
-$eclipseFSpathPrefix="@eclipse.fspath.prefix@";
-
-$eclipsefilelinux="@eclipsefilelinux@";
-$eclipsefilewindows="@eclipsefilewindows@";
-$eclipsefilemacosx="@eclipsefilemacos@";
-
-$eclipseURL="@eclipseURL@";
-$eclipseFile="@eclipseFile@";
-$eclipseBuildURL="@eclipseBuildURL@";
-$eclipseBuildHome="@eclipseBuildHome@";
-$testURL="@testURL@";
-$testFile="@testFile@";
-
-$wstURL="@wstURL@";
-$wstFile="@wstFile@";
-$wstMirrorPrefixuri="@wst.mirror.prefixuri@";
-$wstBuildHome="@wstBuildHome@";
-
-
-$gefURL="@gefURL@";
-$gefFile="@gefFile@";
-$gefMirrorPrefixuri="@gef.mirror.prefixuri@";
-$gefBuildHome="@gefBuildHome@";
-
-$emfURL="@emfURL@";
-$emfFile="@emfFile@";
-$emfMirrorPrefixuri="@emf.mirror.prefixuri@";
-$emfBuildHome="@emfBuildHome@";
-
-$dtpURL="@dtpURL@";
-$dtpFile="@dtpFile@";
-$dtpMirrorPrefixuri="@dtp.mirror.prefixuri@";
-$dtpBuildHome="@dtpBuildHome@";
-
-
-$eclipserelengFile="@eclipserelengFile@";
-$eclipserelengURL="@eclipserelengURL@";
-$orbitthirdpartyzipFile="@orbitthirdpartyzipFile@";
-$orbitthirdpartyzipURL="@orbitthirdpartyzipURL@";
-$orbitthirdpartyzipBuildHome="@orbitthirdpartyzipBuildHome@";
-$orbitthirdpartyzipMirrorPrefixuri="@orbitthirdpartyzip.mirror.prefixuri@";
-
-
-
-
-include("miscUtil.php");
-
-
-
-//ini_set("display_errors", "true");
-//error_reporting (E_ALL);
-
-
-$debugScript = false;
-$debugFunctions = false;
-
-$defaultMirrorScript="";
-$defaultWTPMirrorPrefix="./";
-
-$eclipseMirrorScript="http://www.eclipse.org/downloads/download.php?file=";
-
-// TODO: improve so this hard coding isn't required.
-// This depends on the declare script changing webtools/committers to webtools/downloads
-// And, the logic is such that if it is not mirrored, this URI is not used at all, just
-// a relative reference only
-$eclipseWTPMirrorPrefix="/webtools/committers/drops/$buildBranch/$build/";
-
-
-$mirrorScript=$defaultMirrorScript;
-$downloadprefix=$defaultWTPMirrorPrefix;
-
-
-$keytestMirrorString=$eclipseMirrorScript . "$eclipseWTPMirrorPrefix/wtp-sdk-$build.zip";
-if (isMirrored($keytestMirrorString) ) {
-	$mirrorScript=$eclipseMirrorScript;
-	$downloadprefix="${mirrorScript}${eclipseWTPMirrorPrefix}";
-}
-
-if ($debugScript)  {
-	echo "inferred platform: " . getPlatform();
-}
-
-
-// our summary results handling requires php 5 (for simple xml file loading)
-// so, if not php 5, just don't display any summary results
-// This was found to be required, since some mirror our whole site (e.g. IBM)
-// and not all mirrors use PHP 5
-$displayTestSummary=false;
-if (phpversion() >= 5) {
-
-	$displayTestSummary=true;
-	// expecting grandTotalErrors and grandTotalTests
-	$filename = "unitTestsSummary.xml";
-	if (file_exists($filename)) {
-		$prefix = "unitTests_";
-		$unitTestsSummary = simplexml_load_file($filename);
-		foreach ($unitTestsSummary->summaryItem as $summaryItem) {
-			$name = $summaryItem->name;
-			$value = $summaryItem->value;
-			$code= "\$" . $prefix . $name . " = " . $value . ";";
-			//echo "<br />code: " . $code;
-			eval($code);
-		}
-	}
-
-	$filename = "compilelogsSummary.xml";
-	$prefix = "code_";
-	$compileSummary = simplexml_load_file($filename);
-	foreach ($compileSummary->summaryItem as $summaryItem) {
-		$name = $summaryItem->name;
-		$value = $summaryItem->value;
-		$code= "\$" . $prefix . $name . " = " . $value . ";";
-		//echo "<br />code: " . $code;
-		eval($code);
-	}
-
-	$filename = "testcompilelogsSummary.xml";
-	$prefix = "test_";
-	$compileSummary = simplexml_load_file($filename);
-	foreach ($compileSummary->summaryItem as $summaryItem) {
-		$name = $summaryItem->name;
-		$value = $summaryItem->value;
-		$code= "\$" . $prefix . $name . " = " . $value . ";";
-		//echo "<br />code: " . $code;
-		eval($code);
-	}
-}
-
-
-?>
-
-
-</head>
-
-<body>
-
-<?php
-
-// tiny banner to remind when looking at "local" machine results
-$serverName = $_SERVER["SERVER_NAME"];
-
-if (!stristr($serverName, "eclipse.org") && !stristr($serverName,"you.are.at.eclipsecon.org")) {
-	echo '<center>
-          <p>
-          Reminder: this is <font color="#FF0000">' . 
-	$serverName .
-    '</font>
-          See also 
-          <a href="http://download.eclipse.org/webtools/downloads" target="_top">the live public Eclipse site</a>.
-          </p>
-          <hr />
-          </center>';
-
-}
-?>
-<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH="100%">
-	<tr>
-		<td ALIGN=left><font face="'Bitstream Vera',Helvetica,Arial" size="+2"><b><?php echo "$type";?>
-		Build: <?php echo "$build";?></b></font></td>
-	
-	
-	<tr>
-		<td><font size="-1"><?php echo "$builddate";?></font></td>
-	</tr>
-	<tr>
-		<td>
-		<p>The Eclipse Web Tools Platform Project provides tools for Web
-		Development, and is a platform for adopters making add-on tools for
-		Web Development.</p>
-		</td>
-	</tr>
-</table>
-
-<!-- ***********  Required Prerequisites **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-	<tr>
-		<td align="left" valign="top" bgcolor="#0080C0"><font
-			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Required
-		Prerequisites and Handy Extras</font></td>
-	</tr>
-	<tr>
-		<td>
-		<p>These are the prerequisites to install and run the Web Tools
-		Platform. Also listed are some frequently needed links for
-		committer-required packages when creating new development
-		environments, or targets to run against.</p>
-		<p>Note that WTP requires Java 5 or higher (and, for some things,
-		actually requires a JDK rather than only a JRE) even though many other
-		<a href="http://www.eclipse.org/downloads/">Eclipse Projects</a> can
-		run with <a href="http://www.eclipse.org/downloads/moreinfo/jre.php">other
-		JRE levels</a>.</p>
-		</td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=1 cellpadding=1 width="90%" align="center">
-			<tr valign="top">
-				<td width="10%"></td>
-				<td width="55%">Eclipse Platform (Platform, JDT)</td>
-				<?php
-				//customize page depending on user's browser/platform, if we can detect it
-				$usersPlatform = getPlatform();
-				// assume windows by default, since likely most frequent, even for cases where
-				// platform is "unknown". I've noticed Opera reports 'unknown' :(
-				$recommendedFile=$eclipsefilewindows;
-				if (strcmp($usersPlatform,"linux")== 0) {
-					$recommendedFile=$eclipsefilelinux;
-				} else if (strcmp($usersPlatform,"mac") == 0) {
-					$recommendedFile=$eclipsefilemacosx;
-				}
-				?>
-				<td align="right" width="35%"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $eclipseBuildURL . "\">appropriate platform</a>";
-				echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>Eclipse Modeling Framework (EMF, XSD InfoSet)</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfMirrorPrefixuri, $emfURL, $emfFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $emfBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>Graphical Editing Framework (GEF)</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $gefMirrorPrefixuri, $gefURL, $gefFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $gefBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>Eclipse Test Framework (required only for Automated JUnit tests)</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $testURL, $testFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>Eclipse releng tool (required only for committers to more easily
-				"release" code to a build)</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipserelengURL, $eclipserelengFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-
-		</table>
-		</td>
-	</tr>
-</table>
-
-<!-- ***********  WTP **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-	<tr>
-		<td align=left valign=top colspan="5" bgcolor="#0080C0"><font
-			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF"> Web Tools
-		Platform Patches for WTP 2.0.2</font></td>
-	</tr>
-
-	<tr>
-		<td align="left" valign="top" colspan="5">
-		<p>The Zip files contain patches</p>
-		</td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
-
-
-			<tr>
-				<td align="left" valign="top" width="10%"><b>Patch</b></td>
-				<td align="left" valign="top">
-				<p>Remember, care is needed in using patches from this page. These
-				patches are specific to particular use-cases or adopters and not
-				well tested for general cases.</p>
-				</td>
-				<?php
-				$zipfilename="wtp-@build@";
-				$filename=$zipfilename.".zip";
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription="@build@";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-				?>
-			</tr>
-		</table>
-		</td>
-	
-	
-	<tr>
-
-</table>
-
-
-
-
-
-
-
-<!-- ***********  Build Status **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-	<tr>
-		<td align=left valign=top bgcolor="#0080C0"><font
-			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Status, tests
-		and other interesting details</font></td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
-
-			<tr>
-				<td><a href="buildNotes.php">Build notes</a> <br />
-				<a href="directory.txt">map files</a> <br />
-				<?php
-
-				if ($displayTestSummary) {
-
-
-					if (isset($unitTests_grandTotalErrors)) {
-						$errorColor="green";
-						if ($unitTests_grandTotalErrors > 0) {
-							$errorColor="red";
-						}
-						echo "<a href=\"testResults.php\">Unit test results</a>&nbsp;";
-						echo "<img src=\"junit_err.gif\"/><font color=\"" . $errorColor . "\">" . $unitTests_grandTotalErrors . "</font>&nbsp;&nbsp;Total: " . $unitTests_grandTotalTests;
-					}
-					else {
-						echo "<br /><font color=\"orange\">Unit tests are pending</font>&nbsp;&nbsp;<img src=\"pending.gif\"/>";
-					}
-
-					echo "<br />";
-					echo "<a href=\"compileResults.php\">Compile logs: Code Bundles</a>";
-
-					echo "&nbsp;&nbsp;($code_totalBundles)&nbsp;&nbsp;";
-					echo "<img src=\"compile_err.gif\"/><font color=red>$code_totalErrors</font>&nbsp;";
-					echo "<img src=\"compile_warn.gif\"/><font color=orange>$code_totalWarnings</font>&nbsp;";
-					echo "<img src=\"access_err.gif\"/><font color=red>$code_totalforbiddenAccessWarningCount</font>&nbsp;";
-					echo "<img src=\"access_warn.gif\"/><font color=orange>$code_totaldiscouragedAccessWarningCount</font>&nbsp;";
-
-					echo "<br />";
-					echo "<a href=\"testCompileResults.php\">Compile logs: Test Bundles</a>";
-
-					echo "&nbsp;&nbsp;($test_totalBundles)&nbsp;&nbsp;";
-					echo "<img src=\"compile_err.gif\"/><font color=red>$test_totalErrors</font>&nbsp;";
-					echo "<img src=\"compile_warn.gif\"/><font color=orange>$test_totalWarnings</font>&nbsp;";
-					echo "<img src=\"access_err.gif\"/><font color=red>$test_totalforbiddenAccessWarningCount</font>&nbsp;";
-					echo "<img src=\"access_warn.gif\"/><font color=orange>$test_totaldiscouragedAccessWarningCount</font>&nbsp;";
-				}
-
-				?> <br />
-
-				<?php
-				if (file_exists("versioningReportName.php")) {
-					include "versioningReportName.php";
-					$fname="${versionReportFilename}.html";
-					if (file_exists($fname)) {
-						echo "<br /> <a href='$fname'>Versioning Information</a>";
-					}
-}
-?> <?php
-echo "<br />";
-if (file_exists("./apiresults/api-progress.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-progress.html\">API Progress Report</a>";
-}
-if (file_exists("./apiresults/api-info-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-info-summary.html\">APIs Defined by Each Component</a>";
-}
-if (file_exists("./apiresults/api-ref-compatibility.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-ref-compatibility.html\">Adopter Breakage Report</a>";
-}
-if (file_exists("./apiresults/api-violation-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-violation-summary.html\">API Violations</a>";
-}
-if (file_exists("./apiresults/component-api-violation-all.html"))
-{
-	echo "<br /> <a href=\"apiresults/component-api-violation-all.html\">Non-API dependencies</a>";
-}
-if (file_exists("./apiresults/api-tc-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-tc-summary.html\">API Test Coverage</a>";
-}
-if (file_exists("./apiresults/api-javadoc-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-javadoc-summary.html\">API Javadoc Coverage</a>";
-}
-if (file_exists("./apiresults/api-tc-summary.html"))
-{
-	echo "<br /><br /> <a href=\"apiresults/full_test_coverage/api-tc-summary.html\">Test Coverage for All Classes and Methods</a>";
-}
-?> <?php
-if (file_exists("./perfresults/graph/performance.php"))
-{
-	echo "<br />";
-	echo "<br /> <a href=\"perfresults/graph/performance.php\">Performance Results</a>";
-	echo "<br />";
-}
-?></td>
-			</tr>
-
-
-		</table>
-		</td>
-	</tr>
-</table>
-
-
-
-<!-- footer -->
-<center>
-<hr>
-<p>All downloads are provided under the terms and conditions of the <a
-	href="http://www.eclipse.org/legal/notice.html">Eclipse.org Software
-User Agreement</a> unless otherwise specified.</p>
-
-<p>If you have problems downloading the drops, contact the <font
-	face="'Bitstream Vera',Helvetica,Arial" size="-1"><a
-	href="mailto:webmaster@eclipse.org">webmaster</a></font>.</p>
-
-</center>
-<!-- end footer -->
-
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/patches2.site/templateFiles/siteEnablingFeatures.xml b/releng.wtpbuilder/distribution/patches2.site/templateFiles/siteEnablingFeatures.xml
deleted file mode 100644
index e4ace4d..0000000
--- a/releng.wtpbuilder/distribution/patches2.site/templateFiles/siteEnablingFeatures.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-
-    <description>
-        The update site contains the enabling features.
-    </description>
-
-
-
-
-
-
-
-    <category-def
-        name="Enabling Features"
-        label="Enabling Features">
-        <description>
-            This category contains features used by several projects
-            that enable some functionality, but which by themselves are
-            not very interesting.
-        </description>
-    </category-def>
-
-
-
-</site>
diff --git a/releng.wtpbuilder/distribution/patches2.site/templateFiles/siteWTP.xml b/releng.wtpbuilder/distribution/patches2.site/templateFiles/siteWTP.xml
deleted file mode 100644
index e3a86fa..0000000
--- a/releng.wtpbuilder/distribution/patches2.site/templateFiles/siteWTP.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site
-    pack200="true"
-    mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/webtools/testUpdates/site.xml&amp;format=xml"
-    digestURL="http://download.eclipse.org/webtools/testUpdates/">
-
-    <description
-        url="http://download.eclipse.org/webtools/declaredUpdates/index.html">
-        The update site contains the features of the of Eclipse Web
-        Tools Project (WTP)
-    </description>
-
-    <feature
-        url="features/org.eclipse.wst_@org.eclipse.wst@.jar"
-        id="org.eclipse.wst"
-        version="@org.eclipse.wst@">
-        <category name="Web Tools Platform (WTP)" />
-    </feature>
-
-    <feature
-        url="features/org.eclipse.wst.sdk_@org.eclipse.wst.sdk@.jar"
-        id="org.eclipse.wst.sdk"
-        version="@org.eclipse.wst.sdk@">
-        <category name="Web Tools Platform (WTP)" />
-    </feature>
-
-    <feature
-        url="features/org.eclipse.jst_@org.eclipse.jst@.jar"
-        id="org.eclipse.jst"
-        version="@org.eclipse.jst@">
-        <category name="Web Tools Platform (WTP)" />
-    </feature>
-
-    <feature
-        url="features/org.eclipse.jst.sdk_@org.eclipse.jst.sdk@.jar"
-        id="org.eclipse.jst.sdk"
-        version="@org.eclipse.jst.sdk@">
-        <category name="Web Tools Platform (WTP)" />
-    </feature>
-
-
-
-
-    <feature
-        url="features/org.eclipse.jpt.feature_@org.eclipse.jpt.feature@.jar"
-        id="org.eclipse.jpt.feature"
-        version="@org.eclipse.jpt.feature@">
-        <category name="Web Tools Platform (WTP)" />
-    </feature>
-
-    <feature
-        url="features/org.eclipse.jpt_sdk.feature_@org.eclipse.jpt_sdk.feature@.jar"
-        id="org.eclipse.jpt_sdk.feature"
-        version="@org.eclipse.jpt_sdk.feature@">
-        <category name="Web Tools Platform (WTP)" />
-    </feature>
-
-
-    <category-def
-        name="Web Tools Platform (WTP)"
-        label="Web Tools Platform (WTP)">
-        <description>
-            This category contains the features of the Eclipse Web Tools
-            Project (WTP).
-        </description>
-    </category-def>
-
-
-</site>
diff --git a/releng.wtpbuilder/distribution/patches2.site/templateFiles/testCompileResults.php.template b/releng.wtpbuilder/distribution/patches2.site/templateFiles/testCompileResults.php.template
deleted file mode 100644
index 42d6f65..0000000
--- a/releng.wtpbuilder/distribution/patches2.site/templateFiles/testCompileResults.php.template
+++ /dev/null
@@ -1,76 +0,0 @@
-<html>
-<head>
-
-<?php
-        $parts = explode("/", getcwd());
-        $parts2 = explode("-", $parts[count($parts) - 1]);
-        $buildName = $parts2[1];
-
-        echo "<title>Compile Logs: Test Bundles for $buildName</title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2em;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:Bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-}
-</style>
-</head>
-<body>
-
-<?php
-        echo "<h1>Compile Logs: Test Bundles for $buildName</h1>";
-?>
-
-
-<table id=tabledata align = "center" width="75%" border="1">
-  <tr>
-    <td class="bold" align="center">Compile Logs</td>
-    <td class="bold" align="center">Compile Errors</td>
-    <td class="bold" align="center">Compiler Warnings</td>
-    <td class="bold" align="center">Access Violations</td>
-    <td class="bold" align="center">Access Warnings</td>
-  </tr>
-
-  %compilelogs%
-
-</table>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/patches2.site/templateFiles/testResults.php.template b/releng.wtpbuilder/distribution/patches2.site/templateFiles/testResults.php.template
deleted file mode 100644
index 2f2fba8..0000000
--- a/releng.wtpbuilder/distribution/patches2.site/templateFiles/testResults.php.template
+++ /dev/null
@@ -1,118 +0,0 @@
-<html>
-<head>
-
-<?php
-	$parts = explode("/", getcwd());
-	$parts2 = explode("-", $parts[count($parts) - 1]);
-	$buildName = $parts2[1];
-	
-	echo "<title>Test Results for $buildName </title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2em;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:Bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-
-}
-</style>
-
-
-</head>
-<body>
-<p><b><font face="Verdana" size="+3">Test Results</font></b> </p>
-
-<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">
-    Unit Test Results for <?php echo "$buildName"; ?> on Various Platforms and JRE</font></b></td>
-  </tr>
-</table>
-
-<?php
-if (file_exists("testResults"))
-{
-$dir = dir("testResults");
-while ($anEntry = $dir->read())
-{
-  if ($anEntry != "." && $anEntry != ".." && $anEntry != "consolelogs" && $anEntry != "html" && $anEntry != "xml")
-  {
-    $link = "testResults/".$anEntry."/results/index.php";
-    echo "<p><a href=\"$link\">$anEntry</a></p>";
-  }
-}
-}
-?>
-
-<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">Unit 
-      Test Results for <?php echo "$buildName"; ?> </font></b></td>
-  </tr>
-</table>
-
-<table id=tableunittestdata align = "center" width="75%" border="1">
-  <tr> 
-    <td class="bold" align="center" width="70%">Test Suite</td>
-    <td class="bold" align="center" width="15%">Errors &amp; Failures</td>
-    <td class="bold" align="center" width="15%">Total Tests</td>
-  </tr>
-  
-  
-  %testresults%
-  
-</table>
-<p></p>
-<br>
-<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"> 
-      Console output logs 
-      <?php echo "$buildName"; ?>
-      </font></b></td>
-  </tr>
-</table>
-<br>
-These <a href="consoleLogs.php">logs</a> contain the console output captured while 
-running the JUnit automated tests. <br>
-<br>
-
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/patches2.site/transformReportToHTML.xml b/releng.wtpbuilder/distribution/patches2.site/transformReportToHTML.xml
deleted file mode 100644
index f5a70cd..0000000
--- a/releng.wtpbuilder/distribution/patches2.site/transformReportToHTML.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-    name="xsl-conversion"
-    default="main"
-    basedir=".">
-
-    <target
-        name="main"
-        description="example.bin.xml to produce example.html">
-        <xslt
-            basedir="."
-            destdir="."
-            includes="*.bin.xml"
-            scanincludeddirectories="true"
-            style="compilerXMLOutputToHTML.xsl"
-            force="true" />
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches2.tests/build.xml b/releng.wtpbuilder/distribution/patches2.tests/build.xml
deleted file mode 100644
index 5c79d01..0000000
--- a/releng.wtpbuilder/distribution/patches2.tests/build.xml
+++ /dev/null
@@ -1,348 +0,0 @@
-<project
-    name="Build specific targets and properties"
-    default="runTest">
-    <!--
-        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"/>
-    <fail
-        message="testRoot must be set for this task"
-        unless="testRoot"/>
-    <!--
-        =====================================================================
-    -->
-    <!-- Steps to do after the build is done. -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="test">
-        <dirname
-            file="${ant.file}"
-            property="currentDirectory"/>
-        <ant
-            antfile="${ant.file}"
-            target="runTest"
-            dir="${currentDirectory}"/>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Steps to do to test the build results -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="runTest">
-        <dirname
-            file="${ant.file}"
-            property="test.component.dir"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-        <property
-            file="${buildDirectory}/label.properties"/>
-        <property
-            file="${wtp.builder.home}/build.properties"/>
-        <fail
-            message="testRoot must be set for this task"
-            unless="testRoot"/>
-        <mkdir
-            dir="${testRoot}"/>
-
-        <!-- if results already exist, delete them -->
-        <delete
-            dir="${testRoot}/results"
-            failOnError="false"/>
-        <mkdir
-            dir="${testRoot}/results"/>
-        <mkdir
-            dir="${testRoot}/results/consolelogs"/>
-
-        <copy
-            todir="${testRoot}"
-            overwrite="true">
-            <fileset
-                dir="${test.component.dir}/testScripts"></fileset>
-        </copy>
-        <echo
-            message="BASEOS: ${env.BASEOS}   BASEWS: ${env.BASEWS}   BASEARCH: ${env.BASEARCH} "/>
-        <ant
-            antfile="${test.component.dir}/testdependency.xml"
-            target="get">
-            <property
-                name="dependency.properties"
-                value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-            <property
-                name="base.install.dir"
-                value="${testRoot}"/>
-        </ant>
-        <antcall
-            target="unzipTests"/>
-        <antcall
-            target="runTestEclipse">
-            <param
-                name="testTarget"
-                value="all"/>
-        </antcall>
-        <antcall
-            target="postRunTestEclipse">
-            <param
-                name="testTarget"
-                value="all"/>
-        </antcall>
-    </target>
-    <target
-        name="unzipTests">
-        <!--
-            unzip the builds and junit tests we use 'unzip' here, so we
-            can continue on error (such as if zip was not created, due
-            to other failures or options).
-        -->
-        <!--
-            this main block of zips is handled by 'dependancies' in the
-            patch build <exec dir="${buildDirectory}/${buildLabel}"
-            executable="unzip" failonerror="false"> <arg line="-o -qq
-            wtp-sdk-${buildLabel}.zip -d ${testRoot}" /> </exec> <exec
-            dir="${buildDirectory}/${buildLabel}" executable="unzip"
-            failonerror="false"> <arg line="-o -qq
-            wtp-wst-Automated-Tests-${buildLabel}.zip -d ${testRoot}" />
-            </exec> <exec dir="${buildDirectory}/${buildLabel}"
-            executable="unzip" failonerror="false"> <arg line="-o -qq
-            wtp-jst-Automated-Tests-${buildLabel}.zip -d ${testRoot}" />
-            </exec> <exec dir="${buildDirectory}/${buildLabel}"
-            executable="unzip" failonerror="false"> <arg line="-o -qq
-            wtp-jpt-sdk-${buildLabel}.zip -d ${testRoot}" /> </exec>
-            <exec dir="${buildDirectory}/${buildLabel}"
-            executable="unzip" failonerror="false"> <arg line="-o -qq
-            wtp-jpt-Automated-Tests-${buildLabel}.zip -d ${testRoot}" />
-            </exec>
-        -->
-        <exec
-            dir="${buildDirectory}/${buildLabel}"
-            executable="unzip"
-            failonerror="false">
-            <arg
-                line="-o -qq wtp-${buildLabel}.zip -d ${testRoot}"/>
-        </exec>
-        <exec
-            dir="${buildDirectory}/${buildLabel}"
-            executable="unzip"
-            failonerror="false">
-            <arg
-                line="-o -qq wtp-patches-tests-${buildLabel}.zip -d ${testRoot}"/>
-        </exec>
-    </target>
-    <!--
-        time out may need to be set/adjust for api or performance tests?
-        This testTimeLimit is the whole, overall limit on tests. There's
-        a shorter one for individual suites. some common values, of
-        milliseconds to more recognizable units: 7200000: 2 hours
-        3600000: 1 hour 1800000: 30 minutes 600000: 10 minutes
-    -->
-    <property
-        name="testTimeLimit"
-        value="7200000"/>
-    <property
-        name="testFailOnError"
-        value="false"/>
-    <target
-        name="runTestEclipse"
-        description="Run our JUnit's within an instance of antRunner">
-        <property
-            name="test-vm"
-            value="${env.JAVA_5_HOME}/bin/java"/>
-        <property
-            name="plugin-path"
-            value="${testRoot}/eclipse/plugins"/>
-        <property
-            name="vmargs"
-            value="-Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm}  -Dperf.buildId=${buildType}${date}-${time}"/>
-        <!--
-            set path to eclipse folder. If local folder, use '.';
-            otherwise, use c:\path\to\eclipse or /path/to/eclipse/
-        -->
-        <property
-            name="eclipse.home"
-            value="${testRoot}"/>
-        <echo
-            message="Running junits"/>
-        <!--
-            If there is not exactly one launcher in the stack, we'd best
-            fail fast, since we are not expecting that, and may indicate
-            an installation that would produce unpredictable results
-        -->
-        <!--
-            requires ant 1.7, and at this point, we're running 1.6 from
-            eclipse ... <condition property="expectedNumberOfLaunchers">
-            <resourcecount when="equal" count="1" > <fileset
-            dir="${testRoot}/eclipse/plugins"> <include
-            name="org.eclipse.equinox.launcher_*.jar" /> </fileset>
-            </resourcecount> </condition> <fail message="Did not find
-            expected number of launcher jars. Check installation."
-            unless="expectedNumberOfLaunchers" />
-        -->
-        <!--
-            Remember: using -debug for org.eclipse.ant.core.antRunner
-            produces ant debug info to be output ... which is a TON of
-            stuff
-        -->
-        <java
-            taskname="unit-test-masterprocess"
-            fork="true"
-            resultProperty="wtpmasterjunitresult"
-            failonerror="false"
-            timeout="${testTimeLimit}"
-            dir="${testRoot}/eclipse"
-            jvm="${env.JAVA_5_HOME}/bin/java"
-            classname="org.eclipse.equinox.launcher.Main">
-            <classpath>
-                <fileset
-                    dir="${testRoot}/eclipse/plugins">
-                    <include
-                        name="org.eclipse.equinox.launcher_*.jar"/>
-                </fileset>
-            </classpath>
-            <jvmarg
-                value="-Xmx512m"/>
-            <jvmarg
-                value="-Dosgi.ws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dosgi.os=${env.BASEOS}"/>
-            <jvmarg
-                value="-Dosgi.arch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-Dws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dos=${env.BASEOS}"/>
-            <jvmarg
-                value="-Darch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-Dnoclean=true"/>
-            <jvmarg
-                value="-DbuildBranch=${buildBranch}"/>
-            <jvmarg
-                value="-DbuildType=${buildType}"/>
-            <jvmarg
-                value="-DbuildId=${buildId}"/>
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <jvmarg
-                value="-Dprojectname=${projectname}"/>
-            <arg
-                value="-nosplash"/>
-            <arg
-                value="-consolelog"/>
-            <arg
-                value="-data"/>
-            <arg
-                value="${testRoot}/overallTestWorkspace"/>
-            <arg
-                value="-application"/>
-            <arg
-                value="org.eclipse.ant.core.antRunner"/>
-            <arg
-                value="-file"/>
-            <arg
-                value="${testRoot}/test.xml"/>
-            <arg
-                value="-logger"/>
-            <arg
-                value="org.apache.tools.ant.DefaultLogger"/>
-            <env
-                key="DISPLAY"
-                value="${env.DISPLAY}"/>
-            <redirector
-                output="${testRoot}/results/fullOutput.txt"
-                error="${testRoot}/results/fullErrorLog.txt"/>
-            <sysproperty
-                key="build.home"
-                value="${env.BUILD_HOME}"/>
-            <sysproperty
-                key="buildDirectory"
-                value="${buildDirectory}"/>
-            <sysproperty
-                key="buildLabel"
-                value="${buildLabel}"/>
-            <sysproperty
-                key="baseLocation"
-                value="${baseLocation}"/>
-            <sysproperty
-                key="testRoot"
-                value="${testRoot}"/>
-            <sysproperty
-                key="testDir"
-                value="${testRoot}"/>
-            <sysproperty
-                key="perf.buildId"
-                value="${buildType}${date}-${time}"/>
-            <sysproperty
-                key="eclipseBuilderDirectory"
-                value="${pde.builder.path}"/>
-            <sysproperty
-                key="buildLabel"
-                value="${buildLabel}"/>
-        </java>
-        <echo
-            message="wtpmasterjunitresult ${wtpmasterjunitresult}"/>
-    </target>
-    <target
-        name="postRunTestEclipse">
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/consolelogs/testLogs"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results">
-                <include
-                    name="*output.txt"/>
-            </fileset>
-        </copy>
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/consolelogs/testSysErrorLogs"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results">
-                <include
-                    name="*error.txt"/>
-            </fileset>
-        </copy>
-        <copy
-            file="${testRoot}/results/fullOutput.txt"
-            toDir="${buildDirectory}/${buildLabel}/testResults/consolelogs/full"
-            overwrite="true"
-            failonerror="false">
-        </copy>
-        <copy
-            file="${testRoot}/results/fullErrorLog.txt"
-            toDir="${buildDirectory}/${buildLabel}/testResults/consolelogs/full"
-            overwrite="true"
-            failonerror="false">
-        </copy>
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/xml"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results/xml">
-                <include
-                    name="*.xml"/>
-            </fileset>
-        </copy>
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/html"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results/html">
-                <include
-                    name="*.html"/>
-            </fileset>
-        </copy>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches2.tests/standaloneTest.xml b/releng.wtpbuilder/distribution/patches2.tests/standaloneTest.xml
deleted file mode 100644
index 3ee1693..0000000
--- a/releng.wtpbuilder/distribution/patches2.tests/standaloneTest.xml
+++ /dev/null
@@ -1,257 +0,0 @@
-<project
-    default="main"
-    basedir=".">
-    <!--
-        Required inputs: build.home buildType buildId timestamp
-        build.stream [optional] build.committers [optional] testTarget
-        [optional]
-    -->
-    <property
-        environment="env"/>
-    <target
-        name="main">
-        <property
-            file="${build.home}/${env.RELENG_BUILDER}/build.properties"/>
-        <property
-            name="local.cache.dir"
-            value="${env.LOCAL_PREREQS_CACHE}"/>
-        <property
-            name="testRoot"
-            value="${build.home}/testRoot"/>
-        <delete
-            dir="${testRoot}"
-            failonerror="false"/>
-        <mkdir
-            dir="${testRoot}"/>
-        <antcall
-            target="getReleng"/>
-        <property
-            file="${testRoot}/${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="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="${testRoot}"
-            command="export"
-            tag="${releng.tag}"
-            quiet="${env.CVS_QUIET}"
-            reallyquiet="${env.CVS_REALLY_QUIET}"/>
-    </target>
-    <target
-        name="getDependencies">
-        <ant
-            antfile="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.tests/testdependency.xml">
-            <property
-                name="base.install.dir"
-                value="${testRoot}"/>
-            <property
-                name="dependencyTargets"
-                value="${build.home}/${env.RELENG_BUILDER}/scripts/dependency/build.xml"/>
-        </ant>
-        <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}.zip"/>
-        </antcall>
-        <antcall
-            target="getAndInstallWTP">
-            <param
-                name="file"
-                value="wtp-wst-Automated-Tests-${buildType}-${buildId}-${timestamp}.zip"/>
-        </antcall>
-        <antcall
-            target="getAndInstallWTP">
-            <param
-                name="file"
-                value="wtp-jst-Automated-Tests-${buildId}.zip"/>
-        </antcall>
-        <antcall
-            target="getAndInstallWTP">
-            <param
-                name="file"
-                value="wtp-jst-Automated-Tests-${buildType}-${buildId}-${timestamp}.zip"/>
-        </antcall>
-    </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="${testRoot}"
-            overwrite="true"/>
-    </target>
-    <target
-        name="run">
-        <mkdir
-            dir="${testRoot}/results/consolelogs"/>
-        <copy
-            todir="${testRoot}"
-            flatten="true"
-            overwrite="true">
-            <fileset
-                dir="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.tests/testScripts"/>
-        </copy>
-        <ant
-            antfile="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.tests/build.xml"
-            target="runTestEclipse">
-            <property
-                name="testRoot"
-                value="${testRoot}"/>
-            <property
-                name="testTarget"
-                value="all"/>
-        </ant>
-        <copy
-            file="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.tests/templateFiles/index.php"
-            todir="${testRoot}/results"
-            overwrite="true"/>
-    </target>
-    <target
-        name="upload"
-        if="login">
-        <mkdir
-            dir="${build.home}/archives"/>
-        <zip
-            destfile="${build.home}/archives/${buildType}-${buildId}-${timestamp}.zip"
-            basedir="${build.home}/testRoot/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}-${timestamp}/testResults/${config}"
-            value="${upload.path.1}/drops/${build.stream}/${buildType}-${buildId}-${timestamp}/testResults/${config}">
-            <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 ./testRoot/results ${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="testRoot"
-            value="${build.home}/testRoot"/>
-        <delete
-            dir="${testRoot}"
-            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/patches2.tests/templateFiles/index.php b/releng.wtpbuilder/distribution/patches2.tests/templateFiles/index.php
deleted file mode 100644
index 8d23693..0000000
--- a/releng.wtpbuilder/distribution/patches2.tests/templateFiles/index.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<html>
-<head>
-
-<?php
-    $parts = explode("/", realpath(".."));
-    $label = $parts[count($parts) - 1];
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" type="text/css">
-</head>
-<body>
-<p><b><font face="Verdana" size="+3">Test Results</font></b> </p>
-<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">Unit 
-      Test Results for <?php echo "$label"; ?> </font></b></td>
-  </tr>
-</table>
-<p></p><table border="0">
-</table>
-
-<table width="77%" border="1">
-  <tr> 
-    <td width="81%"><b>Tests Performed</b></td>
-    <td width="19%"><b>Errors &amp; Failures</b></td>
-  </tr>
-
-  <?
-    $dir = dir("html");
-    while ($anEntry = $dir->read())
-    {
-      if ($anEntry != "." && $anEntry != "..")
-      {
-        $link = "html/".$anEntry;
-        $xml = "xml/".substr($anEntry, 0, strlen($anEntry)-4)."xml";
-        $count = 0;
-        $fileHandle = fopen($xml, "r");
-        while (!feof($fileHandle))
-        {
-          $aLine = fgets($fileHandle, 4096); // Length parameter only optional after 4.2.0
-          $count = $count + substr_count($aLine, '<error');
-        }
-        fclose($fileHandle);
-        if ($count > 0)
-        {
-          echo "<tr><td><a href=\"$link\"><b><font color=\"red\">";
-          echo "$anEntry";
-          echo "</font></b></a></td>";
-          echo "<td><b><font color=\"red\">$count</font></b></td></tr>";
-        }
-        else
-        {
-          echo "<tr><td><a href=\"$link\">";
-          echo "$anEntry";
-          echo "</a></td>";
-          echo "<td>$count</td></tr>";
-        }
-      }
-    }
-  ?>
-  
-</table>
-<p></p>
-<br>
-<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"> 
-      Console output logs 
-      <?php echo "$label"; ?>
-      </font></b></td>
-  </tr>
-</table>
-<br>
-These <a href="consolelogs/wtptestlog.txt">logs</a> contain the console output captured while 
-running the JUnit automated tests. <br>
-<br>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/patches2.tests/testScripts/ComputePluginVersion.jar b/releng.wtpbuilder/distribution/patches2.tests/testScripts/ComputePluginVersion.jar
deleted file mode 100644
index ad06a45..0000000
--- a/releng.wtpbuilder/distribution/patches2.tests/testScripts/ComputePluginVersion.jar
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/patches2.tests/testScripts/JUNIT.XSL b/releng.wtpbuilder/distribution/patches2.tests/testScripts/JUNIT.XSL
deleted file mode 100644
index 30a407d..0000000
--- a/releng.wtpbuilder/distribution/patches2.tests/testScripts/JUNIT.XSL
+++ /dev/null
@@ -1,580 +0,0 @@
-<xsl:stylesheet
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="1.0">
-    <xsl:output
-        method="html"
-        indent="yes"/>
-    <xsl:decimal-format
-        decimal-separator="."
-        grouping-separator=","/>
-    <xsl:template
-        match="testsuites">
-        <HTML>
-            <HEAD>
-                <style
-                    type="text/css"> body { font:normal 68% verdana,arial,helvetica;
-                    color:#000000; } table tr td, table tr th {
-                    font-size: 68%; } table.details tr th{ font-weight:
-                    bold; text-align:left; background:#a6caf0; }
-                    table.details tr td{ background:#eeeee0; }
-
-                    p { line-height:1.5em; margin-top:0.5em;
-                    margin-bottom:1.0em; } h1 { margin: 0px 0px 5px;
-                    font: 165% verdana,arial,helvetica } h2 {
-                    margin-top: 1em; margin-bottom: 0.5em; font: bold
-                    125% verdana,arial,helvetica } h3 { margin-bottom:
-                    0.5em; font: bold 115% verdana,arial,helvetica } h4
-                    { margin-bottom: 0.5em; font: bold 100%
-                    verdana,arial,helvetica } h5 { margin-bottom: 0.5em;
-                    font: bold 100% verdana,arial,helvetica } h6 {
-                    margin-bottom: 0.5em; font: bold 100%
-                    verdana,arial,helvetica } .Error { font-weight:bold;
-                    color:red; } .Failure { font-weight:bold;
-                    color:purple; } .Properties { text-align:right; }
-                </style>
-                <script language="JavaScript">
-                    var TestCases = new Array(); var cur;
-                    <xsl:for-each select="./testsuite">
-                        <xsl:apply-templates select="properties" />
-                    </xsl:for-each>
-
-                </script>
-                <script language="JavaScript"><![CDATA[
-        function displayProperties (name) {
-          var win = window.open('','JUnitSystemProperties','scrollbars=1,resizable=1');
-          var doc = win.document.open();
-          doc.write("<html><head><title>Properties of " + name + "</title>");
-          doc.write("<style>")
-          doc.write("body {font:normal 68% verdana,arial,helvetica;	color:#000000; }");
-          doc.write("table tr td, table tr th { font-size: 68%; }");
-          doc.write("table.properties { border-collapse:collapse; border-left:solid 1 #cccccc; border-top:solid 1 #cccccc; padding:5px; }");
-          doc.write("table.properties th { text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#eeeeee; }");
-          doc.write("table.properties td { font:normal; text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#fffffff; }");
-          doc.write("h3 { margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica }");
-          doc.write("</style>");
-          doc.write("</head><body>");
-          doc.write("<h3>Properties of " + name + "</h3>");
-          doc.write("<div align=\"right\"><a href=\"javascript:window.close();\">Close</a></div>");
-          doc.write("<table class='properties'>");
-          doc.write("<tr><th>Name</th><th>Value</th></tr>");
-          for (prop in TestCases[name]) {
-            doc.write("<tr><th>" + prop + "</th><td>" + TestCases[name][prop] + "</td></tr>");
-          }
-          doc.write("</table>");
-          doc.write("</body></html>");
-          doc.close();
-          win.focus();
-        }
-      ]]>
-                </script>
-            </HEAD>
-            <body>
-                <a name="top"></a>
-                <xsl:call-template name="pageHeader" />
-
-                <!-- Summary part -->
-                <xsl:call-template name="summary" />
-                <hr
-                    size="1"
-                    width="95%"
-                    align="left" />
-
-                <!-- Package List part -->
-                <xsl:call-template name="packagelist" />
-                <hr
-                    size="1"
-                    width="95%"
-                    align="left" />
-
-                <!-- For each package create its part -->
-                <xsl:call-template name="packages" />
-                <hr
-                    size="1"
-                    width="95%"
-                    align="left" />
-
-                <!-- For each class create the  part -->
-                <xsl:call-template name="classes" />
-
-            </body>
-        </HTML>
-    </xsl:template>
-
-
-
-    <!-- ================================================================== -->
-    <!-- Write a list of all packages with an hyperlink to the anchor of    -->
-    <!-- of the package name.                                               -->
-    <!-- ================================================================== -->
-    <xsl:template name="packagelist">
-        <h2>Packages</h2>
-        Note: package statistics are not computed recursively, they only
-        sum up all of its testsuites numbers.
-        <table
-            class="details"
-            border="0"
-            cellpadding="5"
-            cellspacing="2"
-            width="95%">
-            <xsl:call-template name="testsuite.test.header" />
-            <!-- list all packages recursively -->
-            <xsl:for-each
-                select="./testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
-                <xsl:sort select="@package" />
-                <xsl:variable
-                    name="testsuites-in-package"
-                    select="/testsuites/testsuite[./@package = current()/@package]" />
-                <xsl:variable
-                    name="testCount"
-                    select="sum($testsuites-in-package/@tests)" />
-                <xsl:variable
-                    name="errorCount"
-                    select="sum($testsuites-in-package/@errors)" />
-                <xsl:variable
-                    name="failureCount"
-                    select="sum($testsuites-in-package/@failures)" />
-                <xsl:variable
-                    name="timeCount"
-                    select="sum($testsuites-in-package/@time)" />
-
-                <!-- write a summary for the package -->
-                <tr valign="top">
-                    <!-- set a nice color depending if there is an error/failure -->
-                    <xsl:attribute name="class">
-						<xsl:choose>
-							<xsl:when test="$failureCount &gt; 0">Failure</xsl:when>
-							<xsl:when test="$errorCount &gt; 0">Error</xsl:when>
-						</xsl:choose>
-					</xsl:attribute>
-                    <td>
-                        <a href="#{@package}">
-                            <xsl:value-of select="@package" />
-                        </a>
-                    </td>
-                    <td>
-                        <xsl:value-of select="$testCount" />
-                    </td>
-                    <td>
-                        <xsl:value-of select="$errorCount" />
-                    </td>
-                    <td>
-                        <xsl:value-of select="$failureCount" />
-                    </td>
-                    <td>
-                        <xsl:call-template name="display-time">
-                            <xsl:with-param
-                                name="value"
-                                select="$timeCount" />
-                        </xsl:call-template>
-                    </td>
-                </tr>
-            </xsl:for-each>
-        </table>
-    </xsl:template>
-
-
-    <!-- ================================================================== -->
-    <!-- Write a package level report                                       -->
-    <!-- It creates a table with values from the document:                  -->
-    <!-- Name | Tests | Errors | Failures | Time                            -->
-    <!-- ================================================================== -->
-    <xsl:template name="packages">
-        <!-- create an anchor to this package name -->
-        <xsl:for-each
-            select="/testsuites/testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
-            <xsl:sort select="@package" />
-            <a name="{@package}"></a>
-            <h3>
-                Package
-                <xsl:value-of select="@package" />
-            </h3>
-
-            <table
-                class="details"
-                border="0"
-                cellpadding="5"
-                cellspacing="2"
-                width="95%">
-                <xsl:call-template name="testsuite.test.header" />
-
-                <!-- match the testsuites of this package -->
-                <xsl:apply-templates
-                    select="/testsuites/testsuite[./@package = current()/@package]"
-                    mode="print.test" />
-            </table>
-            <a href="#top">Back to top</a>
-            <p />
-            <p />
-        </xsl:for-each>
-    </xsl:template>
-
-    <xsl:template name="classes">
-        <xsl:for-each select="testsuite">
-            <xsl:sort select="@name" />
-            <!-- create an anchor to this class name -->
-            <a name="{@name}"></a>
-            <h3>
-                TestCase
-                <xsl:value-of select="@name" />
-            </h3>
-
-            <table
-                class="details"
-                border="0"
-                cellpadding="5"
-                cellspacing="2"
-                width="95%">
-                <xsl:call-template name="testcase.test.header" />
-                <!--
-                    test can even not be started at all (failure to load the class)
-                    so report the error directly
-                -->
-                <xsl:if test="./error">
-                    <tr class="Error">
-                        <td colspan="4">
-                            <xsl:apply-templates select="./error" />
-                        </td>
-                    </tr>
-                </xsl:if>
-                <xsl:apply-templates
-                    select="./testcase"
-                    mode="print.test" />
-            </table>
-            <div class="Properties">
-                <a>
-                    <xsl:attribute name="href">javascript:displayProperties('<xsl:value-of
-                            select="@package" />.<xsl:value-of
-                            select="@name" />');</xsl:attribute>
-                    Properties &gt;&gt;
-                </a>
-            </div>
-            <p />
-
-            <a href="#top">Back to top</a>
-        </xsl:for-each>
-    </xsl:template>
-
-    <xsl:template name="summary">
-        <h2>Summary</h2>
-        <xsl:variable
-            name="testCount"
-            select="sum(testsuite/@tests)" />
-        <xsl:variable
-            name="errorCount"
-            select="sum(testsuite/@errors)" />
-        <xsl:variable
-            name="failureCount"
-            select="sum(testsuite/@failures)" />
-        <xsl:variable
-            name="timeCount"
-            select="sum(testsuite/@time)" />
-        <xsl:variable
-            name="successRate"
-            select="($testCount - $failureCount - $errorCount) div $testCount" />
-        <table
-            class="details"
-            border="0"
-            cellpadding="5"
-            cellspacing="2"
-            width="95%">
-            <tr valign="top">
-                <th>Tests</th>
-                <th>Failures</th>
-                <th>Errors</th>
-                <th>Success rate</th>
-                <th>Time</th>
-            </tr>
-            <tr valign="top">
-                <xsl:attribute name="class">
-				<xsl:choose>
-					<xsl:when test="$failureCount &gt; 0">Failure</xsl:when>
-					<xsl:when test="$errorCount &gt; 0">Error</xsl:when>
-				</xsl:choose>
-			</xsl:attribute>
-                <td>
-                    <xsl:value-of select="$testCount" />
-                </td>
-                <td>
-                    <xsl:value-of select="$failureCount" />
-                </td>
-                <td>
-                    <xsl:value-of select="$errorCount" />
-                </td>
-                <td>
-                    <xsl:call-template name="display-percent">
-                        <xsl:with-param
-                            name="value"
-                            select="$successRate" />
-                    </xsl:call-template>
-                </td>
-                <td>
-                    <xsl:call-template name="display-time">
-                        <xsl:with-param
-                            name="value"
-                            select="$timeCount" />
-                    </xsl:call-template>
-                </td>
-
-            </tr>
-        </table>
-        <table
-            border="0"
-            width="95%">
-            <tr>
-                <td style="text-align: justify;">
-                    Note:
-                    <i>failures</i>
-                    are anticipated and checked for with assertions
-                    while
-                    <i>errors</i>
-                    are unanticipated.
-                </td>
-            </tr>
-        </table>
-    </xsl:template>
-
-    <!--
-        Write properties into a JavaScript data structure.
-        This is based on the original idea by Erik Hatcher (erik@hatcher.net)
-    -->
-    <xsl:template match="properties">
-        cur = TestCases['
-        <xsl:value-of select="../@package" />
-        .
-        <xsl:value-of select="../@name" />
-        '] = new Array();
-        <xsl:for-each select="property">
-            <xsl:sort select="@name" />
-            cur['
-            <xsl:value-of select="@name" />
-            '] = '
-            <xsl:call-template name="JS-escape">
-                <xsl:with-param
-                    name="string"
-                    select="@value" />
-            </xsl:call-template>
-            ';
-        </xsl:for-each>
-    </xsl:template>
-
-    <!-- Page HEADER -->
-    <xsl:template name="pageHeader">
-        <h1>Unit Test Results</h1>
-        <table width="100%">
-            <tr>
-                <td align="left"></td>
-                <td align="right">
-                    Designed for use with
-                    <a href='http://www.junit.org'>JUnit</a>
-                    and
-                    <a href='http://jakarta.apache.org/ant'>Ant</a>
-                    .
-                </td>
-            </tr>
-        </table>
-        <hr size="1" />
-    </xsl:template>
-
-    <xsl:template
-        match="testsuite"
-        mode="header">
-        <tr valign="top">
-            <th width="80%">Name</th>
-            <th>Tests</th>
-            <th>Errors</th>
-            <th>Failures</th>
-            <th nowrap="nowrap">Time(s)</th>
-        </tr>
-    </xsl:template>
-
-    <!-- class header -->
-    <xsl:template name="testsuite.test.header">
-        <tr valign="top">
-            <th width="80%">Name</th>
-            <th>Tests</th>
-            <th>Errors</th>
-            <th>Failures</th>
-            <th nowrap="nowrap">Time(s)</th>
-        </tr>
-    </xsl:template>
-
-    <!-- method header -->
-    <xsl:template name="testcase.test.header">
-        <tr valign="top">
-            <th>Name</th>
-            <th>Status</th>
-            <th width="80%">Type</th>
-            <th nowrap="nowrap">Time(s)</th>
-        </tr>
-    </xsl:template>
-
-
-    <!-- class information -->
-    <xsl:template
-        match="testsuite"
-        mode="print.test">
-        <tr valign="top">
-            <!-- set a nice color depending if there is an error/failure -->
-            <xsl:attribute name="class">
-			<xsl:choose>
-				<xsl:when test="@failures[.&gt; 0]">Failure</xsl:when>
-				<xsl:when test="@errors[.&gt; 0]">Error</xsl:when>
-			</xsl:choose>
-		</xsl:attribute>
-
-            <!-- print testsuite information -->
-            <td>
-                <a href="#{@name}">
-                    <xsl:value-of select="@name" />
-                </a>
-            </td>
-            <td>
-                <xsl:value-of select="@tests" />
-            </td>
-            <td>
-                <xsl:value-of select="@errors" />
-            </td>
-            <td>
-                <xsl:value-of select="@failures" />
-            </td>
-            <td>
-                <xsl:call-template name="display-time">
-                    <xsl:with-param
-                        name="value"
-                        select="@time" />
-                </xsl:call-template>
-            </td>
-        </tr>
-    </xsl:template>
-
-    <xsl:template
-        match="testcase"
-        mode="print.test">
-        <tr valign="top">
-            <xsl:attribute name="class">
-			<xsl:choose>
-				<xsl:when test="failure | error">Error</xsl:when>
-			</xsl:choose>
-		</xsl:attribute>
-            <td>
-                <xsl:value-of select="@name" />
-            </td>
-            <xsl:choose>
-                <xsl:when test="failure">
-                    <td>Failure</td>
-                    <td>
-                        <xsl:apply-templates select="failure" />
-                    </td>
-                </xsl:when>
-                <xsl:when test="error">
-                    <td>Error</td>
-                    <td>
-                        <xsl:apply-templates select="error" />
-                    </td>
-                </xsl:when>
-                <xsl:otherwise>
-                    <td>Success</td>
-                    <td></td>
-                </xsl:otherwise>
-            </xsl:choose>
-            <td>
-                <xsl:call-template name="display-time">
-                    <xsl:with-param
-                        name="value"
-                        select="@time" />
-                </xsl:call-template>
-            </td>
-        </tr>
-    </xsl:template>
-
-
-    <xsl:template match="failure">
-        <xsl:call-template name="display-failures" />
-    </xsl:template>
-
-    <xsl:template match="error">
-        <xsl:call-template name="display-failures" />
-    </xsl:template>
-
-    <!-- Style for the error and failure in the tescase template -->
-    <xsl:template name="display-failures">
-        <xsl:choose>
-            <xsl:when test="not(@message)">N/A</xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of select="@message" />
-            </xsl:otherwise>
-        </xsl:choose>
-        <!-- display the stacktrace -->
-        <code>
-            <p />
-            <xsl:call-template name="br-replace">
-                <xsl:with-param
-                    name="word"
-                    select="." />
-            </xsl:call-template>
-        </code>
-        <!-- the later is better but might be problematic for non-21" monitors... -->
-        <!--pre><xsl:value-of select="."/></pre-->
-    </xsl:template>
-
-    <xsl:template name="JS-escape">
-        <xsl:param name="string" />
-        <xsl:choose>
-            <!-- something isn't right here, basically all single quotes need to be replaced with backslash-single-quote
-                <xsl:when test="contains($string,'&apos;')">
-                <xsl:value-of select="substring-before($string,'&apos;')"/>
-                \&apos;
-                <xsl:call-template name="JS-escape">
-                <xsl:with-param name="string" select="substring-after($string,'&apos;')"/>
-                </xsl:call-template>
-                </xsl:when> -->
-            <xsl:when test="contains($string,'\')">
-                <xsl:value-of select="substring-before($string,'\')" />
-                \\
-                <xsl:call-template name="JS-escape">
-                    <xsl:with-param
-                        name="string"
-                        select="substring-after($string,'\')" />
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of select="$string" />
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-
-    <!--
-        template that will convert a carriage return into a br tag
-        @param word the text from which to convert CR to BR tag
-    -->
-    <xsl:template name="br-replace">
-        <xsl:param name="word" />
-        <xsl:choose>
-            <xsl:when test="contains($word,'&#xA;')">
-                <xsl:value-of select="substring-before($word,'&#xA;')" />
-                <br />
-                <xsl:call-template name="br-replace">
-                    <xsl:with-param
-                        name="word"
-                        select="substring-after($word,'&#xA;')" />
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of select="$word" />
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-    <xsl:template name="display-time">
-        <xsl:param name="value" />
-        <xsl:value-of select="format-number($value,'0.000')" />
-    </xsl:template>
-
-    <xsl:template name="display-percent">
-        <xsl:param name="value" />
-        <xsl:value-of select="format-number($value,'0.00%')" />
-    </xsl:template>
-
-</xsl:stylesheet>
-
diff --git a/releng.wtpbuilder/distribution/patches2.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/patches2.tests/testScripts/test.xml
deleted file mode 100644
index 5e82a75..0000000
--- a/releng.wtpbuilder/distribution/patches2.tests/testScripts/test.xml
+++ /dev/null
@@ -1,1067 +0,0 @@
-<project
-    name="Automated Eclipse Testing"
-    default="all"
-    basedir=".">
-    <property
-        environment="env"/>
-    <echo
-        level="info"
-        message="starting Automated Eclipse Testing"/>
-    <echo
-        level="debug"
-        message="basedir: ${basedir}"/>
-    <echo
-        level="debug"
-        message="testRoot: ${testRoot}"/>
-    <fail
-        message="testRoot must be set"
-        unless="testRoot"/>
-
-    <!--properties file containing the some server name properties -->
-    <property
-        file="${testRoot}/testServer.properties"/>
-
-    <!--properties file containing the build information-->
-    <property
-        file="${buildDirectory}/label.properties"/>
-
-    <!--default directory where test-eclipse will be installed-->
-    <property
-        name="install"
-        value="${testRoot}"/>
-    <!--
-        name that can be added to report name to identify which platform
-        tests results come from
-    -->
-    <property
-        name="platform"
-        value=""/>
-
-    <!-- The root of the eclipse installation -->
-    <property
-        name="eclipse-home"
-        value="${testRoot}/eclipse"/>
-    <!--
-        The directory that will contain the xml and html results from
-        the tests that are run
-    -->
-    <property
-        name="results"
-        value="${testRoot}/results"/>
-
-    <!-- jonas install directory -->
-    <property
-        name="jonas432Dir"
-        value="${testRoot}/${jonas432DirName}"/>
-    <target
-        name="init">
-        <antcall
-            target="setPropertyJOnAS432Dir"/>
-        <antcall
-            target="computePluginVersion"/>
-        <property
-            file="${testRoot}/test2.properties"/>
-    </target>
-    <target
-        name="setPropertyJOnAS432Dir"
-        unless="jonas432Dir">
-        <property
-            name="jonas432Dir"
-            value="${testRoot}/${jonas432DirName}"/>
-    </target>
-    <target
-        name="setup"
-        if="clean"
-        description="Reinstall the test Eclipse installation if specified by user">
-        <delete
-            dir="${install}"/>
-        <mkdir
-            dir="${install}"/>
-        <exec
-            dir="."
-            executable="unzip">
-            <arg
-                line="-o -qq ../downloads/*.zip -d ${install}"/>
-        </exec>
-        <exec
-            dir="."
-            executable="unzip">
-            <arg
-                line="-o -qq  wtp-wst-tests-feature*.zip -d ${install}"/>
-        </exec>
-    </target>
-    <target
-        name="runapitests"
-        depends="setup">
-        <antcall
-            target="runtests"/>
-    </target>
-    <target
-        name="runtests"
-        depends="setup"
-        description="Runs ant on the test.xml for a specified plugin.">
-        <available
-            file="${eclipse-home}/plugins/${testPlugin}/test.xml"
-            property="test.xml.exists"/>
-        <antcall
-            target="runtests2"/>
-    </target>
-    <target
-        name="runtests2"
-        if="test.xml.exists">
-        <antcall
-            target="runtests-normal"/>
-        <copy
-            file="${eclipse-home}/${report}.xml"
-            tofile="${results}/xml/${report}_${platform}.xml"
-            failonerror="false"/>
-        <antcall
-            target="genHtml"/>
-    </target>
-    <target
-        name="runtests-normal">
-        <ant
-            antfile="${eclipse-home}/plugins/${testPlugin}/test.xml"
-            dir="${eclipse-home}">
-            <property
-                name="library-file"
-                value="${testRoot}/wtp-junit-tests.xml"/>
-        </ant>
-        <copy
-            file="${eclipse-home}/${report}.xml"
-            tofile="${results}/xml/${report}_${platform}.xml"
-            failonerror="false"/>
-        <antcall
-            target="genHtml"/>
-    </target>
-    <target
-        name="wst-server-tests"
-        depends="init"
-        description="Runs the org.eclipse.wst.server.*.tests test.xml">
-        <antcall
-            target="runapitests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.server.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.server.core.tests"/>
-            <param
-                name="package.includes"
-                value="org.eclipse.wst.server"/>
-        </antcall>
-        <antcall
-            target="runapitests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.server.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.server.ui.tests"/>
-            <param
-                name="package.includes"
-                value="org.eclipse.wst.server"/>
-        </antcall>
-    </target>
-    <target
-        name="wst-monitor-tests"
-        depends="init"
-        description="Runs the org.eclipse.wst.internet.monitor.*.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.internet.monitor.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.internet.monitor.core.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.internet.monitor.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.internet.monitor.ui.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="wst-cache-tests"
-        depends="init"
-        description="Runs the org.eclipse.wst.internet.cache.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.internet.cache.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.internet.cache.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="jst-server-tests"
-        depends="init"
-        description="Runs the org.eclipse.jst.server.*.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.server.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.server.core.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.server.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.server.ui.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="jst-server-tomcat-tests"
-        depends="init"
-        description="Runs the org.eclipse.jst.server.tomcat.*.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.server.tomcat.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.server.tomcat.core.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.server.tomcat.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.server.tomcat.ui.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="jst-server-generic-tests"
-        depends="init"
-        description="Runs the org.eclipse.jst.server.generic.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.server.generic.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.server.generic.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="jst-server-geronimo-tests"
-        depends="init"
-        description="Runs the org.eclipse.jst.server.geronimo.*.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.server.geronimo.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.server.geronimo.core.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.server.geronimo.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.server.geronimo.ui.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="jst-jem-tests"
-        depends="init"
-        description="Runs the org.eclipse.jem.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jem.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jem.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="jst-j2ee-core-tests"
-        depends="init"
-        description="Runs the org.eclipse.jst.j2ee.core.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.j2ee.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.j2ee.core.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="jst-j2ee-tests"
-        depends="init"
-        description="Runs the org.eclipse.jst.j2ee.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.j2ee.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.j2ee.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="wst-common-tests"
-        depends="init"
-        description="Runs the org.eclipse.jst.j2ee.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.common.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.common.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="wst-common-snippets-tests"
-        depends="init">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.common.snippets.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.common.snippets.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="jst-servlet-tests"
-        depends="init"
-        description="Runs the org.eclipse.jst.servlet.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.servlet.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.servlet.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="jst-validation-framework-tests"
-        depends="init"
-        description="Runs the org.eclipse.jst.validation.test test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.validation.test}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.validation.test"/>
-        </antcall>
-    </target>
-
-    <!-- JSP TESTS -->
-    <target
-        name="jst-jsp-tests"
-        depends="init"
-        description="Runs test.xml for JSP tests">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.jsp.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.jsp.core.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.jsp.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.jsp.ui.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.jsp.tests.encoding}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.jsp.tests.encoding"/>
-        </antcall>
-    </target>
-
-    <!-- SSE TESTS -->
-    <target
-        name="wst-sse-tests"
-        depends="init"
-        description="Runs test.xml for SSE tests">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.sse.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.sse.core.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.sse.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.sse.ui.tests"/>
-        </antcall>
-    </target>
-
-    <!-- XML TESTS -->
-    <target
-        name="wst-xml-tests"
-        depends="init"
-        description="Runs test.xml for XML tests">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.xml.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.xml.core.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.xml.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.xml.ui.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.xml.tests.encoding}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.xml.tests.encoding"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.xml.validation.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.xml.validation.tests"/>
-        </antcall>
-    </target>
-
-    <!-- WSDL TESTS -->
-    <target
-        name="wst-wsdl-tests"
-        depends="init"
-        description="Runs test.xml for WSDL ">
-        <antcall
-            target="runapitests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.wsdl.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.wsdl.tests"/>
-            <param
-                name="package.includes"
-                value="org.eclipse.wst.wsdl"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.wsdl.validation.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.wsdl.validation.tests"/>
-        </antcall>
-    </target>
-
-    <!-- WSI TESTS -->
-    <target
-        name="wst-wsi-tests"
-        depends="init"
-        description="Runs test.xml for WSI tests">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.wsi.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.wsi.tests"/>
-        </antcall>
-    </target>
-
-    <!-- XSD TESTS -->
-    <target
-        name="wst-xsd-tests"
-        depends="init"
-        description="Runs test.xml for XSD tests ">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.xsd.validation.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.xsd.validation.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.xsd.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.xsd.core.tests"/>
-        </antcall>
-    </target>
-
-    <!-- HTML TESTS -->
-    <target
-        name="wst-html-tests"
-        depends="init"
-        description="Runs test.xml for HTML tests">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.html.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.html.core.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.html.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.html.ui.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.html.tests.encoding}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.html.tests.encoding"/>
-        </antcall>
-    </target>
-
-    <!-- DTD Tests -->
-    <target
-        name="wst-dtd-tests"
-        depends="init">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.dtd.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.dtd.ui.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.dtd.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.dtd.core.tests"/>
-        </antcall>
-    </target>
-
-    <!-- CSS TESTS -->
-    <target
-        name="wst-css-tests"
-        depends="init"
-        description="Runs test.xml for
-                                                                                                org.eclipse.wst.css.core.tests
-                                                                                                org.eclipse.wst.css.ui.tests
-                                                                                                org.eclipse.wst.css.tests.encoding">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.css.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.css.core.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.css.tests.encoding}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.css.tests.encoding"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.css.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.css.ui.tests"/>
-        </antcall>
-    </target>
-
-    <!-- JSF TESTS -->
-    <target
-        name="jsf-tests"
-        depends="init"
-        description="Runs test.xml for org.eclipse.jst.jsf.core.tests, org.eclipse.jst.jsf.ui.tests">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.jsf.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.jsf.core.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.jsf.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.jsf.ui.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.jsf.metadata.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.jsf.metadata.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.jsf.contentassist.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.jsf.contentassist.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.jsf.context.symbol.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.jsf.context.symbol.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.jsf.designtime.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.jsf.designtime.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.jsf.facesconfig.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.jsf.facesconfig.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.jsf.facesconfig.ui.test}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.jsf.facesconfig.ui.test"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.jsf.validation.el.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.jsf.validation.el.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.pagedesigner.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.pagedesigner.tests"/>
-        </antcall>
-    </target>
-
-    <!-- WS TESTS -->
-    <target
-        name="wst-ws-tests"
-        depends="init"
-        description="Runs the org.eclipse.wst.ws.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.ws.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.ws.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="jst-ws-tests"
-        depends="init"
-        description="Runs the org.eclipse.jst.ws.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.ws.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.ws.tests"/>
-        </antcall>
-    </target>
-
-    <!-- Faceted Project Framework Tests -->
-    <target
-        name="wst-facets-tests"
-        depends="init"
-        description="Runs the Faceted Project Framework tests.">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.common.project.facet.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.common.project.facet.core.tests"/>
-        </antcall>
-    </target>
-
-    <!-- Dali tests -->
-    <target
-        name="jpt-utility-tests"
-        depends="init"
-        description="Runs the org.eclipse.jpt.utility.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jpt.utility.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jpt.utility.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="dali-core-tests"
-        description="Runs the org.eclipse.jpt.core.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jpt.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jpt.core.tests"/>
-        </antcall>
-    </target>
-
-    <!-- JSDT tests -->
-    <target
-        name="jsdt-tests"
-        depends="init"
-        description="Runs the org.eclipse.wst.jsdt.core.test.* test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.jsdt.core.tests.compiler}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.jsdt.core.tests.compiler"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.jsdt.core.tests.model}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.jsdt.core.tests.model"/>
-        </antcall>
-    </target>
-
-	
-    <!-- releng Tests -->
-    <target
-        name="releng-tests"
-        depends="init"
-        description="Runs the releng tests.">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wtp.releng.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wtp.releng.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="all"
-        depends="init">
-        <echo
-            level="info"
-            message="Starting WTP Unit Tests"/>
-        <echo
-            level="info"
-            message="Starting releng tests"/>
-        <antcall
-            target="releng-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-server-tests"/>
-        <antcall
-            target="wst-server-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-monitor-tests"/>
-        <antcall
-            target="wst-monitor-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-cache-tests"/>
-        <antcall
-            target="wst-cache-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-common-tests"/>
-        <antcall
-            target="wst-common-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-common-snippets-tests"/>
-        <antcall
-            target="wst-common-snippets-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-sse-tests"/>
-        <antcall
-            target="wst-sse-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-xml-tests"/>
-        <antcall
-            target="wst-xml-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-wsdl-tests"/>
-        <antcall
-            target="wst-wsdl-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-wsi-tests"/>
-        <antcall
-            target="wst-wsi-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-xsd-tests"/>
-        <antcall
-            target="wst-xsd-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-html-tests"/>
-        <antcall
-            target="wst-html-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-dtd-tests"/>
-        <antcall
-            target="wst-dtd-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-css-tests"/>
-        <antcall
-            target="wst-css-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-ws-tests"/>
-        <antcall
-            target="wst-ws-tests"/>
-        <echo
-            level="info"
-            message="Starting jst-server-tests"/>
-        <antcall
-            target="jst-server-tests"/>
-        <echo
-            level="info"
-            message="Starting jst-server-tomcat-tests"/>
-        <antcall
-            target="jst-server-tomcat-tests"/>
-        <echo
-            level="info"
-            message="Starting jst-server-geronimo-tests"/>
-        <antcall
-            target="jst-server-geronimo-tests"/>
-        <echo
-            level="info"
-            message="Starting jst-server-generic-tests"/>
-        <antcall
-            target="jst-server-generic-tests"/>
-        <echo
-            level="info"
-            message="Starting jst-jem-tests"/>
-        <antcall
-            target="jst-jem-tests"/>
-        <echo
-            level="info"
-            message="Starting jst-j2ee-core-tests"/>
-        <antcall
-            target="jst-j2ee-core-tests"/>
-        <echo
-            level="info"
-            message="Starting jst-j2ee-tests"/>
-        <antcall
-            target="jst-j2ee-tests"/>
-        <echo
-            level="info"
-            message="Starting jst-validation-framework-tests"/>
-        <antcall
-            target="jst-validation-framework-tests"/>
-        <echo
-            level="info"
-            message="Starting jst-jsp-tests"/>
-        <antcall
-            target="jst-jsp-tests"/>
-        <echo
-            level="info"
-            message="Starting jst-ws-tests"/>
-        <antcall
-            target="jst-ws-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-facets-tests"/>
-        <antcall
-            target="wst-facets-tests"/>
-        <echo
-            level="info"
-            message="Starting JPT Unit Tests"/>
-        <echo
-            level="info"
-            message="Starting jpt-utility-tests"/>
-        <antcall
-            target="jpt-utility-tests"/>
-        <echo
-            level="info"
-            message="Starting dali-core-tests"/>
-        <antcall
-            target="dali-core-tests"/>
-        <echo
-            level="info"
-            message="Ended JPT Unit Tests"/>
-        <echo
-            level="info"
-            message="Starting JSF Tests"/>
-        <antcall
-            target="jsf-tests"/>
-        <echo
-            level="info"
-            message="Ended WTP Unit Tests"/>
-        <echo
-            level="info"
-            message="Starting JSDT Tests"/>
-        <antcall
-            target="jsdt-tests"/>
-        <echo
-            level="info"
-            message="Ended JSDT Unit Tests"/>
-    </target>
-    <target
-        name="genHtml"
-        description="Generates HTML results with provided JUNIT.XSL provided"
-        unless="genHtml.disable">
-        <xslt
-            style="JUNIT.XSL"
-            basedir="${results}/xml"
-            destdir="${results}/html"/>
-    </target>
-    <target
-        name="computePluginVersion"
-        depends="test2properties"
-        unless="test2propertiesexists">
-        <java
-            classname="org.eclipse.wtp.releng.test.ComputePluginVersion">
-            <classpath>
-                <pathelement
-                    location="ComputePluginVersion.jar"/>
-            </classpath>
-            <arg
-                value="${testRoot}/eclipse/plugins"/>
-            <arg
-                value="${testRoot}/test2.properties"/>
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-        </java>
-    </target>
-    <target
-        name="test2properties">
-        <condition
-            property="test2propertiesexists">
-            <available
-                file="${testRoot}/test2.properties"/>
-        </condition>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches2.tests/testScripts/testServer.properties b/releng.wtpbuilder/distribution/patches2.tests/testScripts/testServer.properties
deleted file mode 100644
index ad56274..0000000
--- a/releng.wtpbuilder/distribution/patches2.tests/testScripts/testServer.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-
-# Tomcat dirs
-tomcat50Dir=jakarta-tomcat-5.0.28
-
-# Jonas dirs
-#jonas432Dir=
-jonas432DirName=JONAS_4_3_2
-
-# SWT
-#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
-
-#JSF Runrime Library directory
-jsf1.1Dir=myfaces-core-1.1.5/lib
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches2.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/patches2.tests/testScripts/wtp-junit-tests.xml
deleted file mode 100644
index 4c84e54..0000000
--- a/releng.wtpbuilder/distribution/patches2.tests/testScripts/wtp-junit-tests.xml
+++ /dev/null
@@ -1,299 +0,0 @@
-<?xml version="1.0"?>
-<project
-    name="JUnit tests"
-    basedir=".">
-    <property
-        environment="env"/>
-    <target
-        name="init">
-        <!--
-            Parameters: (Mandatory) data-dir - the workspace directory
-            for Eclipse to write its data plugin-name - symboic name of
-            the plugin to test testPlugin - directory name of plugin
-            (with version suffix) classname - the name of the test class
-            (Optional - overrides defaults set in script) extraVMargs -
-            allows separate setting of VM args from separate caller.
-            timeout - overrides default test timeout value (in
-            milliseconds).
-        -->
-        <property
-            name="junit-report-output"
-            value="${testRoot}/results"/>
-        <mkdir
-            dir="${junit-report-output}/raw"/>
-        <!--
-            if not otherwise set, be sure extraVMargs is at least empty
-            string
-        -->
-        <property
-            name="extraVMargs"
-            value=""/>
-
-        <!-- if not otherwise set, use a unique workspace name -->
-        <property
-            name="data-dir"
-            value="${testRoot}/junitworkspaces/workspace-${classname}"/>
-        <property
-            name="testRoot"
-            value="${testRoot}"/>
-        <property
-            name="timeout"
-            value="1800000"/>
-        <property
-            name="junit-report-output"
-            value="${junit-report-output}"/>
-        <property
-            name="plugin-path"
-            value="${testRoot}/plugins/${testPlugin}"/>
-        <property
-            name="formatter"
-            value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter"/>
-        <property
-            name="test-output"
-            value="${junit-report-output}/raw/${classname}.xml"/>
-        <property
-            name="jvm"
-            value="${env.JAVA_5_HOME}/bin/java"/>
-        <dirname
-            file="${ant.file}"
-            property="currentDir"/>
-        <echo
-            level="debug"
-            message="data-dir: ${data-dir}"/>
-        <echo
-            level="debug"
-            message="plugin-name: ${plugin-name}"/>
-        <echo
-            level="debug"
-            message="testPlugin: ${testPlugin}"/>
-        <echo
-            level="debug"
-            message="classname: ${classname}"/>
-        <echo
-            level="debug"
-            message="extraVMargs: ${extraVMargs}"/>
-        <echo
-            level="debug"
-            message="timeout: ${timeout}"/>
-        <echo
-            level="debug"
-            message="testRoot: ${testRoot}"/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="debug"
-            message="eclipse-home: ${eclipse-home}"/>
-        <echo
-            level="debug"
-            message="plugin-path: ${plugin-path}"/>
-        <echo
-            level="debug"
-            message="junit-report-output: ${junit-report-output}"/>
-        <echo
-            level="debug"
-            message="test-output: ${test-output}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="buildLabel: ${buildLabel}"/>
-        <echo
-            level="debug"
-            message="jvm: ${env.JAVA_5_HOME}/bin/java"/>
-    </target>
-    <target
-        name="core-test"
-        depends="init">
-        <echo
-            level="info"
-            message="test-type: core-test"/>
-        <ant
-            antfile="${ant.file}"
-            dir="${currentDir}"
-            target="eclipse-test">
-            <property
-                name="application"
-                value="org.eclipse.test.coretestapplication"/>
-        </ant>
-    </target>
-    <target
-        name="ui-test"
-        depends="init">
-        <echo
-            level="info"
-            message="test-type: ui-test"/>
-        <ant
-            antfile="${ant.file}"
-            dir="${currentDir}"
-            target="eclipse-test">
-            <property
-                name="application"
-                value="org.eclipse.test.uitestapplication"/>
-        </ant>
-    </target>
-    <target
-        name="eclipse-test"
-        description="Runs the specified classname as a plug-in test.">
-        <echo
-            level="info"
-            message="Running ${classname}"/>
-        <echo
-            level="debug"
-            message="Result file: ${junit-report-output}/${classname}.xml."/>
-        <echo
-            level="debug"
-            message="DISPLAY: ${env.DISPLAY}"/>
-        <!--
-            If there is not exactly one launcher in the stack, we'd best
-            fail fast, since we are not expecting that, and may indicate
-            an installation that would produce unpredictable results
-        -->
-        <!--
-            requires ant 1.7, and at this point, we're running 1.6 from
-            eclipse ... <condition property="expectedNumberOfLaunchers">
-            <resourcecount when="equal" count="1" > <fileset
-            dir="${testRoot}/eclipse/plugins"> <include
-            name="org.eclipse.equinox.launcher_*.jar" /> </fileset>
-            </resourcecount> </condition> <fail message="Did not find
-            expected number of launcher jars. Check installation."
-            unless="expectedNumberOfLaunchers" />
-        -->
-        <java
-            taskname="suiteUnitTest"
-            fork="true"
-            resultProperty="suitejunitresult"
-            failonerror="false"
-            timeout="${timeout}"
-            dir="${testRoot}/eclipse"
-            jvm="${env.JAVA_5_HOME}/bin/java"
-            classname="org.eclipse.equinox.launcher.Main">
-            <classpath>
-                <fileset
-                    dir="${testRoot}/eclipse/plugins">
-                    <include
-                        name="org.eclipse.equinox.launcher_*.jar"/>
-                </fileset>
-            </classpath>
-            <jvmarg
-                value="-Xmx758m"/>
-            <jvmarg
-                value="-Dosgi.ws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dosgi.os=${env.BASEOS}"/>
-            <jvmarg
-                value="-Dosgi.arch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-DbuildLabel=${buildLabel}"/>
-            <jvmarg
-                value="-DbuildDirectory=${buildDirectory}"/>
-            <jvmarg
-                value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
-            <jvmarg
-                value="-DurlLogLocation=${buildDirectory}/outgoinghttplogfromtests.log"/>
-            <jvmarg
-                value="-Dwtp.autotest.noninteractive=true"/>
-            <jvmarg
-                value="-DPLUGIN_PATH=${plugin-path}"/>
-            <jvmarg
-                line="${extraVMargs}"/>
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <jvmarg
-                value="-Dprojectname=${projectname}"/>
-            <arg
-                value="-nosplash"/>
-            <arg
-                value="-consolelog"/>
-            <arg
-                value="-debug"/>
-            <arg
-                value="-data"/>
-            <arg
-                value="${data-dir}"/>
-            <arg
-                value="-application"/>
-            <arg
-                value="${application}"/>
-            <arg
-                value="formatter=${formatter},${test-output}"/>
-            <arg
-                value="-testPluginName"/>
-            <arg
-                value="${plugin-name}"/>
-            <arg
-                value="-className"/>
-            <arg
-                value="${classname}"/>
-            <env
-                key="DISPLAY"
-                value="${env.DISPLAY}"/>
-            <redirector
-                output="${junit-report-output}/${classname}.output.txt"
-                error="${junit-report-output}/${classname}.error.txt"/>
-        </java>
-        <echo
-            level="info"
-            message="suitejunitresult: ${suitejunitresult}"/>
-        <antcall
-            target="summarizeFailure"/>
-        <antcall
-            target="collect-results"/>
-    </target>
-    <target
-        name="collect-results">
-        <dirname
-            property="output-dir"
-            file="${test-output}"/>
-        <basename
-            property="output-file-name"
-            file="${test-output}"/>
-        <mkdir
-            dir="${junit-report-output}/xml"/>
-        <junitreport
-            todir="${junit-report-output}/xml"
-            tofile="${classname}.xml">
-            <fileset
-                dir="${output-dir}">
-                <include
-                    name="${output-file-name}"/>
-            </fileset>
-        </junitreport>
-        <mkdir
-            dir="${junit-report-output}/html"/>
-        <xslt
-            style="${testRoot}/JUNIT.XSL"
-            basedir="${junit-report-output}"
-            includes="${classname}.xml"
-            destdir="${junit-report-output}/html"/>
-
-    </target>
-    <target
-        name="collect">
-        <!--
-            deprecated, each test.xml uses it, and we should remove,
-            eventually
-        -->
-    </target>
-    <target
-        name="summarizeFailure"
-        depends="checkFailure"
-        if="doFailure">
-        <echo
-            append="true"
-            file="${buildDirectory}/junitFailureList.log">${plugin-name}${line.separator}</echo>
-    </target>
-    <target
-        name="checkFailure">
-        <condition
-            property="doFailure">
-            <not>
-                <equals
-                    arg1="${suitejunitresult}"
-                    arg2="0"
-                    trim="true"/>
-            </not>
-        </condition>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches2.tests/testdependency.xml b/releng.wtpbuilder/distribution/patches2.tests/testdependency.xml
deleted file mode 100644
index fbed0e9..0000000
--- a/releng.wtpbuilder/distribution/patches2.tests/testdependency.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-    <target
-        name="get">
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </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="eclipse"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="eclipseTestFramework"/>
-        </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>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="jsf.1_1"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp-wst-test"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp-jst-test"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstall">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches3.build/build.xml b/releng.wtpbuilder/distribution/patches3.build/build.xml
deleted file mode 100644
index 11e7ff0..0000000
--- a/releng.wtpbuilder/distribution/patches3.build/build.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<project
-    default="build"
-    basedir=".">
-    <fail
-        unless="wtp.builder.home"/>
-    <property
-        file="${wtp.builder.home}/build.properties"/>
-    <property
-        environment="env"/>
-
-    <!-- required to get proper value of doCreateFprojZips -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-
-    <!-- main -->
-    <target
-        name="build"
-        depends="getBaseBuilder">
-        <dirname
-            file="${ant.file}"
-            property="distribution.wtp.build.dir"/>
-        <property
-            name="buildTargets"
-            value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
-        <!--
-            if not otherwise set, assume its a legacy case that did not
-            use this
-        -->
-        <property
-            name="env.DEP_DIR"
-            value=""/>
-        <property
-            name="dependency.properties"
-            value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-
-        <!-- calling label.xml to createg label.properties file -->
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-        <echo
-            level="info"
-            message="invoking buildTargets: ${buildTargets} to build for each component"/>
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="wtp-patches3"/>
-        </ant>
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="wtp-patches3-tests"/>
-        </ant>
-    </target>
-    <target
-        name="getBaseBuilder"
-        if="eclipse.builder.fetch">
-        <dirname
-            file="${ant.file}"
-            property="wtbuilder.dir"/>
-        <property
-            name="buildTargets"
-            value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
-        <!-- delete dir="${pde.builder.path}" failonerror="false"/ -->
-        <ant
-            antfile="${buildTargets}"
-            target="getBaseBuilder"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches3.site/build.xml b/releng.wtpbuilder/distribution/patches3.site/build.xml
deleted file mode 100644
index 4748e65..0000000
--- a/releng.wtpbuilder/distribution/patches3.site/build.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-<project
-    name="Build specific targets and properties"
-    default="build"
-    basedir=".">
-    <!--
-        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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- = = = end standard properties pattern = = = -->
-    <echo
-        message="ant.file: ${ant.file}"/>
-    <target
-        name="build">
-        <java
-            jar="${eclipse.launcher}"
-            fork="true"
-            failonerror="true">
-            <jvmarg
-                value="-Dosgi.ws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dosgi.os=${env.BASEOS}"/>
-            <jvmarg
-                value="-Dosgi.arch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-Dbuild.donottagmaps=${build.donottagmaps}"/>
-            <jvmarg
-                value="-DbuildBranch=${buildBranch}"/>
-            <jvmarg
-                value="-DbuildType=${buildType}"/>
-            <jvmarg
-                value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
-            <jvmarg
-                value="-DurlLogLocation=${buildDirectory}/outgoinghttplogfromsitebuild.log"/>
-            <jvmarg
-                value="-DbuildId=${buildId}"/>
-            <jvmarg
-                value="-DmapVersionTag=${mapVersionTag}"/>
-            <jvmarg
-                value="-Dbuild.distribution=${build.distribution}"/>
-            <jvmarg
-                value="-DbuildDirectory=${buildDirectory}"/>
-            <jvmarg
-                value="-Dwtp.builder.home=${wtp.builder.home}"/>
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <jvmarg
-                value="-Dprojectname=${projectname}"/>
-            <arg
-                value="-data"/>
-            <arg
-                value="${basedir}/workspace"/>
-            <arg
-                value="-application"/>
-            <arg
-                value="org.eclipse.ant.core.antRunner"/>
-            <arg
-                value="-buildfile"/>
-            <arg
-                value="${ant.file}"/>
-            <arg
-                value="publish"/>
-        </java>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Steps to do to publish the build results -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="publish">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-        <property
-            file="${buildDirectory}/label.properties"/>
-        <property
-            name="publish.xml"
-            value="${component.dir}/publish.xml"/>
-        <property
-            name="indexFileName"
-            value="index.php"/>
-        <property
-            name="result"
-            value="${buildDirectory}/${buildLabel}"/>
-        <property
-            name="indexTemplateFilename"
-            value="index.html.template.php"/>
-        <copy
-            file="${wtp.builder.home}/distribution/wtp.site/templateFiles/${indexTemplateFilename}"
-            tofile="${buildDirectory}/${indexFileName}"/>
-        <property
-            name="indexFileName"
-            value="index.php"/>
-        <property
-            name="result"
-            value="${buildDirectory}/${buildLabel}"/>
-        <property
-            name="indexTemplateFilename"
-            value="index.html.template.php"/>
-        <copy
-            file="${wtp.builder.home}/distribution/patches.site/templateFiles/${indexTemplateFilename}"
-            tofile="${buildDirectory}/${indexFileName}"/>
-        <condition
-            property="isBuildTested"
-            value="true">
-            <available
-                file="${buildDirectory}/${buildLabel}/testResults/html"/>
-        </condition>
-        <ant
-            antfile="${publish.xml}"
-            dir="${component.dir}">
-            <property
-                name="dropTokenList"
-                value="%wtpruntime%,%wtpsdk%,%wtptest%,%wst%,%wst-sdk%,%wst-tests%,%jst-tests%,%wst-perf-tests%,%jst-perf-tests%,%jpt-runtime%,%jpt-sdk%,%jpt-tests%"/>
-            <property
-                name="webtoolsDownloadURL"
-                value="http://www.eclipse.org/downloads/download.php?file=/webtools/committers/drops"/>
-            <property
-                name="buildBranch"
-                value="${buildBranch}"/>
-            <property
-                name="isBuildTested"
-                value="${isBuildTested}"/>
-            <property
-                name="indexTemplateFilename"
-                value="${indexTemplateFilename}"/>
-        </ant>
-
-        <!--  Get the build map over for the results to point to. -->
-        <copy
-            file="${buildDirectory}/directory.txt"
-            tofile="${result}/directory.txt"/>
-
-        <!-- Copy info for build identification -->
-        <copy
-            file="${buildDirectory}/buildmachineinfo.properties"
-            tofile="${result}/buildmachineinfo.properties"/>
-
-
-        <!-- http access logs -->
-        <copy
-            todir="${result}/"
-            failonerror="false">
-            <fileset
-                dir="${buildDirectory}"
-                includes="*.log"/>
-        </copy>
-
-        <!-- ant build log, from control directory -->
-        <copy
-            todir="${result}/"
-            failonerror="false">
-            <fileset
-                dir="${env.ANT_WORKING}/${projectname}"
-                includes="antBuilderOutput.log"/>
-        </copy>
-
-
-
-        <!-- final count files -->
-        <countBuildFiles
-            sourceDirectory="${buildDirectory}/${buildLabel}"
-            filterString=".zip,.tar.gz"
-            outputFile="${buildDirectory}/${buildLabel}/files.count"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches3.site/compilerXMLOutputToHTML.xsl b/releng.wtpbuilder/distribution/patches3.site/compilerXMLOutputToHTML.xsl
deleted file mode 100644
index ffc7905..0000000
--- a/releng.wtpbuilder/distribution/patches3.site/compilerXMLOutputToHTML.xsl
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet
-    version="1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-    <xsl:output
-        method="html"
-        indent="yes"/>
-    <xsl:template
-        match="/">
-        <html>
-            <body>
-                <xsl:apply-templates
-                    select="compiler"/>
-            </body>
-        </html>
-    </xsl:template>
-    <xsl:template
-        match="compiler">
-        <h2>Compiler Report</h2>
-        <p>
-            Compiler:
-            <xsl:value-of
-                select="@name"/>
-            <xsl:text>   </xsl:text>
-            Version:
-            <xsl:value-of
-                select="@version"/>
-        </p>
-        <xsl:apply-templates
-            select="stats"/>
-        <xsl:apply-templates
-            select="sources"/>
-    </xsl:template>
-    <xsl:template
-        name="stats"
-        match="stats">
-        <p>
-            Number of source files:
-            <xsl:value-of
-                select="count(..//source)"/>
-            Number of classfiles:
-            <xsl:value-of
-                select="number_of_classfiles/@value"/>
-        </p>
-        <p>
-            Problems:
-            <xsl:value-of
-                select="problem_summary/@problems"/>
-            (Errors:
-            <xsl:value-of
-                select="problem_summary/@errors"/>
-            Warnings:
-            <xsl:value-of
-                select="problem_summary/@warnings"/>
-            )
-        </p>
-    </xsl:template>
-    <xsl:template
-        name="sources"
-        match="sources">
-        <xsl:if
-            test="count(source) > 0">
-            <dl>
-                <xsl:for-each
-                    select="source">
-                    <xsl:variable
-                        name="package"
-                        select="normalize-space(@package)">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="path"
-                        select="normalize-space(@path)">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="classname"
-                        select="substring-after($path, $package)">
-                    </xsl:variable>
-                    <xsl:if
-                        test="count(problems) > 0">
-                        <dt
-                            style="font-weight: bold; color: black">
-                            Source File:
-                            <xsl:value-of
-                                select="$package"/>
-                            <xsl:value-of
-                                select="$classname"/>
-                        </dt>
-                        <xsl:apply-templates
-                            select="problems">
-                            <xsl:with-param
-                                name="classname">
-                                <xsl:value-of
-                                    select="$classname"/>
-                            </xsl:with-param>
-                        </xsl:apply-templates>
-                    </xsl:if>
-                </xsl:for-each>
-            </dl>
-        </xsl:if>
-    </xsl:template>
-    <xsl:template
-        match="problems">
-        <xsl:param
-            name="classname"/>
-        <xsl:for-each
-            select="problem">
-            <dd
-                style="font-weight: normal; color: black">
-                <xsl:value-of
-                    select="position()"/>
-                <xsl:text>.  </xsl:text>
-                <xsl:value-of
-                    select="@severity"/>
-                <xsl:text>:  </xsl:text>
-                <xsl:value-of
-                    select="@id"/>
-                <xsl:variable
-                    name="lineNumber"
-                    select="@line">
-                </xsl:variable>
-                <xsl:for-each
-                    select="message">
-                    <p
-                        style="margin-left: +.5in; font-size: -1; margin-top: 0;margin-bottom:0;">
-                        <small>
-                            <xsl:value-of
-                                select="@value"/>
-                        </small>
-                    </p>
-                </xsl:for-each>
-                <xsl:for-each
-                    select="source_context">
-                    <xsl:variable
-                        name="pre"
-                        select="substring(@value,0,(@sourceStart + 1))">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="main"
-                        select="substring(@value,(@sourceStart + 1),(((@sourceEnd + 1) - (@sourceStart + 1)) + 1))">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="end"
-                        select="substring(@value,(@sourceEnd + 2))">
-                    </xsl:variable>
-                    <p
-                        style="margin-left: +.5in; font-size: -2; margin-top: 0;margin-bottom:0;">
-                        <xsl:value-of
-                            select="substring($classname,2)"/>
-                        :
-                    </p>
-                    <p
-                        style="margin-left: +.5in; font-size: -2;font-family: monospace; margin-top: 0;margin-bottom:0;">
-                        <xsl:value-of
-                            select="$lineNumber"/>
-                        :
-                        <xsl:value-of
-                            select="$pre"/>
-                        <b>
-                            <u>
-                                <xsl:value-of
-                                    select="$main"/>
-                            </u>
-                        </b>
-                        <xsl:value-of
-                            select="$end"/>
-                    </p>
-                </xsl:for-each>
-            </dd>
-        </xsl:for-each>
-    </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches3.site/publish.xml b/releng.wtpbuilder/distribution/patches3.site/publish.xml
deleted file mode 100644
index 52fd152..0000000
--- a/releng.wtpbuilder/distribution/patches3.site/publish.xml
+++ /dev/null
@@ -1,568 +0,0 @@
-<project
-    name="Publish Build"
-    default="default"
-    basedir=".">
-    <!--
-        Properties that must be passed to this script: buildDirectory:
-        Path to perform the build in. (A working directory) buildType:
-        Type of build (nightly, integration etc.) buildId: Build name
-        buildLabel: <buildType>-<buildName>-<timestamp>
-    -->
-    <property
-        environment="env"/>
-    <property
-        name="resultDir"
-        value="${buildDirectory}/${buildLabel}"/>
-    <!--name of generated index page-->
-    <property
-        name="indexFileName"
-        value="index.php"/>
-    <property
-        name="templateDir"
-        value="${wtp.builder.home}/distribution/${build.distribution}.site"/>
-    <property
-        name="resultingIndex"
-        value="${resultDir}/${indexFileName}"/>
-    <echo
-        level="debug"
-        message="resultDir: ${resultDir}"/>
-    <echo
-        level="debug"
-        message="templateDir: ${templateDir}"/>
-    <echo
-        level="debug"
-        message="resultingIndex: ${resultingIndex}"/>
-    <target
-        name="default">
-        <copy
-            overwrite="true"
-            file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/${indexTemplateFilename}"
-            tofile="${resultingIndex}"/>
-        <antcall
-            target="countFiles"/>
-        <antcall
-            target="generateCompileIndex"/>
-        <antcall
-            target="generateJUnitTestsIndex"/>
-        <antcall
-            target="getStaticFiles"/>
-    </target>
-    <target
-        name="generateCompileIndex">
-        <!--
-            <taskdef name="indexResults"
-            classname="org.eclipse.wtp.releng.tools.ResultsSummaryGenerator"
-            />
-        -->
-        <!--
-            isBuildTested: true|false should JUnit plugin test results
-            be used to generate index page dropTokenList: comma
-            separated list of strings which should be replaced by the
-            fileName attribute settings in the testManifest.xml.
-            xmlDirectoryName: path to directory containing JUnit plugin
-            test results in xml format (see doc is org.eclipse.test).
-            dropDirectoryName: path to directory containing the result
-            of the build. testResultsTemplateFileName: path to template
-            file used to generate page with links to JUnit test results
-            testResultsHtmlFileName: name of file which will be
-            generated with links to JUnit test results dropHtmlFileName:
-            name of generated index page hrefTestResultsTargetPath:
-            relative path from index page to directory containing JUnit
-            html test results hrefCompileLogsTargetPath: relative path
-            from index page directory containing compilelogs
-            testManifestFileName: name of xml file containing
-            descriptions of zip types and log files
-        -->
-        <!--
-            if not otherwise set, assume its a legacy case that did not
-            use this
-        -->
-        <property
-            name="env.DEP_DIR"
-            value=""/>
-        <property
-            file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-
-        <!-- create tables of test plugin compiles first -->
-        <summarizeResults
-            isBuildTested="false"
-            includeAll="true"
-            dropTokenList="${dropTokenList}"
-            xmlDirectoryName=""
-            dropDirectoryName="${resultDir}"
-            testResultsTemplateFileName="${templateDir}/templateFiles/testCompileResults.php.template"
-            testResultsHtmlFileName="testCompileResults.php"
-            hrefTestResultsTargetPath=""
-            hrefCompileLogsTargetPath="testcompilelogs"
-            compileLogsDirectoryName="${resultDir}/testcompilelogs"/>
-        <xslt
-            basedir="${resultDir}/testcompilelogs"
-            destdir="${resultDir}/testcompilelogs"
-            includes="**/*.bin.xml"
-            scanincludeddirectories="true"
-            style="compilerXMLOutputToHTML.xsl"
-            force="true"/>
-
-        <!-- create table of code plugins compiles -->
-        <summarizeResults
-            isBuildTested="false"
-            includeAll="true"
-            dropTokenList="${dropTokenList}"
-            xmlDirectoryName=""
-            dropDirectoryName="${resultDir}"
-            testResultsTemplateFileName="${templateDir}/templateFiles/compileResults.php.template"
-            testResultsHtmlFileName="compileResults.php"
-            hrefTestResultsTargetPath="testResults/html"
-            hrefCompileLogsTargetPath="compilelogs"
-            compileLogsDirectoryName="${resultDir}/compilelogs"/>
-        <xslt
-            basedir="${resultDir}/compilelogs"
-            destdir="${resultDir}/compilelogs"
-            includes="**/*.bin.xml"
-            scanincludeddirectories="true"
-            style="compilerXMLOutputToHTML.xsl"
-            force="true"/>
-        <tstamp>
-            <format
-                property="TODAY"
-                pattern="MMMM d, yyyy"/>
-        </tstamp>
-
-        <!--  Insert Build Type descriptor  -->
-        <antcall
-            target="${buildType}"/>
-        <antcall
-            target="writeData"/>
-        <!--
-            Update timestamp on file to permit overwrite through Ant
-            copy task
-        -->
-        <touch
-            file="${resultingIndex}"/>
-    </target>
-    <target
-        name="generateJUnitTestsIndex"
-        depends="checkIfTested"
-        if="doTests">
-        <!--
-            isBuildTested: true|false should JUnit plugin test results
-            be used to generate index page dropTokenList: comma
-            separated list of strings which should be replaced by the
-            fileName attribute settings in the testManifest.xml.
-            xmlDirectoryName: path to directory containing JUnit plugin
-            test results in xml format (see doc is org.eclipse.test).
-            dropDirectoryName: path to directory containing the result
-            of the build. testResultsTemplateFileName: path to template
-            file used to generate page with links to JUnit test results
-            testResultsHtmlFileName: name of file which will be
-            generated with links to JUnit test results dropHtmlFileName:
-            name of generated index page hrefTestResultsTargetPath:
-            relative path from index page to directory containing JUnit
-            html test results hrefCompileLogsTargetPath: relative path
-            from index page directory containing compilelogs
-            testManifestFileName: name of xml file containing
-            descriptions of zip types and log files
-        -->
-        <!--
-            if not otherwise set, assume its a legacy case that did not
-            use this
-        -->
-        <property
-            name="env.DEP_DIR"
-            value=""/>
-        <property
-            file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-
-        <!-- create table of test plugin compiles first -->
-        <!-- set isBuildTested to true for the "compile only" results -->
-        <summarizeResults
-            isBuildTested="true"
-            dropTokenList="${dropTokenList}"
-            dropDirectoryName="${resultDir}"
-            xmlDirectoryName="${resultDir}/testResults/xml"
-            testResultsTemplateFileName="${templateDir}/templateFiles/testResults.php.template"
-            testResultsHtmlFileName="testResults.php"
-            hrefTestResultsTargetPath="testResults/html"
-            compileLogsDirectoryName=""/>
-        <tstamp>
-            <format
-                property="TODAY"
-                pattern="MMMM d, yyyy"/>
-        </tstamp>
-
-        <!--  Insert Build Type descriptor  -->
-        <antcall
-            target="${buildType}"/>
-        <antcall
-            target="writeData"/>
-        <!--
-            Update timestamp on file to permit overwrite through Ant
-            copy task
-        -->
-        <touch
-            file="${resultingIndex}"/>
-    </target>
-    <target
-        name="getStaticFiles">
-        <!--get static files required in the buildLabel directory-->
-        <copy
-            todir="${resultDir}">
-            <fileset
-                dir="${templateDir}/staticDropFiles"/>
-        </copy>
-
-        <!--copy buildnotes from plugin directories-->
-        <mkdir
-            dir="${resultDir}/buildnotes"/>
-        <copy
-            todir="${resultDir}/buildnotes"
-            flatten="true">
-            <fileset
-                dir="${buildDirectory}/plugins"
-                includes="**/buildnotes_*.html"/>
-            <fileset
-                dir="${buildDirectory}/features"
-                includes="**/buildnotes_*.html"/>
-        </copy>
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/full/logIndex.php"/>
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/testLogs/logIndex.php"/>
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/testSysErrorLogs/logIndex.php"/>
-    </target>
-    <target
-        name="updateSite">
-
-
-        <!-- get our authored, tokenized site.xml file -->
-        <copy
-            file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/siteWTP.xml"
-            tofile="${buildDirectory}/${buildLabel}/updateSite/site.xml"
-            overwrite="true"
-            failonerror="true"/>
-        <!--
-            get the ${buildDirectory}/finalPluginsVersions.properties,
-            and read as properties
-        -->
-        <!-- substitute property value for tokens -->
-        <replace
-            file="${buildDirectory}/${buildLabel}/updateSite/site.xml"
-            propertyfile="${buildDirectory}/finalFeaturesVersions.properties">
-            <replacefilter
-                token="@org.eclipse.wst@"
-                property="org.eclipse.wst"/>
-            <replacefilter
-                token="@org.eclipse.wst.sdk@"
-                property="org.eclipse.wst.sdk"/>
-            <replacefilter
-                token="@org.eclipse.jst@"
-                property="org.eclipse.jst"/>
-            <replacefilter
-                token="@org.eclipse.jst.sdk@"
-                property="org.eclipse.jst.sdk"/>
-            <replacefilter
-                token="@org.eclipse.jpt.feature@"
-                property="org.eclipse.jpt.feature"/>
-            <replacefilter
-                token="@org.eclipse.jpt_sdk.feature@"
-                property="org.eclipse.jpt_sdk.feature"/>
-        </replace>
-    </target>
-    <target
-        name="countFiles">
-        <!--
-            files.count is a file that should exist in the drop
-            directory with a count of the zip files in the same
-            directory. It is required to generate a link to the build on
-            the downloads page.
-        -->
-        <countBuildFiles
-            sourceDirectory="${resultDir}"
-            filterString=".zip,.tar.gz"
-            outputFile="${resultDir}/files.count"/>
-    </target>
-
-    <!--Build type descriptors-->
-    <target
-        name="I">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Integration"/>
-    </target>
-    <target
-        name="S">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Stable"/>
-    </target>
-    <target
-        name="N">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Nightly"/>
-    </target>
-    <target
-        name="M">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Maintenance"/>
-    </target>
-    <target
-        name="R">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Release"/>
-    </target>
-    <target
-        name="T">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Test"/>
-    </target>
-    <target
-        name="P">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Patches"/>
-    </target>
-    <target
-        name="U">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Updates"/>
-    </target>
-    <target
-        name="checkIfTested">
-        <echo
-            level="debug"
-            message="isBuildTested: ${isBuildTested}"/>
-        <condition
-            property="doTests">
-            <equals
-                arg1="${isBuildTested}"
-                arg2="true"
-                trim="true"
-                casesensitive="false"/>
-        </condition>
-    </target>
-    <target
-        name="writeData">
-        <!--  Insert Build Date  -->
-        <replace
-            file="${resultingIndex}"
-            token="@date@"
-            value="${TODAY}"/>
-
-        <!--  Insert Build Name  -->
-        <replace
-            file="${resultingIndex}"
-            token="@build@"
-            value="${buildLabel}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@buildBranch@"
-            value="${buildBranch}"/>
-
-        <!--  Insert PreRequsites  -->
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseFile@"
-            value="${eclipse.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseURL@"
-            value="${eclipse.url}/${eclipse.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseBuildURL@"
-            value="${eclipse.url}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilelinux@"
-            value="${eclipse.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilewindows@"
-            value="${eclipse.file.win32-win32-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilemacos@"
-            value="${eclipse.file.macosx-carbon-ppc}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseBuildHome@"
-            value="${eclipse.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipse.mirror.prefixuri@"
-            value="${eclipse.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipse.fspath.prefix@"
-            value="${eclipse.fspath.prefix}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@testURL@"
-            value="${eclipseTestFramework.url}/${eclipseTestFramework.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@testFile@"
-            value="${eclipseTestFramework.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfFile@"
-            value="${emf.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfURL@"
-            value="${emf.url}/${emf.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfBuildHome@"
-            value="${emf.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emf.mirror.prefixuri@"
-            value="${emf.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstFile@"
-            value="${wst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstURL@"
-            value="${wst.url}/${wst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstBuildHome@"
-            value="${wst.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wst.mirror.prefixuri@"
-            value="${wst.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefFile@"
-            value="${gef.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefURL@"
-            value="${gef.url}/${gef.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefBuildHome@"
-            value="${gef.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gef.mirror.prefixuri@"
-            value="${gef.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipserelengFile@"
-            value="${eclipsereleng.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipserelengURL@"
-            value="${eclipsereleng.url}/${eclipsereleng.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipFile@"
-            value="${orbitthirdpartyzip.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipURL@"
-            value="${orbitthirdpartyzip.url}/${orbitthirdpartyzip.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipBuildHome@"
-            value="${orbitthirdpartyzip.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzip.mirror.prefixuri@"
-            value="${orbitthirdpartyzip.mirror.prefixuri}"/>
-
-
-        <!-- no longer used. Post 1.5.5 -->
-        <replace
-            file="${resultingIndex}"
-            token="@jemFile@"
-            value="${jem.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jemURL@"
-            value="${jem.url}/${jem.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jemBuildHome@"
-            value="${jem.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jem.mirror.prefixuri@"
-            value="${jem.mirror.prefixuri}"/>
-        <!--
-            these token/s should not exist in maintenance stream, but do
-            no harm done, so in the interests of keeping builder streams
-            in sync, we'll leave them here as place hold
-        -->
-        <replace
-            file="${resultingIndex}"
-            token="@dtpFile@"
-            value="${dtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtpURL@"
-            value="${dtp.url}/${dtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtpBuildHome@"
-            value="${dtp.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtp.mirror.prefixuri@"
-            value="${dtp.mirror.prefixuri}"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches3.site/staticDropFiles/access_err.gif b/releng.wtpbuilder/distribution/patches3.site/staticDropFiles/access_err.gif
deleted file mode 100644
index 4f0748a..0000000
--- a/releng.wtpbuilder/distribution/patches3.site/staticDropFiles/access_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/patches3.site/staticDropFiles/access_warn.gif b/releng.wtpbuilder/distribution/patches3.site/staticDropFiles/access_warn.gif
deleted file mode 100644
index 8386e3e..0000000
--- a/releng.wtpbuilder/distribution/patches3.site/staticDropFiles/access_warn.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/patches3.site/staticDropFiles/buildNotes.php b/releng.wtpbuilder/distribution/patches3.site/staticDropFiles/buildNotes.php
deleted file mode 100644
index f666887..0000000
--- a/releng.wtpbuilder/distribution/patches3.site/staticDropFiles/buildNotes.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<html>
-<head>
-<?php
-$parts = explode("/", getcwd());
-$parts2 = explode("-", $parts[count($parts) - 1]);
-$buildName = $parts2[1];
-
-echo "<title>Build Notes for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Build Notes</font></b></p>
-
-<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"> Build Notes for <?php echo "$buildName"; ?></font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$hasNotes = false;
-$aDirectory = dir("buildnotes");
-while ($anEntry = $aDirectory->read()) {
-	if ($anEntry != "." && $anEntry != "..") {
-		//print_r($anEntry);
-		//echo "<br />";
-
-		$subject = $anEntry;
-		$pattern = '/^buildnotes_(.*)/i';
-		preg_match($pattern, $subject, $matches);
-		$subject = $matches[1];
-		//print_r($subject);
-		//echo "<br />";
-		$pattern = '/^(.*)\.html$/';
-		preg_match($pattern, $subject, $matches);
-		//print_r($matches);
-		//echo "<br />";
-
-		$component = $matches[1];
-
-		$line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
-		echo "<tr>";
-		echo "$line";
-		echo "</tr>";
-		$hasNotes = true;
-
-	}
-}
-$aDirectory.closedir();
-if (!$hasNotes) {
-	echo "<br>There are no build notes for this build.";
-}
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/patches3.site/staticDropFiles/compile_err.gif b/releng.wtpbuilder/distribution/patches3.site/staticDropFiles/compile_err.gif
deleted file mode 100644
index c2bfdd6..0000000
--- a/releng.wtpbuilder/distribution/patches3.site/staticDropFiles/compile_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/patches3.site/staticDropFiles/compile_warn.gif b/releng.wtpbuilder/distribution/patches3.site/staticDropFiles/compile_warn.gif
deleted file mode 100644
index cf4fdf9..0000000
--- a/releng.wtpbuilder/distribution/patches3.site/staticDropFiles/compile_warn.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/patches3.site/staticDropFiles/consoleLogs.php b/releng.wtpbuilder/distribution/patches3.site/staticDropFiles/consoleLogs.php
deleted file mode 100644
index 2ee3c36..0000000
--- a/releng.wtpbuilder/distribution/patches3.site/staticDropFiles/consoleLogs.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<html>
-<head>
-<?php
-$parts = explode("/", getcwd());
-$parts2 = explode("-", $parts[count($parts) - 1]);
-$buildName = $parts2[1];
-
-echo "<title>Test Console Output for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-<title>Console Logs from Running JUnit Plug-in Tests</title>
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b></p>
-
-<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">Console output from running
-		JUnit plugin tests for <?php echo "$buildName"; ?> </font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$rootDir = "testResults/consolelogs";
-$hasNotes = false;
-$aDirectory = dir($rootDir);
-$index = 0;
-$dirindex = 0;
-while ($anEntry = $aDirectory->read()) {
-	if ($anEntry != "." && $anEntry != "..") {
-		if (is_file("$rootDir/$anEntry")) {
-			$entries[$index] = $anEntry;
-			$index++;
-		} else if (is_dir("$rootDir/$anEntry")) {
-			$direntries[$dirindex] = $anEntry;
-			$dirindex++;
-		}
-	}
-}
-$aDirectory->close();
-
-
-sort($entries);
-sort($direntries);
-
-for ($i = 0; $i < $dirindex; $i++) {
-	$anEntry = $direntries[$i];
-	$line = "<td><a href=\"testResults/consolelogs/$anEntry/logIndex.php\">$anEntry</a></td>";
-	echo "<tr>";
-	echo "$line";
-	echo "</tr>";
-}
-for ($i = 0; $i < $index; $i++) {
-	$anEntry = $entries[$i];
-	$logsize = filesize("testResults/consolelogs/$anEntry");
-
-
-	$level = 0;
-	if ($logsize > 20000) {
-		$level = 2;
-	}
-	else if ($logsize > 2000) {
-		$level = 1;
-	}
-
-	if ($level == 0) {
-		$line = "<td><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-	}
-	else if ($level == 1) {
-		$line = "<td><em><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-	} else if ($level == 2) {
-		$line = "<td><strong><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-	}
-
-
-	echo "<tr>";
-	echo "$line";
-	echo "</tr>";
-	$hasNotes = true;
-}
-
-if (!$hasNotes) {
-	echo "<br>There are no test logs for this build.";
-}
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/patches3.site/staticDropFiles/junit_err.gif b/releng.wtpbuilder/distribution/patches3.site/staticDropFiles/junit_err.gif
deleted file mode 100644
index 1b7ff9d..0000000
--- a/releng.wtpbuilder/distribution/patches3.site/staticDropFiles/junit_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/patches3.site/staticDropFiles/logIndex.php b/releng.wtpbuilder/distribution/patches3.site/staticDropFiles/logIndex.php
deleted file mode 100644
index 721ca00..0000000
--- a/releng.wtpbuilder/distribution/patches3.site/staticDropFiles/logIndex.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<html>
-<head>
-<?php
-
-function endsWith( $str, $sub ) {
-
-	return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub );
-}
-
-$parts = explode("/", getcwd());
-$parts2 = explode("-", $parts[count($parts) - 1]);
-$buildName = $parts2[1];
-
-echo "<title>Test Console Output for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-<title>Console Logs from Running JUnit Plug-in Tests</title>
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b></p>
-
-<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">Console output from running
-		JUnit plugin tests for <?php echo "$buildName"; ?> </font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$hasNotes = false;
-$aDirectory = dir(".");
-$index = 0;
-while ($anEntry = $aDirectory->read()) {
-	if ($anEntry != "." && $anEntry != ".." && !endsWith(__FILE__, $anEntry)) {
-		$entries[$index] = $anEntry;
-		$index++;
-	}
-}
-aDirectory.closedir();
-
-
-sort($entries);
-
-for ($i = 0; $i < $index; $i++) {
-	$anEntry = $entries[$i];
-	$logsize = filesize("$anEntry");
-
-
-	$level = 0;
-	if ($logsize > 20000) {
-		$level = 2;
-	}
-	else if ($logsize > 2000) {
-		$level = 1;
-	}
-
-	if ($level == 0) {
-		$line = "<td><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-	}
-	else if ($level == 1) {
-		$line = "<td><em><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-	} else if ($level == 2) {
-		$line = "<td><strong><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-	}
-
-
-	echo "<tr>";
-	echo "$line";
-	echo "</tr>";
-	$hasNotes = true;
-}
-
-if (!$hasNotes) {
-	echo "<br>There are no test logs for this build.";
-}
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/patches3.site/staticDropFiles/miscUtil.php b/releng.wtpbuilder/distribution/patches3.site/staticDropFiles/miscUtil.php
deleted file mode 100644
index 97c454e..0000000
--- a/releng.wtpbuilder/distribution/patches3.site/staticDropFiles/miscUtil.php
+++ /dev/null
@@ -1,218 +0,0 @@
-<?php
-
-// todo: unsure if can handle filenames that are URLs?
-// handy constant to compute file size in megabytes
-
-function fileSizeInMegs($filename) {
-	$onemeg=1024*1024;
-	$zipfilesize=filesize($filename);
-	$zipfilesize=round($zipfilesize/$onemeg, 0);
-	return $zipfilesize;
-}
-
-function fileSizeForDisplay($filename) {
-	$onekilo=1024;
-	$onemeg=$onekilo * $onekilo;
-	$criteria = 10 * $onemeg;
-	$scaleChar = "M";
-	$zipfilesize=filesize($filename);
-	if ($zipfilesize > $criteria) {
-		$zipfilesize=round($zipfilesize/$onemeg, 0);
-		$scaleChar = "M";
-	}
-	else {
-		$zipfilesize=round($zipfilesize/$onekilo, 0);
-		$scaleChar = "K";
-	}
-	$result =  "(" . $zipfilesize . $scaleChar . ")";
-	return $result;
-}
-
-
-function displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription) {
-	echo "<td align=\"right\" valign=\"top\" width=\"10%\">";
-	echo "<a href=\"$downloadprefix$filename\">" . $fileShortDescription . "</a>";
-	echo "</td><td align=\"right\" valign=\"top\" width=\"5%\">";
-	echo $zipfilesize;
-	echo "</td>";
-	echo "<td align=\"right\" valign=\"top\" width=\"5%\">";
-	echo "[<a href=\"checksum/$filename.md5\">md5</a>]";
-	echo "</td>";
-}
-
-function resourceExist($url, $mirrorPrefixuri, $prereqfilename, $eclipseFSpathPrefix)
-{
-	$result = false;
-
-	$allowURLopen = ini_get('allow_url_fopen');
-
-	if ($allowURLopen && stream_last_modified($url)) {
-		$result = true;
-	}
-	else {
-		// TODO: for now, we'll do a raw check on the whole file name, since enable_url_open
-		// is off. better would be to check if we are on build.eclipse.org or download.eclipse.org?
-		$wholePath = trim($eclipseFSpathPrefix) . "/" . trim($mirrorPrefixuri) . "/" . trim($prereqfilename);
-		if (file_exists($wholePath)) {
-			$result = true;
-		} else {
-			$wholePath = "/home/data/httpd/archive.eclipse.org/" . trim($mirrorPrefixuri) . "/" . trim($prereqfilename);
-			if (file_exists($wholePath)) {
-				$result = true;
-			}
-		}
-	}
-	return $result;
-}
-
-function stream_last_modified($url)
-{
-	if (function_exists('version_compare') && version_compare(phpversion(), '4.3.0') > 0)
-	{
-		if (!($fp = @fopen($url, 'r')))
-		return NULL;
-
-		$meta = stream_get_meta_data($fp);
-		for ($j = 0; isset($meta['wrapper_data'][$j]); $j++)
-		{
-			if (strstr(strtolower($meta['wrapper_data'][$j]), 'last-modified'))
-			{
-				$modtime = substr($meta['wrapper_data'][$j], 15);
-				break;
-			}
-		}
-		fclose($fp);
-	}
-	else
-	{
-		$parts = parse_url($url);
-		$host  = $parts['host'];
-		$path  = $parts['path'];
-
-		if (!($fp = @fsockopen($host, 80)))
-		return NULL;
-
-		$req = "HEAD $path HTTP/1.0\r\nUser-Agent: PHP/".phpversion()."\r\nHost: $host:80\r\nAccept: */*\r\n\r\n";
-		fputs($fp, $req);
-
-		while (!feof($fp))
-		{
-			$str = fgets($fp, 4096);
-			if (strstr(strtolower($str), 'last-modified'))
-			{
-				$modtime = substr($str, 15);
-				break;
-			}
-		}
-		fclose($fp);
-	}
-	return isset($modtime) ? strtotime($modtime) : time();
-}
-
-function isMirrored($uriToCheck) {
-	global $debugScript;
-	global $debugFunctions;
-	$localuri = $uriToCheck;
-
-	$debugMirrorList = false;
-	if ($debugScript) {
-		echo "uriToCheck: " . $localuri . "<br />";
-	}
-
-	$xmlcount = 0;
-
-	/* This method true and accurate method of parsing mirror results
-	 * may be expensive, and would
-	 * likely cause artificially high counts of "downloads".
-	 * Could maybe use if somehow only checked once ever 5 minutes or something.
-
-
-	 // turn off warnings, as sometimes HTML is returned, which causes lots of warnings
-	 $holdLevel = error_reporting(E_ERROR);
-	 $mirrorsxml=simplexml_load_file(rawurlencode($localuri) . urlencode("&format=xml"));
-	 error_reporting($holdLevel);
-
-
-	 if ($mirrorsxml) {
-		if ($debugFunctions) {
-		echo "root node: " . $mirrorsxml->getName() . "<br />";
-		}
-		if (strcmp($mirrorsxml->getName(), "mirrors") == 0) {
-		foreach ($mirrorsxml->children() as $mirror) {
-		if (strcmp($mirror->getName(),"mirror") == 0) {
-		$xmlcount=$xmlcount+1;
-		}
-		if ($debugMirrorList) {
-		print_r($mirror);
-		echo "<br />";
-		}
-		}
-		}
-		if ($debugFunctions) {
-		echo "Mirror count: " . $xmlcount . "<br />";
-		}
-		}
-	 */
-	/*
-	 * Use simple heuristic based on pattern
-	 * in the URI ... if it contains "/downloads/" then assume it's mirrored
-	 */
-	if (strpos($uriToCheck, "webtools/downloads/") > 0) {
-		$xmlcount = 1;
-	}
-	return ($xmlcount > 0);
-
-}
-
-// TODO: replace with Phoenix variables
-function getPlatform () {
-	global $debugScript;
-	global $debugFunctions;
-	// getBrowser is expensive, so cache the data
-	static $browser;
-	$platform = "unknown";
-
-
-	if(ini_get("browscap")) {
-		if(!isset($browser)){
-			$browser = get_browser(null, true);
-		}
-
-		if ($browser) {
-			$rawPlatform = $browser['platform'];
-			if ($debugFunctions) {
-				echo "browser platfrom: " . $rawPlatform . "<br />" ;
-			}
-
-			if ($debugFunctions) {
-				$browserKeys = array_keys($browser);
-				foreach ($browserKeys as $key) {
-					echo $key . ": " . $browser[$key] . "<br />";
-				}
-			}
-		}
-		if (strpos($rawPlatform, "Win") === 0) {
-			$platform="windows";
-		} else if (strpos($rawPlatform, "Linux") === 0) {
-			$platform="linux";
-		} else if (strpos($rawPlatform, "Mac") === 0) {
-			$platform="mac";
-		}
-	}
-	return $platform;
-}
-
-function getPrereqReferenceOrName($eclipseMirrorScript, $mirrorPrefixuri, $prerequrl, $prereqfilename, $eclipseFSpathPrefix) {
-	// todo: we really only need "if exists" so could make a bit more efficient
-	// I tried "file_exists" but is didn't seem to work on my test server
-	// For these pre-reqs, we assume if they exist, they are mirrored. This is true
-	// 99% of the time.
-
-	if (resourceExist($prerequrl, $mirrorPrefixuri, $prereqfilename, $eclipseFSpathPrefix)) {
-		$reflink="<a href=\"" . $eclipseMirrorScript . $mirrorPrefixuri . "/" . $prereqfilename . "\">" . $prereqfilename . "</a>";
-	} else {
-		$reflink=$prereqfilename;
-	}
-	return $reflink;
-}
-?>
diff --git a/releng.wtpbuilder/distribution/patches3.site/staticDropFiles/pending.gif b/releng.wtpbuilder/distribution/patches3.site/staticDropFiles/pending.gif
deleted file mode 100644
index 66db2a6..0000000
--- a/releng.wtpbuilder/distribution/patches3.site/staticDropFiles/pending.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/patches3.site/staticDropFiles/pending1.gif b/releng.wtpbuilder/distribution/patches3.site/staticDropFiles/pending1.gif
deleted file mode 100644
index 1b2ea6e..0000000
--- a/releng.wtpbuilder/distribution/patches3.site/staticDropFiles/pending1.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/patches3.site/staticDropFiles/report2.php b/releng.wtpbuilder/distribution/patches3.site/staticDropFiles/report2.php
deleted file mode 100644
index cb68e7b..0000000
--- a/releng.wtpbuilder/distribution/patches3.site/staticDropFiles/report2.php
+++ /dev/null
@@ -1,45 +0,0 @@
-
-<?php
-
-function parse_testResults($filename)
-{
-	$junitFailures = 0;
-	if (is_file($filename)) {
-		$handle = @fopen($filename, "r");
-		if ($handle)
-		{
-			$size = filesize($filename);
-			$content = fread($handle, $size);
-			fclose($handle);
-			$junitStart = strpos($content, "Errors &amp; Failures");
-			$junitEnd = strpos($content, "</table>", $junitStart);
-			$junitInfo = substr($content, $junitStart, $junitEnd - $junitStart);
-			$start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">");
-			while ($start !== false)
-			{
-				$start += 29;
-				$stop = strpos($junitInfo, "</font></b></td>", $start);
-				if ($stop !== false)
-				{
-					$result = substr($junitInfo, $start, $stop - $start);
-					if (is_numeric($result))
-					{
-						$junitFailures += $result;
-					}
-					else if (strcmp($result, "DNF") == 0)
-					{
-						$junitFailures++;
-					}
-				}
-				$start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">", $stop);
-			}
-			$results = array($junitFailures);
-			return $results;
-		}
-	}
-}
-
-
-?>
-
-
diff --git a/releng.wtpbuilder/distribution/patches3.site/templateFiles/compileResults.php.template b/releng.wtpbuilder/distribution/patches3.site/templateFiles/compileResults.php.template
deleted file mode 100644
index f785771..0000000
--- a/releng.wtpbuilder/distribution/patches3.site/templateFiles/compileResults.php.template
+++ /dev/null
@@ -1,76 +0,0 @@
-<html>
-<head>
-
-<?php
-        $parts = explode("/", getcwd());
-        $parts2 = explode("-", $parts[count($parts) - 1]);
-        $buildName = $parts2[1];
-
-        echo "<title>Compile Logs: Code Bundles for $buildName</title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2%;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-}
-</style>
-</head>
-<body>
-
-<?php
-        echo "<h1>Compile Logs: Code Bundles for $buildName</h1>";
-?>
-
-
-<table id=tabledata align = "center" width="75%" border="1">
-  <tr>
-    <td class="bold" align="center">Compile Logs</td>
-    <td class="bold" align="center">Compile Errors</td>
-    <td class="bold" align="center">Compiler Warnings</td>
-    <td class="bold" align="center">Access Violations</td>
-    <td class="bold" align="center">Access Warnings</td>
-  </tr>
-
-  %compilelogs%
-
-</table>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/patches3.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/patches3.site/templateFiles/index.html.template.php
deleted file mode 100644
index f020709..0000000
--- a/releng.wtpbuilder/distribution/patches3.site/templateFiles/index.html.template.php
+++ /dev/null
@@ -1,456 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<title>WTP Downloads</title>
-
-
-<?php
-
-$buildBranch="@buildBranch@";
-$build="@build@";
-$type="@type@";
-$builddate="@date@";
-
-$eclipseMirrorPrefixuri="@eclipse.mirror.prefixuri@";
-$eclipseFSpathPrefix="@eclipse.fspath.prefix@";
-
-$eclipsefilelinux="@eclipsefilelinux@";
-$eclipsefilewindows="@eclipsefilewindows@";
-$eclipsefilemacosx="@eclipsefilemacos@";
-
-$eclipseURL="@eclipseURL@";
-$eclipseFile="@eclipseFile@";
-$eclipseBuildURL="@eclipseBuildURL@";
-$eclipseBuildHome="@eclipseBuildHome@";
-$testURL="@testURL@";
-$testFile="@testFile@";
-
-$wstURL="@wstURL@";
-$wstFile="@wstFile@";
-$wstMirrorPrefixuri="@wst.mirror.prefixuri@";
-$wstBuildHome="@wstBuildHome@";
-
-
-$gefURL="@gefURL@";
-$gefFile="@gefFile@";
-$gefMirrorPrefixuri="@gef.mirror.prefixuri@";
-$gefBuildHome="@gefBuildHome@";
-
-$emfURL="@emfURL@";
-$emfFile="@emfFile@";
-$emfMirrorPrefixuri="@emf.mirror.prefixuri@";
-$emfBuildHome="@emfBuildHome@";
-
-$dtpURL="@dtpURL@";
-$dtpFile="@dtpFile@";
-$dtpMirrorPrefixuri="@dtp.mirror.prefixuri@";
-$dtpBuildHome="@dtpBuildHome@";
-
-
-$eclipserelengFile="@eclipserelengFile@";
-$eclipserelengURL="@eclipserelengURL@";
-$orbitthirdpartyzipFile="@orbitthirdpartyzipFile@";
-$orbitthirdpartyzipURL="@orbitthirdpartyzipURL@";
-$orbitthirdpartyzipBuildHome="@orbitthirdpartyzipBuildHome@";
-$orbitthirdpartyzipMirrorPrefixuri="@orbitthirdpartyzip.mirror.prefixuri@";
-
-
-
-
-include("miscUtil.php");
-
-
-
-//ini_set("display_errors", "true");
-//error_reporting (E_ALL);
-
-
-$debugScript = false;
-$debugFunctions = false;
-
-$defaultMirrorScript="";
-$defaultWTPMirrorPrefix="./";
-
-$eclipseMirrorScript="http://www.eclipse.org/downloads/download.php?file=";
-
-// TODO: improve so this hard coding isn't required.
-// This depends on the declare script changing webtools/committers to webtools/downloads
-// And, the logic is such that if it is not mirrored, this URI is not used at all, just
-// a relative reference only
-$eclipseWTPMirrorPrefix="/webtools/committers/drops/$buildBranch/$build/";
-
-
-$mirrorScript=$defaultMirrorScript;
-$downloadprefix=$defaultWTPMirrorPrefix;
-
-
-$keytestMirrorString=$eclipseMirrorScript . "$eclipseWTPMirrorPrefix/wtp-sdk-$build.zip";
-if (isMirrored($keytestMirrorString) ) {
-	$mirrorScript=$eclipseMirrorScript;
-	$downloadprefix="${mirrorScript}${eclipseWTPMirrorPrefix}";
-}
-
-if ($debugScript)  {
-	echo "inferred platform: " . getPlatform();
-}
-
-
-// our summary results handling requires php 5 (for simple xml file loading)
-// so, if not php 5, just don't display any summary results
-// This was found to be required, since some mirror our whole site (e.g. IBM)
-// and not all mirrors use PHP 5
-$displayTestSummary=false;
-if (phpversion() >= 5) {
-
-	$displayTestSummary=true;
-	// expecting grandTotalErrors and grandTotalTests
-	$filename = "unitTestsSummary.xml";
-	if (file_exists($filename)) {
-		$prefix = "unitTests_";
-		$unitTestsSummary = simplexml_load_file($filename);
-		foreach ($unitTestsSummary->summaryItem as $summaryItem) {
-			$name = $summaryItem->name;
-			$value = $summaryItem->value;
-			$code= "\$" . $prefix . $name . " = " . $value . ";";
-			//echo "<br />code: " . $code;
-			eval($code);
-		}
-	}
-
-	$filename = "compilelogsSummary.xml";
-	$prefix = "code_";
-	$compileSummary = simplexml_load_file($filename);
-	foreach ($compileSummary->summaryItem as $summaryItem) {
-		$name = $summaryItem->name;
-		$value = $summaryItem->value;
-		$code= "\$" . $prefix . $name . " = " . $value . ";";
-		//echo "<br />code: " . $code;
-		eval($code);
-	}
-
-	$filename = "testcompilelogsSummary.xml";
-	$prefix = "test_";
-	$compileSummary = simplexml_load_file($filename);
-	foreach ($compileSummary->summaryItem as $summaryItem) {
-		$name = $summaryItem->name;
-		$value = $summaryItem->value;
-		$code= "\$" . $prefix . $name . " = " . $value . ";";
-		//echo "<br />code: " . $code;
-		eval($code);
-	}
-}
-
-
-?>
-
-
-</head>
-
-<body>
-
-<?php
-
-// tiny banner to remind when looking at "local" machine results
-$serverName = $_SERVER["SERVER_NAME"];
-
-if (!stristr($serverName, "eclipse.org") && !stristr($serverName,"you.are.at.eclipsecon.org")) {
-	echo '<center>
-          <p>
-          Reminder: this is <font color="#FF0000">' . 
-	$serverName .
-    '</font>
-          See also 
-          <a href="http://download.eclipse.org/webtools/downloads" target="_top">the live public Eclipse site</a>.
-          </p>
-          <hr />
-          </center>';
-
-}
-?>
-<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH="100%">
-	<tr>
-		<td ALIGN=left><font face="'Bitstream Vera',Helvetica,Arial" size="+2"><b><?php echo "$type";?>
-		Build: <?php echo "$build";?></b></font></td>
-	
-	
-	<tr>
-		<td><font size="-1"><?php echo "$builddate";?></font></td>
-	</tr>
-	<tr>
-		<td>
-		<p>The Eclipse Web Tools Platform Project provides tools for Web
-		Development, and is a platform for adopters making add-on tools for
-		Web Development.</p>
-		</td>
-	</tr>
-</table>
-
-<!-- ***********  Required Prerequisites **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-	<tr>
-		<td align="left" valign="top" bgcolor="#0080C0"><font
-			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Required
-		Prerequisites and Handy Extras</font></td>
-	</tr>
-	<tr>
-		<td>
-		<p>These are the prerequisites to install and run the Web Tools
-		Platform. Also listed are some frequently needed links for
-		committer-required packages when creating new development
-		environments, or targets to run against.</p>
-		<p>Note that WTP requires Java 5 or higher (and, for some things,
-		actually requires a JDK rather than only a JRE) even though many other
-		<a href="http://www.eclipse.org/downloads/">Eclipse Projects</a> can
-		run with <a href="http://www.eclipse.org/downloads/moreinfo/jre.php">other
-		JRE levels</a>.</p>
-		</td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=1 cellpadding=1 width="90%" align="center">
-			<tr valign="top">
-				<td width="10%"></td>
-				<td width="55%">Eclipse Platform (Platform, JDT)</td>
-				<?php
-				//customize page depending on user's browser/platform, if we can detect it
-				$usersPlatform = getPlatform();
-				// assume windows by default, since likely most frequent, even for cases where
-				// platform is "unknown". I've noticed Opera reports 'unknown' :(
-				$recommendedFile=$eclipsefilewindows;
-				if (strcmp($usersPlatform,"linux")== 0) {
-					$recommendedFile=$eclipsefilelinux;
-				} else if (strcmp($usersPlatform,"mac") == 0) {
-					$recommendedFile=$eclipsefilemacosx;
-				}
-				?>
-				<td align="right" width="35%"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $eclipseBuildURL . "\">appropriate platform</a>";
-				echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>Eclipse Modeling Framework (EMF, XSD InfoSet)</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfMirrorPrefixuri, $emfURL, $emfFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $emfBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>Graphical Editing Framework (GEF)</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $gefMirrorPrefixuri, $gefURL, $gefFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $gefBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>Eclipse Test Framework (required only for Automated JUnit tests)</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $testURL, $testFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>Eclipse releng tool (required only for committers to more easily
-				"release" code to a build)</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipserelengURL, $eclipserelengFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-
-		</table>
-		</td>
-	</tr>
-</table>
-
-<!-- ***********  WTP **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-	<tr>
-		<td align=left valign=top colspan="5" bgcolor="#0080C0"><font
-			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF"> Web Tools
-		Platform Patches</font></td>
-	</tr>
-
-	<tr>
-		<td align="left" valign="top" colspan="5">
-		<p>The Zip files contain patches</p>
-		</td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
-
-
-			<tr>
-				<td align="left" valign="top" width="10%"><b>Patch</b></td>
-				<td align="left" valign="top">
-				<p>Remember, care is needed in using patches from this page. These
-				patches are specific to particular use-cases or adopters and not
-				well tested for general cases.</p>
-				</td>
-				<?php
-				$zipfilename="wtp-@build@";
-				$filename=$zipfilename.".zip";
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription="@build@";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-				?>
-			</tr>
-		</table>
-		</td>
-	
-	
-	<tr>
-
-</table>
-
-
-
-
-
-
-
-<!-- ***********  Build Status **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-	<tr>
-		<td align=left valign=top bgcolor="#0080C0"><font
-			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Status, tests
-		and other interesting details</font></td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
-
-			<tr>
-				<td><a href="buildNotes.php">Build notes</a> <br />
-				<a href="directory.txt">map files</a> <br />
-				<?php
-
-				if ($displayTestSummary) {
-
-
-					if (isset($unitTests_grandTotalErrors)) {
-						$errorColor="green";
-						if ($unitTests_grandTotalErrors > 0) {
-							$errorColor="red";
-						}
-						echo "<a href=\"testResults.php\">Unit test results</a>&nbsp;";
-						echo "<img src=\"junit_err.gif\"/><font color=\"" . $errorColor . "\">" . $unitTests_grandTotalErrors . "</font>&nbsp;&nbsp;Total: " . $unitTests_grandTotalTests;
-					}
-					else {
-						echo "<br /><font color=\"orange\">Unit tests are pending</font>&nbsp;&nbsp;<img src=\"pending.gif\"/>";
-					}
-
-					echo "<br />";
-					echo "<a href=\"compileResults.php\">Compile logs: Code Bundles</a>";
-
-					echo "&nbsp;&nbsp;($code_totalBundles)&nbsp;&nbsp;";
-					echo "<img src=\"compile_err.gif\"/><font color=red>$code_totalErrors</font>&nbsp;";
-					echo "<img src=\"compile_warn.gif\"/><font color=orange>$code_totalWarnings</font>&nbsp;";
-					echo "<img src=\"access_err.gif\"/><font color=red>$code_totalforbiddenAccessWarningCount</font>&nbsp;";
-					echo "<img src=\"access_warn.gif\"/><font color=orange>$code_totaldiscouragedAccessWarningCount</font>&nbsp;";
-
-					echo "<br />";
-					echo "<a href=\"testCompileResults.php\">Compile logs: Test Bundles</a>";
-
-					echo "&nbsp;&nbsp;($test_totalBundles)&nbsp;&nbsp;";
-					echo "<img src=\"compile_err.gif\"/><font color=red>$test_totalErrors</font>&nbsp;";
-					echo "<img src=\"compile_warn.gif\"/><font color=orange>$test_totalWarnings</font>&nbsp;";
-					echo "<img src=\"access_err.gif\"/><font color=red>$test_totalforbiddenAccessWarningCount</font>&nbsp;";
-					echo "<img src=\"access_warn.gif\"/><font color=orange>$test_totaldiscouragedAccessWarningCount</font>&nbsp;";
-				}
-
-				?> <br />
-
-				<?php
-				if (file_exists("versioningReportName.php")) {
-					include "versioningReportName.php";
-					$fname="${versionReportFilename}.html";
-					if (file_exists($fname)) {
-						echo "<br /> <a href='$fname'>Versioning Information</a>";
-					}
-}
-?> <?php
-echo "<br />";
-if (file_exists("./apiresults/api-progress.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-progress.html\">API Progress Report</a>";
-}
-if (file_exists("./apiresults/api-info-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-info-summary.html\">APIs Defined by Each Component</a>";
-}
-if (file_exists("./apiresults/api-ref-compatibility.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-ref-compatibility.html\">Adopter Breakage Report</a>";
-}
-if (file_exists("./apiresults/api-violation-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-violation-summary.html\">API Violations</a>";
-}
-if (file_exists("./apiresults/component-api-violation-all.html"))
-{
-	echo "<br /> <a href=\"apiresults/component-api-violation-all.html\">Non-API dependencies</a>";
-}
-if (file_exists("./apiresults/api-tc-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-tc-summary.html\">API Test Coverage</a>";
-}
-if (file_exists("./apiresults/api-javadoc-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-javadoc-summary.html\">API Javadoc Coverage</a>";
-}
-if (file_exists("./apiresults/api-tc-summary.html"))
-{
-	echo "<br /><br /> <a href=\"apiresults/full_test_coverage/api-tc-summary.html\">Test Coverage for All Classes and Methods</a>";
-}
-?> <?php
-if (file_exists("./perfresults/graph/performance.php"))
-{
-	echo "<br />";
-	echo "<br /> <a href=\"perfresults/graph/performance.php\">Performance Results</a>";
-	echo "<br />";
-}
-?></td>
-			</tr>
-
-
-		</table>
-		</td>
-	</tr>
-</table>
-
-
-
-<!-- footer -->
-<center>
-<hr>
-<p>All downloads are provided under the terms and conditions of the <a
-	href="http://www.eclipse.org/legal/notice.html">Eclipse.org Software
-User Agreement</a> unless otherwise specified.</p>
-
-<p>If you have problems downloading the drops, contact the <font
-	face="'Bitstream Vera',Helvetica,Arial" size="-1"><a
-	href="mailto:webmaster@eclipse.org">webmaster</a></font>.</p>
-
-</center>
-<!-- end footer -->
-
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/patches3.site/templateFiles/siteEnablingFeatures.xml b/releng.wtpbuilder/distribution/patches3.site/templateFiles/siteEnablingFeatures.xml
deleted file mode 100644
index cc3ed81..0000000
--- a/releng.wtpbuilder/distribution/patches3.site/templateFiles/siteEnablingFeatures.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-    <description> The update site contains the enabling features. </description>
-    <category-def
-        name="Enabling Features"
-        label="Enabling Features">
-        <description> This category contains features used by several
-            projects that enable some functionality, but which by
-            themselves are not very interesting. </description>
-    </category-def>
-</site>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches3.site/templateFiles/siteWTP.xml b/releng.wtpbuilder/distribution/patches3.site/templateFiles/siteWTP.xml
deleted file mode 100644
index f94e83f..0000000
--- a/releng.wtpbuilder/distribution/patches3.site/templateFiles/siteWTP.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site
-    pack200="true"
-    mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/webtools/testUpdates/site.xml&amp;format=xml"
-    digestURL="http://download.eclipse.org/webtools/testUpdates/">
-    <description
-        url="http://download.eclipse.org/webtools/declaredUpdates/index.html"> The update site contains the features of the of Eclipse Web
-        Tools Project (WTP) </description>
-    <feature
-        url="features/org.eclipse.wst_@org.eclipse.wst@.jar"
-        id="org.eclipse.wst"
-        version="@org.eclipse.wst@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.wst.sdk_@org.eclipse.wst.sdk@.jar"
-        id="org.eclipse.wst.sdk"
-        version="@org.eclipse.wst.sdk@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jst_@org.eclipse.jst@.jar"
-        id="org.eclipse.jst"
-        version="@org.eclipse.jst@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jst.sdk_@org.eclipse.jst.sdk@.jar"
-        id="org.eclipse.jst.sdk"
-        version="@org.eclipse.jst.sdk@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jpt.feature_@org.eclipse.jpt.feature@.jar"
-        id="org.eclipse.jpt.feature"
-        version="@org.eclipse.jpt.feature@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jpt_sdk.feature_@org.eclipse.jpt_sdk.feature@.jar"
-        id="org.eclipse.jpt_sdk.feature"
-        version="@org.eclipse.jpt_sdk.feature@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <category-def
-        name="Web Tools Platform (WTP)"
-        label="Web Tools Platform (WTP)">
-        <description> This category contains the features of the Eclipse
-            Web Tools Project (WTP). </description>
-    </category-def>
-</site>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches3.site/templateFiles/testCompileResults.php.template b/releng.wtpbuilder/distribution/patches3.site/templateFiles/testCompileResults.php.template
deleted file mode 100644
index 42d6f65..0000000
--- a/releng.wtpbuilder/distribution/patches3.site/templateFiles/testCompileResults.php.template
+++ /dev/null
@@ -1,76 +0,0 @@
-<html>
-<head>
-
-<?php
-        $parts = explode("/", getcwd());
-        $parts2 = explode("-", $parts[count($parts) - 1]);
-        $buildName = $parts2[1];
-
-        echo "<title>Compile Logs: Test Bundles for $buildName</title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2em;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:Bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-}
-</style>
-</head>
-<body>
-
-<?php
-        echo "<h1>Compile Logs: Test Bundles for $buildName</h1>";
-?>
-
-
-<table id=tabledata align = "center" width="75%" border="1">
-  <tr>
-    <td class="bold" align="center">Compile Logs</td>
-    <td class="bold" align="center">Compile Errors</td>
-    <td class="bold" align="center">Compiler Warnings</td>
-    <td class="bold" align="center">Access Violations</td>
-    <td class="bold" align="center">Access Warnings</td>
-  </tr>
-
-  %compilelogs%
-
-</table>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/patches3.site/templateFiles/testResults.php.template b/releng.wtpbuilder/distribution/patches3.site/templateFiles/testResults.php.template
deleted file mode 100644
index 2f2fba8..0000000
--- a/releng.wtpbuilder/distribution/patches3.site/templateFiles/testResults.php.template
+++ /dev/null
@@ -1,118 +0,0 @@
-<html>
-<head>
-
-<?php
-	$parts = explode("/", getcwd());
-	$parts2 = explode("-", $parts[count($parts) - 1]);
-	$buildName = $parts2[1];
-	
-	echo "<title>Test Results for $buildName </title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2em;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:Bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-
-}
-</style>
-
-
-</head>
-<body>
-<p><b><font face="Verdana" size="+3">Test Results</font></b> </p>
-
-<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">
-    Unit Test Results for <?php echo "$buildName"; ?> on Various Platforms and JRE</font></b></td>
-  </tr>
-</table>
-
-<?php
-if (file_exists("testResults"))
-{
-$dir = dir("testResults");
-while ($anEntry = $dir->read())
-{
-  if ($anEntry != "." && $anEntry != ".." && $anEntry != "consolelogs" && $anEntry != "html" && $anEntry != "xml")
-  {
-    $link = "testResults/".$anEntry."/results/index.php";
-    echo "<p><a href=\"$link\">$anEntry</a></p>";
-  }
-}
-}
-?>
-
-<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">Unit 
-      Test Results for <?php echo "$buildName"; ?> </font></b></td>
-  </tr>
-</table>
-
-<table id=tableunittestdata align = "center" width="75%" border="1">
-  <tr> 
-    <td class="bold" align="center" width="70%">Test Suite</td>
-    <td class="bold" align="center" width="15%">Errors &amp; Failures</td>
-    <td class="bold" align="center" width="15%">Total Tests</td>
-  </tr>
-  
-  
-  %testresults%
-  
-</table>
-<p></p>
-<br>
-<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"> 
-      Console output logs 
-      <?php echo "$buildName"; ?>
-      </font></b></td>
-  </tr>
-</table>
-<br>
-These <a href="consoleLogs.php">logs</a> contain the console output captured while 
-running the JUnit automated tests. <br>
-<br>
-
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/patches3.site/transformReportToHTML.xml b/releng.wtpbuilder/distribution/patches3.site/transformReportToHTML.xml
deleted file mode 100644
index 9231345..0000000
--- a/releng.wtpbuilder/distribution/patches3.site/transformReportToHTML.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-    name="xsl-conversion"
-    default="main"
-    basedir=".">
-    <target
-        name="main"
-        description="example.bin.xml to produce example.html">
-        <xslt
-            basedir="."
-            destdir="."
-            includes="*.bin.xml"
-            scanincludeddirectories="true"
-            style="compilerXMLOutputToHTML.xsl"
-            force="true"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches3.tests/build.xml b/releng.wtpbuilder/distribution/patches3.tests/build.xml
deleted file mode 100644
index 81af57a..0000000
--- a/releng.wtpbuilder/distribution/patches3.tests/build.xml
+++ /dev/null
@@ -1,366 +0,0 @@
-<project
-    name="Build specific targets and properties"
-    default="runTest">
-    <!--
-        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"/>
-    <fail
-        message="testRoot must be set for this task"
-        unless="testRoot"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-    <!--
-        typcially already set, but in case of standalone tests, may not
-        be
-    -->
-    <property
-        name="buildLabel"
-        value="${buildType}-${buildId}-${timestamp}"/>
-
-
-    <!-- 
-      Steps to do after the build is done. 
-    -->
-    <target
-        name="test">
-        <dirname
-            file="${ant.file}"
-            property="currentDirectory"/>
-        <ant
-            antfile="${ant.file}"
-            target="runTest"
-            dir="${currentDirectory}"/>
-    </target>
-    <!--
-        Steps to do to test the build results
-    -->
-    <target
-        name="runTest">
-        <dirname
-            file="${ant.file}"
-            property="test.component.dir"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-        <property
-            file="${buildDirectory}/label.properties"/>
-        <property
-            file="${wtp.builder.home}/build.properties"/>
-        <fail
-            message="testRoot must be set for this task"
-            unless="testRoot"/>
-        <mkdir
-            dir="${testRoot}"/>
-
-        <!-- if results already exist, delete them -->
-        <delete
-            dir="${testRoot}/results"
-            failOnError="false"/>
-        <mkdir
-            dir="${testRoot}/results"/>
-        <mkdir
-            dir="${testRoot}/results/consolelogs"/>
-        <copy
-            todir="${testRoot}"
-            overwrite="true">
-            <fileset
-                dir="${test.component.dir}/testScripts"/>
-        </copy>
-        <echo
-            message="BASEOS: ${env.BASEOS}   BASEWS: ${env.BASEWS}   BASEARCH: ${env.BASEARCH} "/>
-        <!--
-            for this distribution, dependencies come from releng. Assume
-            no subdirectory, if not otherwise set (bug 285383).
-        -->
-        <!--
-            if not otherwise set, assume its a legacy case that did not
-            use this
-        -->
-        <property
-            name="env.DEP_DIR"
-            value=""/>
-        <property
-            name="dependency.properties"
-            value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-        <available
-            file="${dependency.properties}"
-            property="dependency.properties.exists"/>
-        <fail
-            message="dependency file not found: ${dependency.properties}"
-            unless="dependency.properties.exists"/>
-        <ant
-            antfile="${test.component.dir}/testdependency.xml"
-            target="get">
-            <property
-                name="base.install.dir"
-                value="${testRoot}"/>
-        </ant>
-        <antcall
-            target="unzipTests"/>
-        <antcall
-            target="runTestEclipse">
-            <param
-                name="testTarget"
-                value="all"/>
-        </antcall>
-        <antcall
-            target="postRunTestEclipse">
-            <param
-                name="testTarget"
-                value="all"/>
-        </antcall>
-    </target>
-    <target
-        name="unzipTests">
-        <!--
-            unzip the builds and junit tests we use 'unzip' here, so we
-            can continue on error, if desired. (such as if zip was not
-            created, due to other failures or options).
-        -->
-        <exec
-            dir="${buildDirectory}/${buildLabel}"
-            executable="unzip"
-            failonerror="true">
-            <arg
-                line="-o -qq wtp-${buildLabel}.zip -d ${testRoot}${dropinsFolder}"/>
-        </exec>
-        <exec
-            dir="${buildDirectory}/${buildLabel}"
-            executable="unzip"
-            failonerror="true">
-            <arg
-                line="-o -qq wtp-patches-tests-${buildLabel}.zip -d ${testRoot}${dropinsFolder}"/>
-        </exec>
-    </target>
-    <!--
-        time out may need to be set/adjust for api or performance tests?
-        This testTimeLimit is the whole, overall limit on tests. There's
-        a shorter one for individual suites. some common values, of
-        milliseconds to more recognizable units: 14400000: 4 hours
-        7200000: 2 hours 3600000: 1 hour 1800000: 30 minutes 600000: 10
-        minutes
-    -->
-    <property
-        name="testTimeLimit"
-        value="14400000"/>
-    <property
-        name="testFailOnError"
-        value="false"/>
-    <target
-        name="runTestEclipse"
-        description="Run our JUnit's within an instance of antRunner">
-        <property
-            name="test-vm"
-            value="${env.JAVA_5_HOME}/bin/java"/>
-        <property
-            name="plugin-path"
-            value="${testRoot}${dropinsFolder}/eclipse/plugins"/>
-        <property
-            name="vmargs"
-            value="-Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm}  -Dperf.buildId=${buildType}${date}-${time}"/>
-        <!--
-            set path to eclipse folder. If local folder, use '.';
-            otherwise, use c:\path\to\eclipse or /path/to/eclipse/
-        -->
-        <property
-            name="eclipse.home"
-            value="${testRoot}"/>
-        <echo
-            message="Running junits"/>
-        <!--
-            If there is not exactly one launcher in the stack, we'd best
-            fail fast, since we are not expecting that, and may indicate
-            an installation that would produce unpredictable results
-        -->
-        <!--
-            requires ant 1.7, and at this point, we're running 1.6 from
-            eclipse ... <condition property="expectedNumberOfLaunchers">
-            <resourcecount when="equal" count="1" > <fileset
-            dir="${testRoot}/eclipse/plugins"> <include
-            name="org.eclipse.equinox.launcher_*.jar" /> </fileset>
-            </resourcecount> </condition> <fail message="Did not find
-            expected number of launcher jars. Check installation."
-            unless="expectedNumberOfLaunchers" />
-        -->
-        <!--
-            Remember: using -debug for org.eclipse.ant.core.antRunner
-            produces ant debug info to be output ... which is a TON of
-            stuff
-        -->
-        <echo
-            message="eclipse.launcher: ${eclipse.launcher}"/>
-        <java
-            taskname="unit-test-masterprocess"
-            fork="true"
-            resultProperty="wtpmasterjunitresult"
-            failonerror="false"
-            timeout="${testTimeLimit}"
-            dir="${testRoot}/eclipse"
-            jvm="${env.JAVA_5_HOME}/bin/java"
-            classname="org.eclipse.equinox.launcher.Main">
-            <classpath>
-                <fileset
-                    dir="${testRoot}/eclipse/plugins">
-                    <include
-                        name="org.eclipse.equinox.launcher_*.jar"/>
-                </fileset>
-            </classpath>
-            <jvmarg
-                value="-Xmx758m"/>
-            <jvmarg
-                value="-Xverify"/>
-            <jvmarg
-                value="-Dosgi.ws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dosgi.os=${env.BASEOS}"/>
-            <jvmarg
-                value="-Dosgi.arch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-Dws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dos=${env.BASEOS}"/>
-            <jvmarg
-                value="-Darch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-Dnoclean=true"/>
-            <jvmarg
-                value="-DbuildBranch=${buildBranch}"/>
-            <jvmarg
-                value="-DbuildType=${buildType}"/>
-            <jvmarg
-                value="-DbuildId=${buildId}"/>
-            <jvmarg
-                value="-Dprojectname=${projectname}"/>
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <arg
-                value="-nosplash"/>
-            <arg
-                value="-consolelog"/>
-            <arg
-                value="-data"/>
-            <arg
-                value="${testRoot}/overallTestWorkspace"/>
-            <arg
-                value="-application"/>
-            <arg
-                value="org.eclipse.ant.core.antRunner"/>
-            <arg
-                value="-verbose"/>
-            <arg
-                value="-logger"/>
-            <arg
-                value="org.apache.tools.ant.DefaultLogger"/>
-            <arg
-                value="-file"/>
-            <arg
-                value="${testRoot}/test.xml"/>
-            <arg
-                value="${testTarget}"/>
-
-            <!--  make sure our forked env has a DISPLAY -->
-            <env
-                key="DISPLAY"
-                value="${env.DISPLAY}"/>
-            <redirector
-                output="${testRoot}/results/fullOutput.txt"
-                error="${testRoot}/results/fullErrorLog.txt"/>
-            <sysproperty
-                key="build.home"
-                value="${env.BUILD_HOME}"/>
-            <sysproperty
-                key="buildDirectory"
-                value="${buildDirectory}"/>
-            <sysproperty
-                key="buildLabel"
-                value="${buildLabel}"/>
-            <sysproperty
-                key="baseLocation"
-                value="${baseLocation}"/>
-            <sysproperty
-                key="testRoot"
-                value="${testRoot}"/>
-            <sysproperty
-                key="testDir"
-                value="${testRoot}"/>
-            <sysproperty
-                key="perf.buildId"
-                value="${buildType}${date}-${time}"/>
-            <sysproperty
-                key="eclipseBuilderDirectory"
-                value="${pde.builder.path}"/>
-            <sysproperty
-                key="buildLabel"
-                value="${buildLabel}"/>
-        </java>
-        <echo
-            message="wtpmasterjunitresult ${wtpmasterjunitresult}"/>
-    </target>
-    <target
-        name="postRunTestEclipse">
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/consolelogs/testLogs"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results">
-                <include
-                    name="*output.txt"/>
-            </fileset>
-        </copy>
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/consolelogs/testSysErrorLogs"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results">
-                <include
-                    name="*error.txt"/>
-            </fileset>
-        </copy>
-        <copy
-            file="${testRoot}/results/fullOutput.txt"
-            toDir="${buildDirectory}/${buildLabel}/testResults/consolelogs/full"
-            overwrite="true"
-            failonerror="false">
-        </copy>
-        <copy
-            file="${testRoot}/results/fullErrorLog.txt"
-            toDir="${buildDirectory}/${buildLabel}/testResults/consolelogs/full"
-            overwrite="true"
-            failonerror="false">
-        </copy>
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/xml"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results/xml">
-                <include
-                    name="*.xml"/>
-            </fileset>
-        </copy>
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/html"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results/html">
-                <include
-                    name="*.html"/>
-            </fileset>
-        </copy>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches3.tests/templateFiles/index.php b/releng.wtpbuilder/distribution/patches3.tests/templateFiles/index.php
deleted file mode 100644
index a42c883..0000000
--- a/releng.wtpbuilder/distribution/patches3.tests/templateFiles/index.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<html>
-<head>
-
-<?php
-$parts = explode("/", realpath(".."));
-$label = $parts[count($parts) - 1];
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-</head>
-<body>
-<p><b><font face="Verdana" size="+3">Test Results</font></b></p>
-<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">Unit Test Results for <?php echo "$label"; ?>
-		</font></b></td>
-	</tr>
-</table>
-<p></p>
-<table border="0">
-</table>
-
-<table width="77%" border="1">
-	<tr>
-		<td width="81%"><b>Tests Performed</b></td>
-		<td width="19%"><b>Errors &amp; Failures</b></td>
-	</tr>
-
-	<?
-	$dir = dir("html");
-	while ($anEntry = $dir->read())
-	{
-		if ($anEntry != "." && $anEntry != "..")
-		{
-			$link = "html/".$anEntry;
-			$xml = "xml/".substr($anEntry, 0, strlen($anEntry)-4)."xml";
-			$count = 0;
-			$fileHandle = fopen($xml, "r");
-			while (!feof($fileHandle))
-			{
-				$aLine = fgets($fileHandle, 4096); // Length parameter only optional after 4.2.0
-				$count = $count + substr_count($aLine, '<error');
-			}
-			fclose($fileHandle);
-			if ($count > 0)
-			{
-				echo "<tr><td><a href=\"$link\"><b><font color=\"red\">";
-				echo "$anEntry";
-				echo "</font></b></a></td>";
-				echo "<td><b><font color=\"red\">$count</font></b></td></tr>";
-			}
-			else
-			{
-				echo "<tr><td><a href=\"$link\">";
-				echo "$anEntry";
-				echo "</a></td>";
-				echo "<td>$count</td></tr>";
-			}
-		}
-	}
-	?>
-
-</table>
-<p></p>
-<br>
-<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"> Console output logs <?php echo "$label"; ?>
-		</font></b></td>
-	</tr>
-</table>
-<br>
-These
-<a href="consolelogs/wtptestlog.txt">logs</a>
-contain the console output captured while running the JUnit automated
-tests.
-<br>
-<br>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/patches3.tests/testScripts/ComputePluginVersion.jar b/releng.wtpbuilder/distribution/patches3.tests/testScripts/ComputePluginVersion.jar
deleted file mode 100644
index ad06a45..0000000
--- a/releng.wtpbuilder/distribution/patches3.tests/testScripts/ComputePluginVersion.jar
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/patches3.tests/testScripts/JUNIT.XSL b/releng.wtpbuilder/distribution/patches3.tests/testScripts/JUNIT.XSL
deleted file mode 100644
index 9cdd80e..0000000
--- a/releng.wtpbuilder/distribution/patches3.tests/testScripts/JUNIT.XSL
+++ /dev/null
@@ -1,703 +0,0 @@
-<xsl:stylesheet
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="1.0">
-    <xsl:output
-        method="html"
-        indent="yes"/>
-    <xsl:decimal-format
-        decimal-separator="."
-        grouping-separator=","/>
-    <xsl:template
-        match="testsuites">
-        <HTML>
-            <HEAD>
-                <style
-                    type="text/css"> body { font:normal 68%
-                    verdana,arial,helvetica; color:#000000; } table tr
-                    td, table tr th { font-size: 68%; } table.details tr
-                    th{ font-weight: bold; text-align:left;
-                    background:#a6caf0; } table.details tr td{
-                    background:#eeeee0; } p { line-height:1.5em;
-                    margin-top:0.5em; margin-bottom:1.0em; } h1 {
-                    margin: 0px 0px 5px; font: 165%
-                    verdana,arial,helvetica } h2 { margin-top: 1em;
-                    margin-bottom: 0.5em; font: bold 125%
-                    verdana,arial,helvetica } h3 { margin-bottom: 0.5em;
-                    font: bold 115% verdana,arial,helvetica } h4 {
-                    margin-bottom: 0.5em; font: bold 100%
-                    verdana,arial,helvetica } h5 { margin-bottom: 0.5em;
-                    font: bold 100% verdana,arial,helvetica } h6 {
-                    margin-bottom: 0.5em; font: bold 100%
-                    verdana,arial,helvetica } .Error { font-weight:bold;
-                    color:red; } .Failure { font-weight:bold;
-                    color:purple; } .Properties { text-align:right; } </style>
-                <script
-                    language="JavaScript">
-                    var TestCases = new Array(); var cur;
-                    <xsl:for-each
-                        select="./testsuite">
-                        <xsl:apply-templates
-                            select="properties"/>
-                    </xsl:for-each>
-                </script>
-                <script
-                    language="JavaScript"><![CDATA[
-        function displayProperties (name) {
-          var win = window.open('','JUnitSystemProperties','scrollbars=1,resizable=1');
-          var doc = win.document.open();
-          doc.write("<html><head><title>Properties of " + name + "</title>");
-          doc.write("<style>")
-          doc.write("body {font:normal 68% verdana,arial,helvetica;	color:#000000; }");
-          doc.write("table tr td, table tr th { font-size: 68%; }");
-          doc.write("table.properties { border-collapse:collapse; border-left:solid 1 #cccccc; border-top:solid 1 #cccccc; padding:5px; }");
-          doc.write("table.properties th { text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#eeeeee; }");
-          doc.write("table.properties td { font:normal; text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#fffffff; }");
-          doc.write("h3 { margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica }");
-          doc.write("</style>");
-          doc.write("</head><body>");
-          doc.write("<h3>Properties of " + name + "</h3>");
-          doc.write("<div align=\"right\"><a href=\"javascript:window.close();\">Close</a></div>");
-          doc.write("<table class='properties'>");
-          doc.write("<tr><th>Name</th><th>Value</th></tr>");
-          for (prop in TestCases[name]) {
-            doc.write("<tr><th>" + prop + "</th><td>" + TestCases[name][prop] + "</td></tr>");
-          }
-          doc.write("</table>");
-          doc.write("</body></html>");
-          doc.close();
-          win.focus();
-        }
-      ]]>
-                </script>
-            </HEAD>
-            <body>
-                <a
-                    name="top"></a>
-                <xsl:call-template
-                    name="pageHeader"/>
-
-                <!-- Summary part -->
-                <xsl:call-template
-                    name="summary"/>
-                <hr
-                    size="1"
-                    width="95%"
-                    align="left"/>
-
-                <!-- Package List part -->
-                <xsl:call-template
-                    name="packagelist"/>
-                <hr
-                    size="1"
-                    width="95%"
-                    align="left"/>
-
-                <!-- For each package create its part -->
-                <xsl:call-template
-                    name="packages"/>
-                <hr
-                    size="1"
-                    width="95%"
-                    align="left"/>
-
-                <!-- For each class create the  part -->
-                <xsl:call-template
-                    name="classes"/>
-            </body>
-        </HTML>
-    </xsl:template>
-    <!--
-        ==================================================================
-    -->
-    <!--
-        Write a list of all packages with an hyperlink to the anchor of
-    -->
-    <!--
-        of the package name.
-    -->
-    <!--
-        ==================================================================
-    -->
-    <xsl:template
-        name="packagelist">
-        <h2>Packages</h2>
-        Note: package statistics are not computed recursively, they only
-        sum up all of its testsuites numbers.
-        <table
-            class="details"
-            border="0"
-            cellpadding="5"
-            cellspacing="2"
-            width="95%">
-            <xsl:call-template
-                name="testsuite.test.header"/>
-            <!-- list all packages recursively -->
-            <xsl:for-each
-                select="./testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
-                <xsl:sort
-                    select="@package"/>
-                <xsl:variable
-                    name="testsuites-in-package"
-                    select="/testsuites/testsuite[./@package = current()/@package]"/>
-                <xsl:variable
-                    name="testCount"
-                    select="sum($testsuites-in-package/@tests)"/>
-                <xsl:variable
-                    name="errorCount"
-                    select="sum($testsuites-in-package/@errors)"/>
-                <xsl:variable
-                    name="failureCount"
-                    select="sum($testsuites-in-package/@failures)"/>
-                <xsl:variable
-                    name="timeCount"
-                    select="sum($testsuites-in-package/@time)"/>
-
-                <!-- write a summary for the package -->
-                <tr
-                    valign="top">
-                    <!-- set a nice color depending if there is an error/failure -->
-                    <xsl:attribute
-                        name="class">
-						<xsl:choose>
-							<xsl:when
-                        test="$failureCount &gt; 0">Failure</xsl:when>
-							<xsl:when
-                        test="$errorCount &gt; 0">Error</xsl:when>
-						</xsl:choose>
-					</xsl:attribute>
-                    <td>
-                        <a
-                            href="#{@package}">
-                            <xsl:value-of
-                                select="@package"/>
-                        </a>
-                    </td>
-                    <td>
-                        <xsl:value-of
-                            select="$testCount"/>
-                    </td>
-                    <td>
-                        <xsl:value-of
-                            select="$errorCount"/>
-                    </td>
-                    <td>
-                        <xsl:value-of
-                            select="$failureCount"/>
-                    </td>
-                    <td>
-                        <xsl:call-template
-                            name="display-time">
-                            <xsl:with-param
-                                name="value"
-                                select="$timeCount"/>
-                        </xsl:call-template>
-                    </td>
-                </tr>
-            </xsl:for-each>
-        </table>
-    </xsl:template>
-    <!--
-        ==================================================================
-    -->
-    <!--
-        Write a package level report
-    -->
-    <!--
-        It creates a table with values from the document:
-    -->
-    <!--
-        Name | Tests | Errors | Failures | Time
-    -->
-    <!--
-        ==================================================================
-    -->
-    <xsl:template
-        name="packages">
-        <!-- create an anchor to this package name -->
-        <xsl:for-each
-            select="/testsuites/testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
-            <xsl:sort
-                select="@package"/>
-            <a
-                name="{@package}"></a>
-            <h3>
-                Package
-                <xsl:value-of
-                    select="@package"/>
-            </h3>
-            <table
-                class="details"
-                border="0"
-                cellpadding="5"
-                cellspacing="2"
-                width="95%">
-                <xsl:call-template
-                    name="testsuite.test.header"/>
-
-                <!-- match the testsuites of this package -->
-                <xsl:apply-templates
-                    select="/testsuites/testsuite[./@package = current()/@package]"
-                    mode="print.test"/>
-            </table>
-            <a
-                href="#top">Back to top</a>
-            <p/>
-            <p/>
-        </xsl:for-each>
-    </xsl:template>
-    <xsl:template
-        name="classes">
-        <xsl:for-each
-            select="testsuite">
-            <xsl:sort
-                select="@name"/>
-            <!-- create an anchor to this class name -->
-            <a
-                name="{@name}"></a>
-            <h3>
-                TestCase
-                <xsl:value-of
-                    select="@name"/>
-            </h3>
-            <table
-                class="details"
-                border="0"
-                cellpadding="5"
-                cellspacing="2"
-                width="95%">
-                <xsl:call-template
-                    name="testcase.test.header"/>
-                <!--
-                    test can even not be started at all (failure to load
-                    the class) so report the error directly
-                -->
-                <xsl:if
-                    test="./error">
-                    <tr
-                        class="Error">
-                        <td
-                            colspan="4">
-                            <xsl:apply-templates
-                                select="./error"/>
-                        </td>
-                    </tr>
-                </xsl:if>
-                <xsl:apply-templates
-                    select="./testcase"
-                    mode="print.test"/>
-            </table>
-            <div
-                class="Properties">
-                <a>
-                    <xsl:attribute
-                        name="href">javascript:displayProperties('<xsl:value-of
-                        select="@package"/>.<xsl:value-of
-                        select="@name"/>');</xsl:attribute>
-                    Properties &gt;&gt;
-                </a>
-            </div>
-            <p/>
-            <a
-                href="#top">Back to top</a>
-        </xsl:for-each>
-    </xsl:template>
-    <xsl:template
-        name="summary">
-        <h2>Summary</h2>
-        <xsl:variable
-            name="testCount"
-            select="sum(testsuite/@tests)"/>
-        <xsl:variable
-            name="errorCount"
-            select="sum(testsuite/@errors)"/>
-        <xsl:variable
-            name="failureCount"
-            select="sum(testsuite/@failures)"/>
-        <xsl:variable
-            name="timeCount"
-            select="sum(testsuite/@time)"/>
-        <xsl:variable
-            name="successRate"
-            select="($testCount - $failureCount - $errorCount) div $testCount"/>
-        <table
-            class="details"
-            border="0"
-            cellpadding="5"
-            cellspacing="2"
-            width="95%">
-            <tr
-                valign="top">
-                <th>Tests</th>
-                <th>Failures</th>
-                <th>Errors</th>
-                <th>Success rate</th>
-                <th>Time</th>
-            </tr>
-            <tr
-                valign="top">
-                <xsl:attribute
-                    name="class">
-				<xsl:choose>
-					<xsl:when
-                    test="$failureCount &gt; 0">Failure</xsl:when>
-					<xsl:when
-                    test="$errorCount &gt; 0">Error</xsl:when>
-				</xsl:choose>
-			</xsl:attribute>
-                <td>
-                    <xsl:value-of
-                        select="$testCount"/>
-                </td>
-                <td>
-                    <xsl:value-of
-                        select="$failureCount"/>
-                </td>
-                <td>
-                    <xsl:value-of
-                        select="$errorCount"/>
-                </td>
-                <td>
-                    <xsl:call-template
-                        name="display-percent">
-                        <xsl:with-param
-                            name="value"
-                            select="$successRate"/>
-                    </xsl:call-template>
-                </td>
-                <td>
-                    <xsl:call-template
-                        name="display-time">
-                        <xsl:with-param
-                            name="value"
-                            select="$timeCount"/>
-                    </xsl:call-template>
-                </td>
-            </tr>
-        </table>
-        <table
-            border="0"
-            width="95%">
-            <tr>
-                <td
-                    style="text-align: justify;">
-                    Note:
-                    <i>failures</i>
-                    are anticipated and checked for with assertions
-                    while
-                    <i>errors</i>
-                    are unanticipated.
-                </td>
-            </tr>
-        </table>
-    </xsl:template>
-    <!--
-        Write properties into a JavaScript data structure. This is based
-        on the original idea by Erik Hatcher (erik@hatcher.net)
-    -->
-    <xsl:template
-        match="properties">
-        cur = TestCases['
-        <xsl:value-of
-            select="../@package"/>
-        .
-        <xsl:value-of
-            select="../@name"/>
-        '] = new Array();
-        <xsl:for-each
-            select="property">
-            <xsl:sort
-                select="@name"/>
-            cur['
-            <xsl:value-of
-                select="@name"/>
-            '] = '
-            <xsl:call-template
-                name="JS-escape">
-                <xsl:with-param
-                    name="string"
-                    select="@value"/>
-            </xsl:call-template>
-            ';
-        </xsl:for-each>
-    </xsl:template>
-
-    <!-- Page HEADER -->
-    <xsl:template
-        name="pageHeader">
-        <h1>Unit Test Results</h1>
-        <table
-            width="100%">
-            <tr>
-                <td
-                    align="left"></td>
-                <td
-                    align="right">
-                    Designed for use with
-                    <a
-                        href='http://www.junit.org'>JUnit</a>
-                    and
-                    <a
-                        href='http://jakarta.apache.org/ant'>Ant</a>
-                    .
-                </td>
-            </tr>
-        </table>
-        <hr
-            size="1"/>
-    </xsl:template>
-    <xsl:template
-        match="testsuite"
-        mode="header">
-        <tr
-            valign="top">
-            <th
-                width="80%">Name</th>
-            <th>Tests</th>
-            <th>Errors</th>
-            <th>Failures</th>
-            <th
-                nowrap="nowrap">Time(s)</th>
-        </tr>
-    </xsl:template>
-
-    <!-- class header -->
-    <xsl:template
-        name="testsuite.test.header">
-        <tr
-            valign="top">
-            <th
-                width="80%">Name</th>
-            <th>Tests</th>
-            <th>Errors</th>
-            <th>Failures</th>
-            <th
-                nowrap="nowrap">Time(s)</th>
-        </tr>
-    </xsl:template>
-
-    <!-- method header -->
-    <xsl:template
-        name="testcase.test.header">
-        <tr
-            valign="top">
-            <th>Name</th>
-            <th>Status</th>
-            <th
-                width="80%">Type</th>
-            <th
-                nowrap="nowrap">Time(s)</th>
-        </tr>
-    </xsl:template>
-
-
-    <!-- class information -->
-    <xsl:template
-        match="testsuite"
-        mode="print.test">
-        <tr
-            valign="top">
-            <!-- set a nice color depending if there is an error/failure -->
-            <xsl:attribute
-                name="class">
-			<xsl:choose>
-				<xsl:when
-                test="@failures[.&gt; 0]">Failure</xsl:when>
-				<xsl:when
-                test="@errors[.&gt; 0]">Error</xsl:when>
-			</xsl:choose>
-		</xsl:attribute>
-
-            <!-- print testsuite information -->
-            <td>
-                <a
-                    href="#{@name}">
-                    <xsl:value-of
-                        select="@name"/>
-                </a>
-            </td>
-            <td>
-                <xsl:value-of
-                    select="@tests"/>
-            </td>
-            <td>
-                <xsl:value-of
-                    select="@errors"/>
-            </td>
-            <td>
-                <xsl:value-of
-                    select="@failures"/>
-            </td>
-            <td>
-                <xsl:call-template
-                    name="display-time">
-                    <xsl:with-param
-                        name="value"
-                        select="@time"/>
-                </xsl:call-template>
-            </td>
-        </tr>
-    </xsl:template>
-    <xsl:template
-        match="testcase"
-        mode="print.test">
-        <tr
-            valign="top">
-            <xsl:attribute
-                name="class">
-			<xsl:choose>
-				<xsl:when
-                test="failure | error">Error</xsl:when>
-			</xsl:choose>
-		</xsl:attribute>
-            <td>
-                <xsl:value-of
-                    select="@name"/>
-            </td>
-            <xsl:choose>
-                <xsl:when
-                    test="failure">
-                    <td>Failure</td>
-                    <td>
-                        <xsl:apply-templates
-                            select="failure"/>
-                    </td>
-                </xsl:when>
-                <xsl:when
-                    test="error">
-                    <td>Error</td>
-                    <td>
-                        <xsl:apply-templates
-                            select="error"/>
-                    </td>
-                </xsl:when>
-                <xsl:otherwise>
-                    <td>Success</td>
-                    <td></td>
-                </xsl:otherwise>
-            </xsl:choose>
-            <td>
-                <xsl:call-template
-                    name="display-time">
-                    <xsl:with-param
-                        name="value"
-                        select="@time"/>
-                </xsl:call-template>
-            </td>
-        </tr>
-    </xsl:template>
-    <xsl:template
-        match="failure">
-        <xsl:call-template
-            name="display-failures"/>
-    </xsl:template>
-    <xsl:template
-        match="error">
-        <xsl:call-template
-            name="display-failures"/>
-    </xsl:template>
-
-    <!-- Style for the error and failure in the tescase template -->
-    <xsl:template
-        name="display-failures">
-        <xsl:choose>
-            <xsl:when
-                test="not(@message)">
-                N/A
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of
-                    select="@message"/>
-            </xsl:otherwise>
-        </xsl:choose>
-        <!-- display the stacktrace -->
-        <code>
-            <p/>
-            <xsl:call-template
-                name="br-replace">
-                <xsl:with-param
-                    name="word"
-                    select="."/>
-            </xsl:call-template>
-        </code>
-        <!--
-            the later is better but might be problematic for non-21"
-            monitors...
-        -->
-        <!--pre><xsl:value-of select="."/></pre-->
-    </xsl:template>
-    <xsl:template
-        name="JS-escape">
-        <xsl:param
-            name="string"/>
-        <xsl:choose>
-            <!--
-                something isn't right here, basically all single quotes
-                need to be replaced with backslash-single-quote
-                <xsl:when test="contains($string,'&apos;')">
-                <xsl:value-of
-                select="substring-before($string,'&apos;')"/> \&apos;
-                <xsl:call-template name="JS-escape"> <xsl:with-param
-                name="string"
-                select="substring-after($string,'&apos;')"/>
-                </xsl:call-template> </xsl:when>
-            -->
-            <xsl:when
-                test="contains($string,'\')">
-                <xsl:value-of
-                    select="substring-before($string,'\')"/>
-                \\
-                <xsl:call-template
-                    name="JS-escape">
-                    <xsl:with-param
-                        name="string"
-                        select="substring-after($string,'\')"/>
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of
-                    select="$string"/>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-    <!--
-        template that will convert a carriage return into a br tag
-        @param word the text from which to convert CR to BR tag
-    -->
-    <xsl:template
-        name="br-replace">
-        <xsl:param
-            name="word"/>
-        <xsl:choose>
-            <xsl:when
-                test="contains($word,'&#xA;')">
-                <xsl:value-of
-                    select="substring-before($word,'&#xA;')"/>
-                <br/>
-                <xsl:call-template
-                    name="br-replace">
-                    <xsl:with-param
-                        name="word"
-                        select="substring-after($word,'&#xA;')"/>
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of
-                    select="$word"/>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-    <xsl:template
-        name="display-time">
-        <xsl:param
-            name="value"/>
-        <xsl:value-of
-            select="format-number($value,'0.000')"/>
-    </xsl:template>
-    <xsl:template
-        name="display-percent">
-        <xsl:param
-            name="value"/>
-        <xsl:value-of
-            select="format-number($value,'0.00%')"/>
-    </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches3.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/patches3.tests/testScripts/test.xml
deleted file mode 100644
index 9d4482b..0000000
--- a/releng.wtpbuilder/distribution/patches3.tests/testScripts/test.xml
+++ /dev/null
@@ -1,1116 +0,0 @@
-<project
-    name="Automated Eclipse Testing"
-    default="all"
-    basedir=".">
-    <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-    <echo
-        level="info"
-        message="starting Automated Eclipse Testing"/>
-    <echo
-        level="debug"
-        message="basedir: ${basedir}"/>
-    <echo
-        level="debug"
-        message="testRoot: ${testRoot}"/>
-    <fail
-        message="testRoot must be set"
-        unless="testRoot"/>
-
-    <!--properties file containing the some server name properties -->
-    <property
-        file="${testRoot}/testServer.properties"/>
-
-    <!--properties file containing the build information-->
-    <property
-        file="${buildDirectory}/label.properties"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-    <!--default directory where test-eclipse will be installed-->
-    <property
-        name="install"
-        value="${testRoot}"/>
-    <!--
-        name that can be added to report name to identify which platform
-        tests results come from
-    -->
-    <property
-        name="platform"
-        value=""/>
-
-    <!-- The root of the eclipse installation -->
-    <property
-        name="eclipse-home"
-        value="${testRoot}${dropinsFolder}/eclipse/"/>
-    <!--
-        The directory that will contain the xml and html results from
-        the tests that are run
-    -->
-    <property
-        name="results"
-        value="${testRoot}/results"/>
-    <property
-        name="library-file"
-        value="${testRoot}/wtp-junit-tests.xml"/>
-
-    <!-- jonas install directory -->
-    <!-- TODO: why do this twice? Here and in init? -->
-    <property
-        name="jonas432Dir"
-        value="${testRoot}/${jonas432DirName}"/>
-    <target
-        name="init">
-        <antcall
-            target="setPropertyJOnAS432Dir"/>
-        <antcall
-            target="computePluginVersion"/>
-        <property
-            file="${testRoot}/test2.properties"/>
-    </target>
-    <target
-        name="setPropertyJOnAS432Dir"
-        unless="jonas432Dir">
-        <property
-            name="jonas432Dir"
-            value="${testRoot}/${jonas432DirName}"/>
-    </target>
-    <target
-        name="setup"
-        if="clean"
-        description="Reinstall the test Eclipse installation if specified by user">
-        <delete
-            dir="${install}"/>
-        <mkdir
-            dir="${install}"/>
-        <exec
-            dir="."
-            executable="unzip">
-            <arg
-                line="-o -qq ../downloads/*.zip -d ${install}"/>
-        </exec>
-        <exec
-            dir="."
-            executable="unzip">
-            <arg
-                line="-o -qq  wtp-patches-tests-feature*.zip -d ${install}"/>
-        </exec>
-    </target>
-    <target
-        name="runapitests"
-        depends="setup">
-        <antcall
-            target="runtests"/>
-    </target>
-    <target
-        name="runtests"
-        depends="setup"
-        description="Runs ant on the test.xml for a specified plugin.">
-        <available
-            file="${eclipse-home}/plugins/${testPlugin}/test.xml"
-            property="test.xml.exists"/>
-        <antcall
-            target="runtests2"/>
-    </target>
-    <target
-        name="runtests2"
-        if="test.xml.exists">
-        <antcall
-            target="runtests-normal"/>
-        <copy
-            file="${eclipse-home}/${report}.xml"
-            tofile="${results}/xml/${report}_${platform}.xml"
-            failonerror="false"/>
-        <antcall
-            target="genHtml"/>
-    </target>
-    <target
-        name="runtests-normal">
-        <ant
-            antfile="${eclipse-home}/plugins/${testPlugin}/test.xml"
-            dir="${eclipse-home}">
-            <property
-                name="library-file"
-                value="${testRoot}/wtp-junit-tests.xml"/>
-        </ant>
-        <copy
-            file="${eclipse-home}/${report}.xml"
-            tofile="${results}/xml/${report}_${platform}.xml"
-            failonerror="false"/>
-        <antcall
-            target="genHtml"/>
-    </target>
-    <target
-        name="wst-server-tests"
-        depends="init"
-        description="Runs the org.eclipse.wst.server.*.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.server.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.server.core.tests"/>
-            <param
-                name="package.includes"
-                value="org.eclipse.wst.server"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.server.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.server.ui.tests"/>
-            <param
-                name="package.includes"
-                value="org.eclipse.wst.server"/>
-        </antcall>
-    </target>
-    <target
-        name="wst-monitor-tests"
-        depends="init"
-        description="Runs the org.eclipse.wst.internet.monitor.*.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.internet.monitor.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.internet.monitor.core.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.internet.monitor.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.internet.monitor.ui.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="wst-cache-tests"
-        depends="init"
-        description="Runs the org.eclipse.wst.internet.cache.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.internet.cache.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.internet.cache.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="jst-server-tests"
-        depends="init"
-        description="Runs the org.eclipse.jst.server.*.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.server.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.server.core.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.server.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.server.ui.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="jst-server-tomcat-tests"
-        depends="init"
-        description="Runs the org.eclipse.jst.server.tomcat.*.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.server.tomcat.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.server.tomcat.core.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.server.tomcat.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.server.tomcat.ui.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="jst-server-generic-tests"
-        depends="init"
-        description="Runs the org.eclipse.jst.server.generic.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.server.generic.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.server.generic.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="jst-server-geronimo-tests"
-        depends="init"
-        description="Runs the org.eclipse.jst.server.geronimo.*.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.server.geronimo.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.server.geronimo.core.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.server.geronimo.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.server.geronimo.ui.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="jst-jem-tests"
-        depends="init"
-        description="Runs the org.eclipse.jem.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jem.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jem.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="jst-j2ee-core-tests"
-        depends="init"
-        description="Runs the org.eclipse.jst.j2ee.core.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.j2ee.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.j2ee.core.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="jst-j2ee-tests"
-        depends="init"
-        description="Runs the org.eclipse.jst.j2ee.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.j2ee.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.j2ee.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="wst-common-tests"
-        depends="init"
-        description="Runs the org.eclipse.jst.j2ee.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.common.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.common.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="validation-framework-tests"
-        depends="init"
-        description="Runs the common validation tests">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.common.tests.validation}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.common.tests.validation"/>
-        </antcall>
-    </target>
-    <target
-        name="wst-common-snippets-tests"
-        depends="init">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.common.snippets.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.common.snippets.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="jst-servlet-tests"
-        depends="init"
-        description="Runs the org.eclipse.jst.servlet.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.servlet.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.servlet.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="jst-validation-framework-tests"
-        depends="init"
-        description="Runs the org.eclipse.jst.validation.test test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.validation.test}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.validation.test"/>
-        </antcall>
-    </target>
-
-    <!-- JSP TESTS -->
-    <target
-        name="jst-jsp-tests"
-        depends="init"
-        description="Runs test.xml for JSP tests">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.jsp.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.jsp.core.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.jsp.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.jsp.ui.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.jsp.tests.encoding}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.jsp.tests.encoding"/>
-        </antcall>
-    </target>
-
-    <!-- SSE TESTS -->
-    <target
-        name="wst-sse-tests"
-        depends="init"
-        description="Runs test.xml for SSE tests">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.sse.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.sse.core.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.sse.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.sse.ui.tests"/>
-        </antcall>
-    </target>
-
-    <!-- XML TESTS -->
-    <target
-        name="wst-xml-tests"
-        depends="init"
-        description="Runs test.xml for XML tests">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.xml.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.xml.core.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.xml.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.xml.ui.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.xml.tests.encoding}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.xml.tests.encoding"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.xml.validation.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.xml.validation.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.xml.catalog.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.xml.catalog.tests"/>
-        </antcall>
-    </target>
-
-    <!-- WSDL TESTS -->
-    <target
-        name="wst-wsdl-tests"
-        depends="init"
-        description="Runs test.xml for WSDL ">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.wsdl.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.wsdl.tests"/>
-            <param
-                name="package.includes"
-                value="org.eclipse.wst.wsdl"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.wsdl.validation.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.wsdl.validation.tests"/>
-        </antcall>
-    </target>
-
-    <!-- WSI TESTS -->
-    <target
-        name="wst-wsi-tests"
-        depends="init"
-        description="Runs test.xml for WSI tests">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.wsi.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.wsi.tests"/>
-        </antcall>
-    </target>
-
-    <!-- XSD TESTS -->
-    <target
-        name="wst-xsd-tests"
-        depends="init"
-        description="Runs test.xml for XSD tests ">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.xsd.validation.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.xsd.validation.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.xsd.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.xsd.core.tests"/>
-        </antcall>
-    </target>
-
-    <!-- HTML TESTS -->
-    <target
-        name="wst-html-tests"
-        depends="init"
-        description="Runs test.xml for HTML tests">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.html.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.html.core.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.html.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.html.ui.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.html.tests.encoding}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.html.tests.encoding"/>
-        </antcall>
-    </target>
-
-    <!-- DTD Tests -->
-    <target
-        name="wst-dtd-tests"
-        depends="init">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.dtd.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.dtd.ui.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.dtd.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.dtd.core.tests"/>
-        </antcall>
-    </target>
-
-    <!-- CSS TESTS -->
-    <target
-        name="wst-css-tests"
-        depends="init"
-        description="Runs test.xml for
-                                                                                                org.eclipse.wst.css.core.tests
-                                                                                                org.eclipse.wst.css.ui.tests
-                                                                                                org.eclipse.wst.css.tests.encoding">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.css.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.css.core.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.css.tests.encoding}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.css.tests.encoding"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.css.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.css.ui.tests"/>
-        </antcall>
-    </target>
-
-    <!-- JSF TESTS -->
-    <target
-        name="jsf-tests"
-        depends="init"
-        description="Runs test.xml for org.eclipse.jst.jsf.core.tests, org.eclipse.jst.jsf.ui.tests">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.jsf.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.jsf.core.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.jsf.ui.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.jsf.ui.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.jsf.metadata.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.jsf.metadata.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.jsf.contentassist.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.jsf.contentassist.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.jsf.context.symbol.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.jsf.context.symbol.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.jsf.designtime.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.jsf.designtime.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.jsf.facesconfig.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.jsf.facesconfig.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.jsf.facesconfig.ui.test}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.jsf.facesconfig.ui.test"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.jsf.validation.el.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.jsf.validation.el.tests"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.pagedesigner.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.pagedesigner.tests"/>
-        </antcall>
-    </target>
-
-    <!-- WS TESTS -->
-    <target
-        name="wst-ws-tests"
-        depends="init"
-        description="Runs the org.eclipse.wst.ws.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.ws.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.ws.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="jst-ws-tests"
-        depends="init"
-        description="Runs the org.eclipse.jst.ws.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.ws.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.ws.tests"/>
-        </antcall>
-    </target>
-
-    <!-- Faceted Project Framework Tests -->
-    <target
-        name="wst-facets-tests"
-        depends="init"
-        description="Runs the Faceted Project Framework tests.">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.common.project.facet.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.common.project.facet.core.tests"/>
-        </antcall>
-    </target>
-
-    <!-- Dali tests -->
-    <target
-        name="jpt-utility-tests"
-        depends="init"
-        description="Runs the org.eclipse.jpt.utility.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jpt.utility.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jpt.utility.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="dali-core-tests"
-        description="Runs the org.eclipse.jpt.core.tests test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jpt.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jpt.core.tests"/>
-        </antcall>
-    </target>
-
-    <!-- JSDT tests -->
-    <target
-        name="jsdt-tests"
-        depends="init"
-        description="Runs the org.eclipse.wst.jsdt.core.test.* test.xml">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.jsdt.core.tests.compiler}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.jsdt.core.tests.compiler"/>
-        </antcall>
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wst.jsdt.core.tests.model}"/>
-            <param
-                name="report"
-                value="org.eclipse.wst.jsdt.core.tests.model"/>
-        </antcall>
-    </target>
-
-
-    <!-- releng Tests -->
-    <target
-        name="releng-tests"
-        depends="init"
-        description="Runs the releng tests.">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wtp.releng.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.wtp.releng.tests"/>
-        </antcall>
-    </target>
-    <target
-        name="all"
-        depends="init">
-        <echo
-            level="info"
-            message="Starting WTP Unit Tests"/>
-        <echo
-            level="info"
-            message="Starting releng tests"/>
-        <antcall
-            target="releng-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-server-tests"/>
-        <antcall
-            target="wst-server-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-monitor-tests"/>
-        <antcall
-            target="wst-monitor-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-cache-tests"/>
-        <antcall
-            target="wst-cache-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-common-tests"/>
-        <antcall
-            target="wst-common-tests"/>
-        <echo
-            level="info"
-            message="Starting validation-framework-tests"/>
-        <antcall
-            target="validation-framework-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-common-snippets-tests"/>
-        <antcall
-            target="wst-common-snippets-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-sse-tests"/>
-        <antcall
-            target="wst-sse-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-xml-tests"/>
-        <antcall
-            target="wst-xml-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-wsdl-tests"/>
-        <antcall
-            target="wst-wsdl-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-wsi-tests"/>
-        <antcall
-            target="wst-wsi-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-xsd-tests"/>
-        <antcall
-            target="wst-xsd-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-html-tests"/>
-        <antcall
-            target="wst-html-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-dtd-tests"/>
-        <antcall
-            target="wst-dtd-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-css-tests"/>
-        <antcall
-            target="wst-css-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-ws-tests"/>
-        <antcall
-            target="wst-ws-tests"/>
-        <echo
-            level="info"
-            message="Starting jst-server-tests"/>
-        <antcall
-            target="jst-server-tests"/>
-        <echo
-            level="info"
-            message="Starting jst-server-tomcat-tests"/>
-        <antcall
-            target="jst-server-tomcat-tests"/>
-        <echo
-            level="info"
-            message="Starting jst-server-geronimo-tests"/>
-        <antcall
-            target="jst-server-geronimo-tests"/>
-        <echo
-            level="info"
-            message="Starting jst-server-generic-tests"/>
-        <antcall
-            target="jst-server-generic-tests"/>
-        <echo
-            level="info"
-            message="Starting jst-jem-tests"/>
-        <antcall
-            target="jst-jem-tests"/>
-        <echo
-            level="info"
-            message="Starting jst-j2ee-core-tests"/>
-        <antcall
-            target="jst-j2ee-core-tests"/>
-        <echo
-            level="info"
-            message="Starting jst-j2ee-tests"/>
-        <antcall
-            target="jst-j2ee-tests"/>
-        <echo
-            level="info"
-            message="Starting jst-validation-framework-tests"/>
-        <antcall
-            target="jst-validation-framework-tests"/>
-        <echo
-            level="info"
-            message="Starting jst-jsp-tests"/>
-        <antcall
-            target="jst-jsp-tests"/>
-        <echo
-            level="info"
-            message="Starting jst-ws-tests"/>
-        <antcall
-            target="jst-ws-tests"/>
-        <echo
-            level="info"
-            message="Starting wst-facets-tests"/>
-        <antcall
-            target="wst-facets-tests"/>
-        <echo
-            level="info"
-            message="Starting JPT Unit Tests"/>
-        <echo
-            level="info"
-            message="Starting jpt-utility-tests"/>
-        <antcall
-            target="jpt-utility-tests"/>
-        <echo
-            level="info"
-            message="Starting dali-core-tests"/>
-        <antcall
-            target="dali-core-tests"/>
-        <echo
-            level="info"
-            message="Ended JPT Unit Tests"/>
-        <echo
-            level="info"
-            message="Starting JSF Tests"/>
-        <antcall
-            target="jsf-tests"/>
-        <echo
-            level="info"
-            message="Ended WTP Unit Tests"/>
-        <echo
-            level="info"
-            message="Starting JSDT Tests"/>
-        <antcall
-            target="jsdt-tests"/>
-        <echo
-            level="info"
-            message="Ended JSDT Unit Tests"/>
-    </target>
-    <target
-        name="genHtml"
-        description="Generates HTML results with provided JUNIT.XSL provided"
-        unless="genHtml.disable">
-        <xslt
-            style="JUNIT.XSL"
-            basedir="${results}/xml"
-            destdir="${results}/html"/>
-    </target>
-    <target
-        name="computePluginVersion"
-        depends="test2properties"
-        unless="test2propertiesexists">
-        <java
-            classname="org.eclipse.wtp.releng.test.ComputePluginVersion">
-            <classpath>
-                <pathelement
-                    location="ComputePluginVersion.jar"/>
-            </classpath>
-            <arg
-                value="${eclipse-home}/plugins"/>
-            <arg
-                value="${testRoot}/test2.properties"/>
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-        </java>
-    </target>
-    <target
-        name="test2properties">
-        <condition
-            property="test2propertiesexists">
-            <available
-                file="${testRoot}/test2.properties"/>
-        </condition>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches3.tests/testScripts/testServer.properties b/releng.wtpbuilder/distribution/patches3.tests/testScripts/testServer.properties
deleted file mode 100644
index be77c9b..0000000
--- a/releng.wtpbuilder/distribution/patches3.tests/testScripts/testServer.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-
-# Tomcat dirs
-tomcat50Dir=jakarta-tomcat-5.0.28
-
-# Jonas dirs
-#jonas432Dir=
-jonas432DirName=JONAS_4_3_2
-
-# SWT
-#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
-
-# JSF Runtime Library directory
-jsf1.1Dir=myfaces-core-1.1.5/lib
-
-# JPT Persistence Runtime Library path
-jpt-persistence-jar=jpt/jpt-persistence-2.0-preview/lib/javax.persistence_2.0_preview.jar
-jpt-eclipselink-jar=jpt/jpt-eclipselink-2.0.0/lib/eclipselink.jar
-
-jpt-persistence10-jar=jpt/persistence-1.0/lib/persistence.jar
-jpt-eclipselink110-jar=jpt/eclipselink-1.1.0/lib/eclipselink.jar
diff --git a/releng.wtpbuilder/distribution/patches3.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/patches3.tests/testScripts/wtp-junit-tests.xml
deleted file mode 100644
index be57468..0000000
--- a/releng.wtpbuilder/distribution/patches3.tests/testScripts/wtp-junit-tests.xml
+++ /dev/null
@@ -1,316 +0,0 @@
-<?xml version="1.0"?>
-<project
-    name="JUnit tests"
-    basedir=".">
-    <property
-        environment="env"/>
-
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-    <target
-        name="init">
-        <property
-            name="junit-report-output"
-            value="${testRoot}/results"/>
-        <mkdir
-            dir="${junit-report-output}/raw"/>
-        <!--
-            if not otherwise set, be sure extraVMargs is at least some
-            string, even if unused string. Remember, though, extraVMArgs
-            can contain more than one extra arg, so much be passed to VM
-            as a "line", not "value".
-        -->
-        <property
-            name="extraVMargs"
-            value="-DextraVMargsunused=notused"/>
-
-        <!-- if not otherwise set, use a unique workspace name -->
-        <property
-            name="data-dir"
-            value="${testRoot}/junitworkspaces/workspace-${classname}"/>
-        <property
-            name="testRoot"
-            value="${testRoot}"/>
-        <!--
-            Some common values, of milliseconds to more recognizable
-            units: 14400000: 4 hours 7200000: 2 hours 3600000: 1 hour
-            1800000: 30 minutes 600000: 10 minutes
-        -->
-        <property
-            name="timeout"
-            value="3600000"/>
-        <property
-            name="junit-report-output"
-            value="${junit-report-output}"/>
-        <property
-            name="formatter"
-            value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter"/>
-        <property
-            name="test-output"
-            value="${junit-report-output}/raw/${classname}.xml"/>
-        <property
-            name="jvm"
-            value="${env.JAVA_5_HOME}/bin/java"/>
-        <dirname
-            file="${ant.file}"
-            property="currentDir"/>
-        <echo
-            level="debug"
-            message="data-dir: ${data-dir}"/>
-        <echo
-            level="debug"
-            message="plugin-name: ${plugin-name}"/>
-        <echo
-            level="debug"
-            message="testPlugin: ${testPlugin}"/>
-        <echo
-            level="debug"
-            message="classname: ${classname}"/>
-        <echo
-            level="info"
-            message="extraVMargs: ${extraVMargs}"/>
-        <echo
-            level="debug"
-            message="timeout: ${timeout}"/>
-        <echo
-            level="debug"
-            message="testRoot: ${testRoot}"/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="debug"
-            message="eclipse-home: ${eclipse-home}"/>
-        <echo
-            level="debug"
-            message="junit-report-output: ${junit-report-output}"/>
-        <echo
-            level="debug"
-            message="test-output: ${test-output}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="buildLabel: ${buildLabel}"/>
-        <echo
-            level="debug"
-            message="jvm: ${jvm}"/>
-    </target>
-    <target
-        name="core-test"
-        depends="init">
-        <echo
-            level="info"
-            message="test-type: core-test"/>
-        <ant
-            antfile="${ant.file}"
-            dir="${currentDir}"
-            target="eclipse-test">
-            <property
-                name="application"
-                value="org.eclipse.test.coretestapplication"/>
-        </ant>
-    </target>
-    <target
-        name="ui-test"
-        depends="init">
-        <echo
-            level="info"
-            message="test-type: ui-test"/>
-        <ant
-            antfile="${ant.file}"
-            dir="${currentDir}"
-            target="eclipse-test">
-            <property
-                name="application"
-                value="org.eclipse.test.uitestapplication"/>
-        </ant>
-    </target>
-    <target
-        name="eclipse-test"
-        description="Runs the specified classname as a plug-in test.">
-        <echo
-            level="info"
-            message="Running ${classname}"/>
-        <echo
-            level="debug"
-            message="Result file: ${junit-report-output}/${classname}.xml."/>
-        <echo
-            level="debug"
-            message="DISPLAY: ${env.DISPLAY}"/>
-        <mkdir
-            dir="${buildDirectory}/${buildLabel}/httplogstest"/>
-        <echo
-            message="http log messages to: ${buildDirectory}/${buildLabel}/httplogstest"/>
-        <condition
-            property="xulRunnerParam"
-            value="org.eclipse.swt.browser.XULRunnerPath"
-            else="XULRunnerPathNotSpecified">
-            <isset
-                property="env.WTP_XULRUNNER"/>
-        </condition>
-        <echo
-            message="xulRunnerParam: ${xulRunnerParam}"/>
-        <echo
-            message="WTP_XULRUNNER: ${env.WTP_XULRUNNER}"/>
-        <!--
-            If there is not exactly one launcher in the stack, we'd best
-            fail fast, since we are not expecting that, and may indicate
-            an installation that would produce unpredictable results
-        -->
-        <!--
-            requires ant 1.7, and at this point, we're running 1.6 from
-            eclipse ... <condition property="expectedNumberOfLaunchers">
-            <resourcecount when="equal" count="1" > <fileset
-            dir="${testRoot}/eclipse/plugins"> <include
-            name="org.eclipse.equinox.launcher_*.jar" /> </fileset>
-            </resourcecount> </condition> <fail message="Did not find
-            expected number of launcher jars. Check installation."
-            unless="expectedNumberOfLaunchers" />
-        -->
-        <java
-            taskname="suiteUnitTest"
-            fork="true"
-            resultProperty="suitejunitresult"
-            failonerror="false"
-            timeout="${timeout}"
-            dir="${testRoot}/eclipse"
-            jvm="${jvm}"
-            classname="org.eclipse.equinox.launcher.Main">
-            <classpath>
-                <fileset
-                    dir="${testRoot}/eclipse/plugins">
-                    <include
-                        name="org.eclipse.equinox.launcher_*.jar"/>
-                </fileset>
-            </classpath>
-            <jvmarg
-                value="-Xmx758m"/>
-            <jvmarg
-                value="-Dosgi.ws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dosgi.os=${env.BASEOS}"/>
-            <jvmarg
-                value="-Dosgi.arch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-DbuildLabel=${buildLabel}"/>
-            <jvmarg
-                value="-DbuildDirectory=${buildDirectory}"/>
-            <jvmarg
-                value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
-            <jvmarg
-                value="-DurlLogLocation=${buildDirectory}/outgoinghttplogfromtests.log"/>
-            <jvmarg
-                value="-Dwtp.autotest.noninteractive=true"/>
-            <jvmarg
-                line="${extraVMargs}"/>
-            <jvmarg
-                value="-Declipse.consolelog=true"/>
-            <jvmarg
-                value="-Dosgi.debug"/>
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <jvmarg
-                value="-Dprojectname=${projectname}"/>
-            <jvmarg
-                value="-D${xulRunnerParam}=${env.WTP_XULRUNNER}"/>
-            <arg
-                value="-nosplash"/>
-            <arg
-                value="-data"/>
-            <arg
-                value="${data-dir}"/>
-            <arg
-                value="-application"/>
-            <arg
-                value="${application}"/>
-            <arg
-                value="formatter=${formatter},${test-output}"/>
-            <arg
-                value="-testPluginName"/>
-            <arg
-                value="${plugin-name}"/>
-            <arg
-                value="-className"/>
-            <arg
-                value="${classname}"/>
-            <env
-                key="DISPLAY"
-                value="${env.DISPLAY}"/>
-            <redirector
-                output="${junit-report-output}/${classname}.output.txt"
-                error="${junit-report-output}/${classname}.error.txt"/>
-        </java>
-        <echo
-            level="info"
-            message="suitejunitresult: ${suitejunitresult}"/>
-        <antcall
-            target="summarizeFailure"/>
-        <antcall
-            target="collect-results"/>
-    </target>
-    <target
-        name="collect-results">
-        <dirname
-            property="output-dir"
-            file="${test-output}"/>
-        <basename
-            property="output-file-name"
-            file="${test-output}"/>
-        <mkdir
-            dir="${junit-report-output}/xml"/>
-        <junitreport
-            todir="${junit-report-output}/xml"
-            tofile="${classname}.xml">
-            <fileset
-                dir="${output-dir}">
-                <include
-                    name="${output-file-name}"/>
-            </fileset>
-        </junitreport>
-        <mkdir
-            dir="${junit-report-output}/html"/>
-        <xslt
-            style="${testRoot}/JUNIT.XSL"
-            basedir="${junit-report-output}"
-            includes="${classname}.xml"
-            destdir="${junit-report-output}/html"/>
-    </target>
-    <target
-        name="collect">
-        <!--
-            deprecated, each test.xml uses it, and we should remove,
-            eventually
-        -->
-        <echo
-            message="Deprecated. There is no need to call the collect task. It no longer does anything. Please remove from your test.xml file"/>
-    </target>
-    <target
-        name="summarizeFailure"
-        depends="checkFailure"
-        if="doFailure">
-        <echo
-            append="true"
-            file="${buildDirectory}/junitFailureList.log">${plugin-name}${line.separator}</echo>
-    </target>
-    <target
-        name="checkFailure">
-        <condition
-            property="doFailure">
-            <not>
-                <equals
-                    arg1="${suitejunitresult}"
-                    arg2="0"
-                    trim="true"/>
-            </not>
-        </condition>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches3.tests/testdependency.xml b/releng.wtpbuilder/distribution/patches3.tests/testdependency.xml
deleted file mode 100644
index 99b13d7..0000000
--- a/releng.wtpbuilder/distribution/patches3.tests/testdependency.xml
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-    <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <fail
-        message="Required property file does not exist: ${keyCfgFile}">
-        <condition>
-            <not>
-                <available
-                    file="${keyCfgFile}"/>
-            </not>
-        </condition>
-    </fail>
-    <property
-        file="${keyCfgFile}"/>
-    <target
-        name="get">
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined, which we do later with
-            statements such if="${groupId}.url"
-        -->
-        <property
-            file="${dependency.properties}"/>
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="dtp"/>
-        </antcall>
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="eclipseTestFramework"/>
-        </antcall>
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="tomcat.5"/>
-        </antcall>
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="jonas.4"/>
-        </antcall>
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="oagis.release"/>
-        </antcall>
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="oagis.wsdl"/>
-        </antcall>
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="jsf.1_1"/>
-        </antcall>
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="wtp"/>
-        </antcall>
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="wtp-test"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstallBase"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-    <target
-        name="getAndInstallDropins"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}${dropinsFolder}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/pave.build/build.xml b/releng.wtpbuilder/distribution/pave.build/build.xml
deleted file mode 100644
index 14239eb..0000000
--- a/releng.wtpbuilder/distribution/pave.build/build.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<project
-    default="build"
-    basedir=".">
-    <fail
-        unless="wtp.builder.home"/>
-    <property
-        file="${wtp.builder.home}/build.properties"/>
-    <target
-        name="build"
-        depends="getBaseBuilder">
-        <dirname
-            file="${ant.file}"
-            property="distribution.wtp.build.dir"/>
-        <property
-            name="buildTargets"
-            value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
-        <!--
-            for this distribution, dependencies come from project's
-            releng map project
-        -->
-        <property
-            name="dependency.properties"
-            value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-
-        <!-- calling label.xml to createg label.properties file -->
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-        <echo
-            level="info"
-            message="invoking buildTargets: ${buildTargets} to build for each component"/>
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="pave"/>
-        </ant>
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="pave_sdk"/>
-        </ant>
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="pave_tests"/>
-            <property
-                name="eclipseBuildFailOnError"
-                value="false"/>
-        </ant>
-
-        <!-- package -->
-        <antcall
-            target="package"/>
-    </target>
-
-    <!-- invoking runbuild.xml targetting getBaseBuilder -->
-    <target
-        name="getBaseBuilder"
-        if="eclipse.builder.fetch">
-        <dirname
-            file="${ant.file}"
-            property="wtbuilder.dir"/>
-        <property
-            name="buildTargets"
-            value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
-        <echo
-            level="info"
-            message="invoking buildTargets: ${buildTargets} -> getBaseBuilder"/>
-        <ant
-            antfile="${buildTargets}"
-            target="getBaseBuilder"/>
-    </target>
-    <target
-        name="package">
-        <!--
-            post, post packaging, for WTP ... "manually" assemble the
-            desired zips
-        -->
-        <!-- nothing to assemble right now -->
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/pave.site/build.xml b/releng.wtpbuilder/distribution/pave.site/build.xml
deleted file mode 100644
index 39fc90e..0000000
--- a/releng.wtpbuilder/distribution/pave.site/build.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-<project
-    name="Build specific targets and properties"
-    default="build"
-    basedir=".">
-    <!--
-        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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- = = = end standard properties pattern = = = -->
-    <echo
-        message="ant.file: ${ant.file}"/>
-    <target
-        name="build">
-    	<mkdir dir="${buildDirectory}/${buildLabel} "/>
-        <java
-            jar="${eclipse.launcher}"
-            fork="true"
-            failonerror="true">
-            <jvmarg
-                value="-Dosgi.ws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dosgi.os=${env.BASEOS}"/>
-            <jvmarg
-                value="-Dosgi.arch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-Dbuild.donottagmaps=${build.donottagmaps}"/>
-            <jvmarg
-                value="-DbuildBranch=${buildBranch}"/>
-            <jvmarg
-                value="-DbuildType=${buildType}"/>
-            <jvmarg
-                value="-DbuildId=${buildId}"/>
-            <jvmarg
-                value="-DmapVersionTag=${mapVersionTag}"/>
-            <jvmarg
-                value="-Dbuild.distribution=${build.distribution}"/>
-            <jvmarg
-                value="-DbuildDirectory=${buildDirectory}"/>
-            <jvmarg
-                value="-Dwtp.builder.home=${wtp.builder.home}"/>
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <jvmarg
-                value="-Dprojectname=${projectname}"/>
-            <jvmarg
-                value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
-            <jvmarg
-                value="-DurlLogLocation=${buildDirectory}/${buildLabel}/outgoinghttplogfromsitebuild.log"/>
-            <arg
-                value="-data"/>
-            <arg
-                value="${basedir}/workspace"/>
-            <arg
-                value="-application"/>
-            <arg
-                value="org.eclipse.ant.core.antRunner"/>
-            <arg
-                value="-buildfile"/>
-            <arg
-                value="${ant.file}"/>
-            <arg
-                value="publish"/>
-        </java>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Steps to do to publish the build results -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="publish">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-        <property
-            file="${buildDirectory}/label.properties"/>
-        <property
-            name="publish.xml"
-            value="${component.dir}/publish.xml"/>
-        <property
-            name="indexFileName"
-            value="index.php"/>
-        <property
-            name="result"
-            value="${buildDirectory}/${buildLabel}"/>
-        <property
-            name="indexTemplateFilename"
-            value="index.html.template.php"/>
-        <copy
-            file="${wtp.builder.home}/distribution/wtp.site/templateFiles/${indexTemplateFilename}"
-            tofile="${buildDirectory}/${indexFileName}"/>
-        <condition
-            property="isBuildTested"
-            value="true">
-            <available
-                file="${buildDirectory}/${buildLabel}/testResults/html"/>
-        </condition>
-        <ant
-            antfile="${publish.xml}"
-            dir="${component.dir}">
-            <property
-                name="dropTokenList"
-                value="%wtpruntime%,%wtpsdk%,%wtptest%,%wst%,%wst-sdk%,%wst-tests%,%jst-tests%,%wst-perf-tests%,%jst-perf-tests%,%jpt-runtime%,%jpt-sdk%,%jpt-tests%"/>
-            <property
-                name="webtoolsDownloadURL"
-                value="http://www.eclipse.org/downloads/download.php?file=/webtools/committers/drops"/>
-            <property
-                name="buildBranch"
-                value="${buildBranch}"/>
-            <property
-                name="isBuildTested"
-                value="${isBuildTested}"/>
-            <property
-                name="indexTemplateFilename"
-                value="${indexTemplateFilename}"/>
-        </ant>
-
-        <!--  Get the build map over for the results to point to. -->
-        <copy
-            file="${buildDirectory}/directory.txt"
-            tofile="${result}/directory.txt"/>
-
-        <!-- Copy info for build identification -->
-        <copy
-            file="${buildDirectory}/buildmachineinfo.properties"
-            tofile="${result}/buildmachineinfo.properties"/>
-
-        <!-- http access logs -->
-        <copy
-            todir="${result}/"
-            failonerror="false">
-            <fileset
-                dir="${buildDirectory}"
-                includes="*.log"/>
-        </copy>
-
-        <!-- ant build log, from control directory -->
-        <copy
-            todir="${result}/"
-            failonerror="false">
-            <fileset
-                dir="${env.ANT_WORKING}/${projectname}"
-                includes="antBuilderOutput.log"/>
-        </copy>
-
-
-
-        <!-- final count files -->
-        <countBuildFiles
-            sourceDirectory="${buildDirectory}/${buildLabel}"
-            filterString=".zip,.tar.gz"
-            outputFile="${buildDirectory}/${buildLabel}/files.count"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/pave.site/compilerXMLOutputToHTML.xsl b/releng.wtpbuilder/distribution/pave.site/compilerXMLOutputToHTML.xsl
deleted file mode 100644
index ffc7905..0000000
--- a/releng.wtpbuilder/distribution/pave.site/compilerXMLOutputToHTML.xsl
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet
-    version="1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-    <xsl:output
-        method="html"
-        indent="yes"/>
-    <xsl:template
-        match="/">
-        <html>
-            <body>
-                <xsl:apply-templates
-                    select="compiler"/>
-            </body>
-        </html>
-    </xsl:template>
-    <xsl:template
-        match="compiler">
-        <h2>Compiler Report</h2>
-        <p>
-            Compiler:
-            <xsl:value-of
-                select="@name"/>
-            <xsl:text>   </xsl:text>
-            Version:
-            <xsl:value-of
-                select="@version"/>
-        </p>
-        <xsl:apply-templates
-            select="stats"/>
-        <xsl:apply-templates
-            select="sources"/>
-    </xsl:template>
-    <xsl:template
-        name="stats"
-        match="stats">
-        <p>
-            Number of source files:
-            <xsl:value-of
-                select="count(..//source)"/>
-            Number of classfiles:
-            <xsl:value-of
-                select="number_of_classfiles/@value"/>
-        </p>
-        <p>
-            Problems:
-            <xsl:value-of
-                select="problem_summary/@problems"/>
-            (Errors:
-            <xsl:value-of
-                select="problem_summary/@errors"/>
-            Warnings:
-            <xsl:value-of
-                select="problem_summary/@warnings"/>
-            )
-        </p>
-    </xsl:template>
-    <xsl:template
-        name="sources"
-        match="sources">
-        <xsl:if
-            test="count(source) > 0">
-            <dl>
-                <xsl:for-each
-                    select="source">
-                    <xsl:variable
-                        name="package"
-                        select="normalize-space(@package)">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="path"
-                        select="normalize-space(@path)">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="classname"
-                        select="substring-after($path, $package)">
-                    </xsl:variable>
-                    <xsl:if
-                        test="count(problems) > 0">
-                        <dt
-                            style="font-weight: bold; color: black">
-                            Source File:
-                            <xsl:value-of
-                                select="$package"/>
-                            <xsl:value-of
-                                select="$classname"/>
-                        </dt>
-                        <xsl:apply-templates
-                            select="problems">
-                            <xsl:with-param
-                                name="classname">
-                                <xsl:value-of
-                                    select="$classname"/>
-                            </xsl:with-param>
-                        </xsl:apply-templates>
-                    </xsl:if>
-                </xsl:for-each>
-            </dl>
-        </xsl:if>
-    </xsl:template>
-    <xsl:template
-        match="problems">
-        <xsl:param
-            name="classname"/>
-        <xsl:for-each
-            select="problem">
-            <dd
-                style="font-weight: normal; color: black">
-                <xsl:value-of
-                    select="position()"/>
-                <xsl:text>.  </xsl:text>
-                <xsl:value-of
-                    select="@severity"/>
-                <xsl:text>:  </xsl:text>
-                <xsl:value-of
-                    select="@id"/>
-                <xsl:variable
-                    name="lineNumber"
-                    select="@line">
-                </xsl:variable>
-                <xsl:for-each
-                    select="message">
-                    <p
-                        style="margin-left: +.5in; font-size: -1; margin-top: 0;margin-bottom:0;">
-                        <small>
-                            <xsl:value-of
-                                select="@value"/>
-                        </small>
-                    </p>
-                </xsl:for-each>
-                <xsl:for-each
-                    select="source_context">
-                    <xsl:variable
-                        name="pre"
-                        select="substring(@value,0,(@sourceStart + 1))">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="main"
-                        select="substring(@value,(@sourceStart + 1),(((@sourceEnd + 1) - (@sourceStart + 1)) + 1))">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="end"
-                        select="substring(@value,(@sourceEnd + 2))">
-                    </xsl:variable>
-                    <p
-                        style="margin-left: +.5in; font-size: -2; margin-top: 0;margin-bottom:0;">
-                        <xsl:value-of
-                            select="substring($classname,2)"/>
-                        :
-                    </p>
-                    <p
-                        style="margin-left: +.5in; font-size: -2;font-family: monospace; margin-top: 0;margin-bottom:0;">
-                        <xsl:value-of
-                            select="$lineNumber"/>
-                        :
-                        <xsl:value-of
-                            select="$pre"/>
-                        <b>
-                            <u>
-                                <xsl:value-of
-                                    select="$main"/>
-                            </u>
-                        </b>
-                        <xsl:value-of
-                            select="$end"/>
-                    </p>
-                </xsl:for-each>
-            </dd>
-        </xsl:for-each>
-    </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/pave.site/publish.xml b/releng.wtpbuilder/distribution/pave.site/publish.xml
deleted file mode 100644
index 71afb65..0000000
--- a/releng.wtpbuilder/distribution/pave.site/publish.xml
+++ /dev/null
@@ -1,821 +0,0 @@
-<project
-    name="Publish Build"
-    default="default"
-    basedir=".">
-    <!--
-        Properties that must be passed to this script: buildDirectory:
-        Path to perform the build in. (A working directory) buildType:
-        Type of build (nightly, integration etc.) buildId: Build name
-        buildLabel: <buildType>-<buildName>-<timestamp>
-    -->
-    <property
-        environment="env"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be provided to publish"/>
-    <fail
-        unless="buildLabel"
-        message="buildLabel must be provided to publish"/>
-    <fail
-        unless="wtp.builder.home"
-        message="wtp.builder.home must be provided to publish"/>
-    <fail
-        unless="build.distribution"
-        message="build.distribution must be provided to publish"/>
-    <property
-        name="resultDir"
-        value="${buildDirectory}/${buildLabel}"/>
-    <!--name of generated index page-->
-    <property
-        name="indexFileName"
-        value="index.php"/>
-    <property
-        name="templateDir"
-        value="${wtp.builder.home}/distribution/${build.distribution}.site"/>
-    <property
-        name="resultingIndex"
-        value="${resultDir}/${indexFileName}"/>
-    <echo
-        level="debug"
-        message="resultDir: ${resultDir}"/>
-    <echo
-        level="debug"
-        message="templateDir: ${templateDir}"/>
-    <echo
-        level="debug"
-        message="resultingIndex: ${resultingIndex}"/>
-    <target
-        name="default">
-        <copy
-            overwrite="true"
-            file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/${indexTemplateFilename}"
-            tofile="${resultingIndex}"/>
-        <antcall
-            target="countFiles"/>
-        <antcall
-            target="generateCompileIndex"/>
-        <antcall
-            target="generateJUnitTestsIndex"/>
-        <antcall
-            target="getStaticFiles"/>
-    </target>
-    <target
-        name="generateCompileIndex">
-        <!--
-            <taskdef name="indexResults"
-            classname="org.eclipse.wtp.releng.tools.ResultsSummaryGenerator"
-            />
-        -->
-        <!--
-            isBuildTested: true|false should JUnit plugin test results
-            be used to generate index page dropTokenList: comma
-            separated list of strings which should be replaced by the
-            fileName attribute settings in the testManifest.xml.
-            xmlDirectoryName: path to directory containing JUnit plugin
-            test results in xml format (see doc is org.eclipse.test).
-            dropDirectoryName: path to directory containing the result
-            of the build. testResultsTemplateFileName: path to template
-            file used to generate page with links to JUnit test results
-            testResultsHtmlFileName: name of file which will be
-            generated with links to JUnit test results dropHtmlFileName:
-            name of generated index page hrefTestResultsTargetPath:
-            relative path from index page to directory containing JUnit
-            html test results hrefCompileLogsTargetPath: relative path
-            from index page directory containing compilelogs
-            testManifestFileName: name of xml file containing
-            descriptions of zip types and log files
-        -->
-        <property
-            file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-
-        <!-- create tables of test plugin compiles first -->
-        <antcall
-            target="generateTestCompileOutput">
-            <param
-                name="outputDirectory"
-                value="${resultDir}/testcompilelogs"/>
-        </antcall>
-
-        <!-- create table of code plugins compiles -->
-        <antcall
-            target="generateCompileOutput">
-            <param
-                name="outputDirectory"
-                value="${resultDir}/compilelogs"/>
-        </antcall>
-        <tstamp>
-            <format
-                property="TODAY"
-                pattern="MMMM d, yyyy"/>
-        </tstamp>
-
-        <!--  Insert Build Type descriptor  -->
-        <antcall
-            target="${buildType}"/>
-        <antcall
-            target="writeData"/>
-        <!--
-            Update timestamp on file to permit overwrite through Ant
-            copy task
-        -->
-        <touch
-            file="${resultingIndex}"/>
-    </target>
-    <target
-        name="generateTestCompileOutput"
-        depends="checkIfCompileLogs"
-        if="doCompileLogs">
-        <summarizeResults
-            isBuildTested="false"
-            includeAll="true"
-            dropTokenList="${dropTokenList}"
-            xmlDirectoryName=""
-            dropDirectoryName="${resultDir}"
-            testResultsTemplateFileName="${templateDir}/templateFiles/testCompileResults.php.template"
-            testResultsHtmlFileName="testCompileResults.php"
-            hrefTestResultsTargetPath=""
-            hrefCompileLogsTargetPath="testcompilelogs"
-            compileLogsDirectoryName="${outputDirectory}"/>
-        <antcall
-            target="compilerXMLToHTML"/>
-    </target>
-    <target
-        name="generateCompileOutput"
-        depends="checkIfCompileLogs"
-        if="doCompileLogs">
-        <summarizeResults
-            isBuildTested="false"
-            includeAll="true"
-            dropTokenList="${dropTokenList}"
-            xmlDirectoryName=""
-            dropDirectoryName="${resultDir}"
-            testResultsTemplateFileName="${templateDir}/templateFiles/compileResults.php.template"
-            testResultsHtmlFileName="compileResults.php"
-            hrefTestResultsTargetPath="testResults/html"
-            hrefCompileLogsTargetPath="compilelogs"
-            compileLogsDirectoryName="${outputDirectory}"/>
-        <antcall
-            target="compilerXMLToHTML"/>
-    </target>
-    <target
-        name="compilerXMLToHTML">
-        <xslt
-            basedir="${outputDirectory}"
-            destdir="${outputDirectory}"
-            includes="**/*.xml"
-            scanincludeddirectories="true"
-            style="compilerXMLOutputToHTML.xsl"
-            force="true"/>
-    </target>
-    <target
-        name="generateJUnitTestsIndex"
-        depends="checkIfTested"
-        if="doTests">
-        <!--
-            isBuildTested: true|false should JUnit plugin test results
-            be used to generate index page dropTokenList: comma
-            separated list of strings which should be replaced by the
-            fileName attribute settings in the testManifest.xml.
-            xmlDirectoryName: path to directory containing JUnit plugin
-            test results in xml format (see doc is org.eclipse.test).
-            dropDirectoryName: path to directory containing the result
-            of the build. testResultsTemplateFileName: path to template
-            file used to generate page with links to JUnit test results
-            testResultsHtmlFileName: name of file which will be
-            generated with links to JUnit test results dropHtmlFileName:
-            name of generated index page hrefTestResultsTargetPath:
-            relative path from index page to directory containing JUnit
-            html test results hrefCompileLogsTargetPath: relative path
-            from index page directory containing compilelogs
-            testManifestFileName: name of xml file containing
-            descriptions of zip types and log files
-        -->
-        <property
-            file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-
-        <!-- create table of test plugin compiles first -->
-        <!-- set isBuildTested to true for the "compile only" results -->
-        <summarizeResults
-            isBuildTested="true"
-            dropTokenList="${dropTokenList}"
-            dropDirectoryName="${resultDir}"
-            xmlDirectoryName="${resultDir}/testResults/xml"
-            testResultsTemplateFileName="${templateDir}/templateFiles/testResults.php.template"
-            testResultsHtmlFileName="testResults.php"
-            hrefTestResultsTargetPath="testResults/html"
-            compileLogsDirectoryName=""/>
-        <tstamp>
-            <format
-                property="TODAY"
-                pattern="MMMM d, yyyy"/>
-        </tstamp>
-
-        <!--  Insert Build Type descriptor  -->
-        <antcall
-            target="${buildType}"/>
-        <antcall
-            target="writeData"/>
-        <!--
-            Update timestamp on file to permit overwrite through Ant
-            copy task
-        -->
-        <touch
-            file="${resultingIndex}"/>
-    </target>
-    <target
-        name="getStaticFiles">
-        <!--get static files required in the buildLabel directory-->
-        <copy
-            todir="${resultDir}">
-            <fileset
-                dir="${templateDir}/staticDropFiles"/>
-        </copy>
-
-        <!--copy buildnotes from plugin directories-->
-        <mkdir
-            dir="${resultDir}/buildnotes"/>
-        <copy
-            todir="${resultDir}/buildnotes"
-            flatten="true">
-            <fileset
-                dir="${buildDirectory}/plugins"
-                includes="**/buildnotes_*.html"/>
-            <fileset
-                dir="${buildDirectory}/features"
-                includes="**/buildnotes_*.html"/>
-        </copy>
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/full/logIndex.php"/>
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/testLogs/logIndex.php"/>
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/testSysErrorLogs/logIndex.php"/>
-    </target>
-    <target
-        name="updateSite">
-
-
-        <!-- get our authored, tokenized site.xml file -->
-        <copy
-            file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/siteWTP.xml"
-            tofile="${buildDirectory}/${buildLabel}/updateSite/site.xml"
-            overwrite="true"
-            failonerror="true"/>
-        <!--
-            get the ${buildDirectory}/finalPluginsVersions.properties,
-            and read as properties
-        -->
-        <!-- substitute property value for tokens -->
-        <replace
-            file="${buildDirectory}/${buildLabel}/updateSite/site.xml"
-            propertyfile="${buildDirectory}/finalFeaturesVersions.properties">
-            <replacefilter
-                token="@org.eclipse.wtp@"
-                property="org.eclipse.wtp"/>
-            <replacefilter
-                token="@org.eclipse.wtp.sdk@"
-                property="org.eclipse.wtp.sdk"/>
-            <replacefilter
-                token="@org.eclipse.jst@"
-                property="org.eclipse.jst"/>
-            <replacefilter
-                token="@org.eclipse.jst.sdk@"
-                property="org.eclipse.jst.sdk"/>
-            <replacefilter
-                token="@org.eclipse.jpt.feature@"
-                property="org.eclipse.jpt.feature"/>
-            <replacefilter
-                token="@org.eclipse.jpt_sdk.feature@"
-                property="org.eclipse.jpt_sdk.feature"/>
-        </replace>
-    </target>
-    <target
-        name="countFiles">
-        <!--
-            files.count is a file that should exist in the drop
-            directory with a count of the zip files in the same
-            directory. It is required to generate a link to the build on
-            the downloads page.
-        -->
-        <countBuildFiles
-            sourceDirectory="${resultDir}"
-            filterString=".zip,.tar.gz"
-            outputFile="${resultDir}/files.count"/>
-    </target>
-
-    <!--Build type descriptors-->
-    <target
-        name="I">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Integration"/>
-    </target>
-    <target
-        name="S">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Stable"/>
-    </target>
-    <target
-        name="N">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Nightly"/>
-    </target>
-    <target
-        name="M">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Maintenance"/>
-    </target>
-    <target
-        name="R">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Release"/>
-    </target>
-    <target
-        name="T">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Test"/>
-    </target>
-    <target
-        name="P">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Patches"/>
-    </target>
-    <target
-        name="checkIfTested">
-        <echo
-            level="debug"
-            message="isBuildTested: ${isBuildTested}"/>
-        <condition
-            property="doTests">
-            <equals
-                arg1="${isBuildTested}"
-                arg2="true"
-                trim="true"
-                casesensitive="false"/>
-        </condition>
-    </target>
-    <target
-        name="checkIfCompileLogs">
-        <condition
-            property="doCompileLogs">
-            <available
-                file="${outputDirectory}"/>
-        </condition>
-    </target>
-    <target
-        name="writeData">
-        <!--  Insert Build Date  -->
-        <replace
-            file="${resultingIndex}"
-            token="@date@"
-            value="${TODAY}"/>
-
-        <!--  Insert Build Name  -->
-        <replace
-            file="${resultingIndex}"
-            token="@build@"
-            value="${buildLabel}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@buildBranch@"
-            value="${buildBranch}"/>
-
-        <!--  Insert PreRequsites  -->
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformFile@"
-            value="${eclipseplatform.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformURL@"
-            value="${eclipseplatform.url}/${eclipseplatform.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformBuildURL@"
-            value="${eclipseplatform.url}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformfilelinux@"
-            value="${eclipseplatform.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformfilewindows@"
-            value="${eclipseplatform.file.win32-win32-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformfilemacos@"
-            value="${eclipseplatform.file.macosx-carbon-ppc}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformBuildHome@"
-            value="${eclipseplatform.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatform.mirror.prefixuri@"
-            value="${eclipseplatform.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatform.fspath.prefix@"
-            value="${eclipseplatform.fspath.prefix}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseFile@"
-            value="${eclipse.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseURL@"
-            value="${eclipse.url}/${eclipse.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseBuildURL@"
-            value="${eclipse.url}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilelinux@"
-            value="${eclipse.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilewindows@"
-            value="${eclipse.file.win32-win32-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilemacos@"
-            value="${eclipse.file.macosx-carbon-ppc}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseBuildHome@"
-            value="${eclipse.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipse.mirror.prefixuri@"
-            value="${eclipse.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipse.fspath.prefix@"
-            value="${eclipse.fspath.prefix}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@testURL@"
-            value="${eclipseTestFramework.url}/${eclipseTestFramework.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@testFile@"
-            value="${eclipseTestFramework.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfName@"
-            value="${emf.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfDescription@"
-            value="${emf.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfFile@"
-            value="${emf.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfURL@"
-            value="${emf.url}/${emf.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfBuildHome@"
-            value="${emf.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emf.mirror.prefixuri@"
-            value="${emf.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsourceURL@"
-            value="${emfsourcedoc.url}/${emfsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsourceFile@"
-            value="${emfsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsourceName@"
-            value="${emfsourcedoc.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsourceDescription@"
-            value="${emfsourcedoc.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsourceBuildHome@"
-            value="${emfsourcedoc.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsource.mirror.prefixuri@"
-            value="${emfsourcedoc.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsourceURL@"
-            value="${emfxsdsourcedoc.url}/${emfsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsourceFile@"
-            value="${emfxsdsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsourceName@"
-            value="${emfxsdsourcedoc.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsourceDescription@"
-            value="${emfxsdsourcedoc.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsourceBuildHome@"
-            value="${emfxsdsourcedoc.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsource.mirror.prefixuri@"
-            value="${emfxsdsourcedoc.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdFile@"
-            value="${emfxsd.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdName@"
-            value="${emfxsd.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdDescription@"
-            value="${emfxsd.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdURL@"
-            value="${emfxsd.url}/${emfxsd.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdBuildHome@"
-            value="${emfxsd.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsd.mirror.prefixuri@"
-            value="${emfxsd.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationFile@"
-            value="${emfvalidation.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationURL@"
-            value="${emfvalidation.url}/${emfvalidation.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationBuildHome@"
-            value="${emfvalidation.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidation.mirror.prefixuri@"
-            value="${emfvalidation.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationName@"
-            value="${emfvalidation.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationDescription@"
-            value="${emfvalidation.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsourceFile@"
-            value="${emfvalidationsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsourceURL@"
-            value="${emfvalidationsourcedoc.url}/${emfvalidationsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsourceBuildHome@"
-            value="${emfvalidationsourcedoc.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsource.mirror.prefixuri@"
-            value="${emfvalidationsourcedoc.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsourceName@"
-            value="${emfvalidationsourcedoc.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsourceDescription@"
-            value="${emfvalidationsourcedoc.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstName@"
-            value="${wst.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstDescription@"
-            value="${wst.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstFile@"
-            value="${wst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstURL@"
-            value="${wst.url}/${wst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstBuildHome@"
-            value="${wst.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wst.mirror.prefixuri@"
-            value="${wst.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstName@"
-            value="${jst.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstDescription@"
-            value="${jst.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstFile@"
-            value="${jst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstURL@"
-            value="${jst.url}/${jst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstBuildHome@"
-            value="${jst.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jst.mirror.prefixuri@"
-            value="${jst.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpName@"
-            value="${wtp.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpDescription@"
-            value="${wtp.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpFile@"
-            value="${wtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpURL@"
-            value="${wtp.url}/${wtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpBuildHome@"
-            value="${wtp.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtp.mirror.prefixuri@"
-            value="${wtp.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefFile@"
-            value="${gef.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefURL@"
-            value="${gef.url}/${gef.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefBuildHome@"
-            value="${gef.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gef.mirror.prefixuri@"
-            value="${gef.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefName@"
-            value="${gef.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefDescription@"
-            value="${gef.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipserelengFile@"
-            value="${eclipsereleng.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipserelengURL@"
-            value="${eclipsereleng.url}/${eclipsereleng.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipFile@"
-            value="${orbitthirdpartyzip.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipURL@"
-            value="${orbitthirdpartyzip.url}/${orbitthirdpartyzip.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipBuildHome@"
-            value="${orbitthirdpartyzip.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzip.mirror.prefixuri@"
-            value="${orbitthirdpartyzip.mirror.prefixuri}"/>
-
-
-        <!-- no longer used. Post 1.5.5 -->
-        <replace
-            file="${resultingIndex}"
-            token="@jemFile@"
-            value="${jem.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jemURL@"
-            value="${jem.url}/${jem.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jemBuildHome@"
-            value="${jem.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jem.mirror.prefixuri@"
-            value="${jem.mirror.prefixuri}"/>
-        <!--
-            these token/s should not exist in maintenance stream, but do
-            no harm done, so in the interests of keeping builder streams
-            in sync, we'll leave them here as place hold
-        -->
-        <replace
-            file="${resultingIndex}"
-            token="@dtpFile@"
-            value="${dtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtpURL@"
-            value="${dtp.url}/${dtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtpBuildHome@"
-            value="${dtp.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtp.mirror.prefixuri@"
-            value="${dtp.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtpName@"
-            value="${dtp.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtpDescription@"
-            value="${dtp.description}"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/pave.site/staticDropFiles/access_err.gif b/releng.wtpbuilder/distribution/pave.site/staticDropFiles/access_err.gif
deleted file mode 100644
index 4f0748a..0000000
--- a/releng.wtpbuilder/distribution/pave.site/staticDropFiles/access_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/pave.site/staticDropFiles/access_warn.gif b/releng.wtpbuilder/distribution/pave.site/staticDropFiles/access_warn.gif
deleted file mode 100644
index 8386e3e..0000000
--- a/releng.wtpbuilder/distribution/pave.site/staticDropFiles/access_warn.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/pave.site/staticDropFiles/buildNotes.php b/releng.wtpbuilder/distribution/pave.site/staticDropFiles/buildNotes.php
deleted file mode 100644
index f666887..0000000
--- a/releng.wtpbuilder/distribution/pave.site/staticDropFiles/buildNotes.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<html>
-<head>
-<?php
-$parts = explode("/", getcwd());
-$parts2 = explode("-", $parts[count($parts) - 1]);
-$buildName = $parts2[1];
-
-echo "<title>Build Notes for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Build Notes</font></b></p>
-
-<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"> Build Notes for <?php echo "$buildName"; ?></font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$hasNotes = false;
-$aDirectory = dir("buildnotes");
-while ($anEntry = $aDirectory->read()) {
-	if ($anEntry != "." && $anEntry != "..") {
-		//print_r($anEntry);
-		//echo "<br />";
-
-		$subject = $anEntry;
-		$pattern = '/^buildnotes_(.*)/i';
-		preg_match($pattern, $subject, $matches);
-		$subject = $matches[1];
-		//print_r($subject);
-		//echo "<br />";
-		$pattern = '/^(.*)\.html$/';
-		preg_match($pattern, $subject, $matches);
-		//print_r($matches);
-		//echo "<br />";
-
-		$component = $matches[1];
-
-		$line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
-		echo "<tr>";
-		echo "$line";
-		echo "</tr>";
-		$hasNotes = true;
-
-	}
-}
-$aDirectory.closedir();
-if (!$hasNotes) {
-	echo "<br>There are no build notes for this build.";
-}
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/pave.site/staticDropFiles/compile_err.gif b/releng.wtpbuilder/distribution/pave.site/staticDropFiles/compile_err.gif
deleted file mode 100644
index c2bfdd6..0000000
--- a/releng.wtpbuilder/distribution/pave.site/staticDropFiles/compile_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/pave.site/staticDropFiles/compile_warn.gif b/releng.wtpbuilder/distribution/pave.site/staticDropFiles/compile_warn.gif
deleted file mode 100644
index cf4fdf9..0000000
--- a/releng.wtpbuilder/distribution/pave.site/staticDropFiles/compile_warn.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/pave.site/staticDropFiles/consoleLogs.php b/releng.wtpbuilder/distribution/pave.site/staticDropFiles/consoleLogs.php
deleted file mode 100644
index 2ee3c36..0000000
--- a/releng.wtpbuilder/distribution/pave.site/staticDropFiles/consoleLogs.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<html>
-<head>
-<?php
-$parts = explode("/", getcwd());
-$parts2 = explode("-", $parts[count($parts) - 1]);
-$buildName = $parts2[1];
-
-echo "<title>Test Console Output for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-<title>Console Logs from Running JUnit Plug-in Tests</title>
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b></p>
-
-<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">Console output from running
-		JUnit plugin tests for <?php echo "$buildName"; ?> </font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$rootDir = "testResults/consolelogs";
-$hasNotes = false;
-$aDirectory = dir($rootDir);
-$index = 0;
-$dirindex = 0;
-while ($anEntry = $aDirectory->read()) {
-	if ($anEntry != "." && $anEntry != "..") {
-		if (is_file("$rootDir/$anEntry")) {
-			$entries[$index] = $anEntry;
-			$index++;
-		} else if (is_dir("$rootDir/$anEntry")) {
-			$direntries[$dirindex] = $anEntry;
-			$dirindex++;
-		}
-	}
-}
-$aDirectory->close();
-
-
-sort($entries);
-sort($direntries);
-
-for ($i = 0; $i < $dirindex; $i++) {
-	$anEntry = $direntries[$i];
-	$line = "<td><a href=\"testResults/consolelogs/$anEntry/logIndex.php\">$anEntry</a></td>";
-	echo "<tr>";
-	echo "$line";
-	echo "</tr>";
-}
-for ($i = 0; $i < $index; $i++) {
-	$anEntry = $entries[$i];
-	$logsize = filesize("testResults/consolelogs/$anEntry");
-
-
-	$level = 0;
-	if ($logsize > 20000) {
-		$level = 2;
-	}
-	else if ($logsize > 2000) {
-		$level = 1;
-	}
-
-	if ($level == 0) {
-		$line = "<td><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-	}
-	else if ($level == 1) {
-		$line = "<td><em><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-	} else if ($level == 2) {
-		$line = "<td><strong><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-	}
-
-
-	echo "<tr>";
-	echo "$line";
-	echo "</tr>";
-	$hasNotes = true;
-}
-
-if (!$hasNotes) {
-	echo "<br>There are no test logs for this build.";
-}
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/pave.site/staticDropFiles/junit_err.gif b/releng.wtpbuilder/distribution/pave.site/staticDropFiles/junit_err.gif
deleted file mode 100644
index 1b7ff9d..0000000
--- a/releng.wtpbuilder/distribution/pave.site/staticDropFiles/junit_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/pave.site/staticDropFiles/logIndex.php b/releng.wtpbuilder/distribution/pave.site/staticDropFiles/logIndex.php
deleted file mode 100644
index 721ca00..0000000
--- a/releng.wtpbuilder/distribution/pave.site/staticDropFiles/logIndex.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<html>
-<head>
-<?php
-
-function endsWith( $str, $sub ) {
-
-	return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub );
-}
-
-$parts = explode("/", getcwd());
-$parts2 = explode("-", $parts[count($parts) - 1]);
-$buildName = $parts2[1];
-
-echo "<title>Test Console Output for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-<title>Console Logs from Running JUnit Plug-in Tests</title>
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b></p>
-
-<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">Console output from running
-		JUnit plugin tests for <?php echo "$buildName"; ?> </font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$hasNotes = false;
-$aDirectory = dir(".");
-$index = 0;
-while ($anEntry = $aDirectory->read()) {
-	if ($anEntry != "." && $anEntry != ".." && !endsWith(__FILE__, $anEntry)) {
-		$entries[$index] = $anEntry;
-		$index++;
-	}
-}
-aDirectory.closedir();
-
-
-sort($entries);
-
-for ($i = 0; $i < $index; $i++) {
-	$anEntry = $entries[$i];
-	$logsize = filesize("$anEntry");
-
-
-	$level = 0;
-	if ($logsize > 20000) {
-		$level = 2;
-	}
-	else if ($logsize > 2000) {
-		$level = 1;
-	}
-
-	if ($level == 0) {
-		$line = "<td><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-	}
-	else if ($level == 1) {
-		$line = "<td><em><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-	} else if ($level == 2) {
-		$line = "<td><strong><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-	}
-
-
-	echo "<tr>";
-	echo "$line";
-	echo "</tr>";
-	$hasNotes = true;
-}
-
-if (!$hasNotes) {
-	echo "<br>There are no test logs for this build.";
-}
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/pave.site/staticDropFiles/miscUtil.php b/releng.wtpbuilder/distribution/pave.site/staticDropFiles/miscUtil.php
deleted file mode 100644
index 5001f38..0000000
--- a/releng.wtpbuilder/distribution/pave.site/staticDropFiles/miscUtil.php
+++ /dev/null
@@ -1,219 +0,0 @@
-<?php
-
-// todo: unsure if can handle filenames that are URLs?
-// handy constant to compute file size in megabytes
-
-function fileSizeInMegs($filename) {
-	$onemeg=1024*1024;
-	$zipfilesize=filesize($filename);
-	$zipfilesize=round($zipfilesize/$onemeg, 0);
-	return $zipfilesize;
-}
-
-function fileSizeForDisplay($filename) {
-	$onekilo=1024;
-	$onemeg=$onekilo * $onekilo;
-	$criteria = 10 * $onemeg;
-	$scaleChar = "M";
-	if (file_exists($filename)) {
-		$zipfilesize=filesize($filename);
-		if ($zipfilesize > $criteria) {
-			$zipfilesize=round($zipfilesize/$onemeg, 0);
-			$scaleChar = "M";
-		}
-		else {
-			$zipfilesize=round($zipfilesize/$onekilo, 0);
-			$scaleChar = "K";
-		}
-	}
-	else {
-		$zipfilesize = 0;
-	}
-	$result =  "(" . $zipfilesize . $scaleChar . ")";
-	return $result;
-}
-
-
-function displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription) {
-	echo "<td align=\"right\" valign=\"top\" width=\"30%\">";
-	echo "<a href=\"$downloadprefix$filename\">" . $fileShortDescription . "</a>";
-	echo "</td><td align=\"right\" valign=\"top\" width=\"3%\">";
-	echo $zipfilesize;
-	echo "</td>";
-	echo "<td align=\"right\" valign=\"top\" width=\"2%\">";
-	echo "[<a href=\"checksum/$filename.md5\">md5</a>]";
-	echo "</td>";
-}
-
-function resourceExist($url, $mirrorPrefixuri, $prereqfilename, $eclipseFSpathPrefix)
-{
-	$result = false;
-
-	$allowURLopen = ini_get('allow_url_fopen');
-
-	if ($allowURLopen && stream_last_modified($url)) {
-		$result = true;
-	}
-	else {
-		// TODO: for now, we'll do a raw check on the whole file name, since enable_url_open
-		// is off. better would be to check if we are on build.eclipse.org or download.eclipse.org?
-		$wholePath = trim($eclipseFSpathPrefix) . "/" . trim($mirrorPrefixuri) . "/" . trim($prereqfilename);
-		if (file_exists($wholePath)) {
-			$result = true;
-		}
-	}
-	return $result;
-}
-
-function stream_last_modified($url)
-{
-	if (function_exists('version_compare') && version_compare(phpversion(), '4.3.0') > 0)
-	{
-		if (!($fp = @fopen($url, 'r')))
-		return NULL;
-
-		$meta = stream_get_meta_data($fp);
-		for ($j = 0; isset($meta['wrapper_data'][$j]); $j++)
-		{
-			if (strstr(strtolower($meta['wrapper_data'][$j]), 'last-modified'))
-			{
-				$modtime = substr($meta['wrapper_data'][$j], 15);
-				break;
-			}
-		}
-		fclose($fp);
-	}
-	else
-	{
-		$parts = parse_url($url);
-		$host  = $parts['host'];
-		$path  = $parts['path'];
-
-		if (!($fp = @fsockopen($host, 80)))
-		return NULL;
-
-		$req = "HEAD $path HTTP/1.0\r\nUser-Agent: PHP/".phpversion()."\r\nHost: $host:80\r\nAccept: */*\r\n\r\n";
-		fputs($fp, $req);
-
-		while (!feof($fp))
-		{
-			$str = fgets($fp, 4096);
-			if (strstr(strtolower($str), 'last-modified'))
-			{
-				$modtime = substr($str, 15);
-				break;
-			}
-		}
-		fclose($fp);
-	}
-	return isset($modtime) ? strtotime($modtime) : time();
-}
-
-function isMirrored($uriToCheck) {
-	global $debugScript;
-	global $debugFunctions;
-	$localuri = $uriToCheck;
-
-	$debugMirrorList = false;
-	if ($debugScript) {
-		echo "uriToCheck: " . $localuri . "<br />";
-	}
-
-	$xmlcount = 0;
-
-	/* This method true and accurate method of parsing mirror results
-	 * may be expensive, and would
-	 * likely cause artificially high counts of "downloads".
-	 * Could maybe use if somehow only checked once ever 5 minutes or something.
-
-
-	 // turn off warnings, as sometimes HTML is returned, which causes lots of warnings
-	 $holdLevel = error_reporting(E_ERROR);
-	 $mirrorsxml=simplexml_load_file(rawurlencode($localuri) . urlencode("&format=xml"));
-	 error_reporting($holdLevel);
-
-
-	 if ($mirrorsxml) {
-	 if ($debugFunctions) {
-	 echo "root node: " . $mirrorsxml->getName() . "<br />";
-	 }
-	 if (strcmp($mirrorsxml->getName(), "mirrors") == 0) {
-	 foreach ($mirrorsxml->children() as $mirror) {
-	 if (strcmp($mirror->getName(),"mirror") == 0) {
-	 $xmlcount=$xmlcount+1;
-	 }
-	 if ($debugMirrorList) {
-	 print_r($mirror);
-	 echo "<br />";
-	 }
-	 }
-	 }
-	 if ($debugFunctions) {
-	 echo "Mirror count: " . $xmlcount . "<br />";
-	 }
-	 }
-	 */
-	/*
-	 * Use simple heuristic based on pattern
-	 * in the URI ... if it contains "/downloads/" then assume it's mirrored
-	 */
-	if (strpos($uriToCheck, "webtools/downloads/") > 0) {
-		$xmlcount = 1;
-	}
-	return ($xmlcount > 0);
-
-}
-
-// TODO: replace with Phoenix variables
-function getPlatform () {
-	global $debugScript;
-	global $debugFunctions;
-	// getBrowser is expensive, so cache the data
-	static $browser;
-	$platform = "unknown";
-
-
-	if(ini_get("browscap")) {
-		if(!isset($browser)){
-			$browser = get_browser(null, true);
-		}
-
-		if ($browser) {
-			$rawPlatform = $browser['platform'];
-			if ($debugFunctions) {
-				echo "browser platfrom: " . $rawPlatform . "<br />" ;
-			}
-
-			if ($debugFunctions) {
-				$browserKeys = array_keys($browser);
-				foreach ($browserKeys as $key) {
-					echo $key . ": " . $browser[$key] . "<br />";
-				}
-			}
-		}
-		if (strpos($rawPlatform, "Win") === 0) {
-			$platform="windows";
-		} else if (strpos($rawPlatform, "Linux") === 0) {
-			$platform="linux";
-		} else if (strpos($rawPlatform, "Mac") === 0) {
-			$platform="mac";
-		}
-	}
-	return $platform;
-}
-
-
-function getPrereqReferenceOrName($eclipseMirrorScript, $mirrorPrefixuri, $prerequrl, $prereqfilename, $eclipseFSpathPrefix) {
-	// todo: we really only need "if exists" so could make a bit more efficient
-	// I tried "file_exists" but is didn't seem to work on my test server
-	// For these pre-reqs, we assume if they exist, they are mirrored. This is true
-	// 99% of the time.
-
-	if (resourceExist($prerequrl, $mirrorPrefixuri, $prereqfilename, $eclipseFSpathPrefix)) {
-		$reflink="<a href=\"" . $eclipseMirrorScript . $mirrorPrefixuri . "/" . $prereqfilename . "\">" . $prereqfilename . "</a>";
-	} else {
-		$reflink=$prereqfilename;
-	}
-	return $reflink;
-}
-?>
diff --git a/releng.wtpbuilder/distribution/pave.site/staticDropFiles/pending.gif b/releng.wtpbuilder/distribution/pave.site/staticDropFiles/pending.gif
deleted file mode 100644
index 66db2a6..0000000
--- a/releng.wtpbuilder/distribution/pave.site/staticDropFiles/pending.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/pave.site/staticDropFiles/pending1.gif b/releng.wtpbuilder/distribution/pave.site/staticDropFiles/pending1.gif
deleted file mode 100644
index 1b2ea6e..0000000
--- a/releng.wtpbuilder/distribution/pave.site/staticDropFiles/pending1.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/pave.site/staticDropFiles/report2.php b/releng.wtpbuilder/distribution/pave.site/staticDropFiles/report2.php
deleted file mode 100644
index cb68e7b..0000000
--- a/releng.wtpbuilder/distribution/pave.site/staticDropFiles/report2.php
+++ /dev/null
@@ -1,45 +0,0 @@
-
-<?php
-
-function parse_testResults($filename)
-{
-	$junitFailures = 0;
-	if (is_file($filename)) {
-		$handle = @fopen($filename, "r");
-		if ($handle)
-		{
-			$size = filesize($filename);
-			$content = fread($handle, $size);
-			fclose($handle);
-			$junitStart = strpos($content, "Errors &amp; Failures");
-			$junitEnd = strpos($content, "</table>", $junitStart);
-			$junitInfo = substr($content, $junitStart, $junitEnd - $junitStart);
-			$start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">");
-			while ($start !== false)
-			{
-				$start += 29;
-				$stop = strpos($junitInfo, "</font></b></td>", $start);
-				if ($stop !== false)
-				{
-					$result = substr($junitInfo, $start, $stop - $start);
-					if (is_numeric($result))
-					{
-						$junitFailures += $result;
-					}
-					else if (strcmp($result, "DNF") == 0)
-					{
-						$junitFailures++;
-					}
-				}
-				$start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">", $stop);
-			}
-			$results = array($junitFailures);
-			return $results;
-		}
-	}
-}
-
-
-?>
-
-
diff --git a/releng.wtpbuilder/distribution/pave.site/templateFiles/compileResults.php.template b/releng.wtpbuilder/distribution/pave.site/templateFiles/compileResults.php.template
deleted file mode 100644
index f785771..0000000
--- a/releng.wtpbuilder/distribution/pave.site/templateFiles/compileResults.php.template
+++ /dev/null
@@ -1,76 +0,0 @@
-<html>
-<head>
-
-<?php
-        $parts = explode("/", getcwd());
-        $parts2 = explode("-", $parts[count($parts) - 1]);
-        $buildName = $parts2[1];
-
-        echo "<title>Compile Logs: Code Bundles for $buildName</title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2%;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-}
-</style>
-</head>
-<body>
-
-<?php
-        echo "<h1>Compile Logs: Code Bundles for $buildName</h1>";
-?>
-
-
-<table id=tabledata align = "center" width="75%" border="1">
-  <tr>
-    <td class="bold" align="center">Compile Logs</td>
-    <td class="bold" align="center">Compile Errors</td>
-    <td class="bold" align="center">Compiler Warnings</td>
-    <td class="bold" align="center">Access Violations</td>
-    <td class="bold" align="center">Access Warnings</td>
-  </tr>
-
-  %compilelogs%
-
-</table>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/pave.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/pave.site/templateFiles/index.html.template.php
deleted file mode 100644
index 04b16bd..0000000
--- a/releng.wtpbuilder/distribution/pave.site/templateFiles/index.html.template.php
+++ /dev/null
@@ -1,850 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<?php
-
-ini_set("display_errors", "true");
-error_reporting (E_ALL);
-
-
-$buildBranch="@buildBranch@";
-$build="@build@";
-$type="@type@";
-$builddate="@date@";
-
-$eclipseMirrorPrefixuri="@eclipse.mirror.prefixuri@";
-$eclipseFSpathPrefix="@eclipse.fspath.prefix@";
-
-$eclipsefilelinux="@eclipsefilelinux@";
-$eclipsefilewindows="@eclipsefilewindows@";
-$eclipsefilemacosx="@eclipsefilemacos@";
-
-$eclipseURL="@eclipseURL@";
-$eclipseFile="@eclipseFile@";
-$eclipseBuildURL="@eclipseBuildURL@";
-$eclipseBuildHome="@eclipseBuildHome@";
-$eclipseName="@eclipseName@";
-$eclipseDescription="@eclipseDescription@";
-
-$eclipseplatformMirrorPrefixuri="@eclipseplatform.mirror.prefixuri@";
-$eclipseplatformFSpathPrefix="@eclipse.fspath.prefix@";
-
-$eclipseplatformfilelinux="@eclipseplatformfilelinux@";
-$eclipseplatformfilewindows="@eclipseplatformfilewindows@";
-$eclipseplatformfilemacosx="@eclipseplatformfilemacos@";
-
-$eclipseplatformURL="@eclipseplatformURL@";
-$eclipseplatformFile="@eclipseplatformFile@";
-$eclipseplatformBuildURL="@eclipseplatformBuildURL@";
-$eclipseplatformBuildHome="@eclipseplatformBuildHome@";
-$eclipseplatformName="@eclipseplatformName@";
-$eclipseplatformDescription="@eclipseplatformDescription@";
-
-$testURL="@testURL@";
-$testFile="@testFile@";
-
-$wstURL="@wstURL@";
-$wstFile="@wstFile@";
-$wstMirrorPrefixuri="@wst.mirror.prefixuri@";
-$wstBuildHome="@wstBuildHome@";
-$wstName="@wstName@";
-$wstDescription="@wstDescription@";
-
-$jstURL="@jstURL@";
-$jstFile="@jstFile@";
-$jstMirrorPrefixuri="@jst.mirror.prefixuri@";
-$jstBuildHome="@jstBuildHome@";
-$jstName="@jstName@";
-$jstDescription="@jstDescription@";
-
-$wtpURL="@wtpURL@";
-$wtpFile="@wtpFile@";
-$wtpMirrorPrefixuri="@wtp.mirror.prefixuri@";
-$wtpBuildHome="@wtpBuildHome@";
-$wtpName="@wtpName@";
-$wtpDescription="@wtpDescription@";
-
-$gefURL="@gefURL@";
-$gefFile="@gefFile@";
-$gefMirrorPrefixuri="@gef.mirror.prefixuri@";
-$gefBuildHome="@gefBuildHome@";
-$gefName="@getName@";
-$gefDescription="@gefDescription@";
-
-$emfURL="@emfURL@";
-$emfFile="@emfFile@";
-$emfMirrorPrefixuri="@emf.mirror.prefixuri@";
-$emfBuildHome="@emfBuildHome@";
-$emfName="@emfName@";
-$emfDescription="@emfDescription@";
-
-$emfsourceURL="@emfsourceURL@";
-$emfsourceFile="@emfsourceFile@";
-$emfsourceMirrorPrefixuri="@emfsource.mirror.prefixuri@";
-$emfsourceBuildHome="@emfsourceBuildHome@";
-$emfsourceName="@emfsourceName@";
-$emfsourceDescription="@emfsourceDescription@";
-
-
-$emfxsdURL="@emfxsdURL@";
-$emfxsdFile="@emfxsdFile@";
-$emfxsdMirrorPrefixuri="@emfxsd.mirror.prefixuri@";
-$emfxsdBuildHome="@emfxsdBuildHome@";
-$emfxsdName="@emfxsdName@";
-$emfxsdDescription="@emfxsdDescription@";
-
-$emfxsdsourceURL="@emfxsdsourceURL@";
-$emfxsdsourceFile="@emfxsdsourceFile@";
-$emfxsdsourceMirrorPrefixuri="@emfxsdsource.mirror.prefixuri@";
-$emfxsdsourceBuildHome="@emfxsdsourceBuildHome@";
-$emfxsdsourceName="@emfxsdsourceName@";
-$emfxsdsourceDescription="@emfxsdsourceDescription@";
-
-
-$emfvalidationURL="@emfvalidationURL@";
-$emfvalidationFile="@emfvalidationFile@";
-$emfvalidationMirrorPrefixuri="@emfvalidation.mirror.prefixuri@";
-$emfvalidationBuildHome="@emfvalidationBuildHome@";
-$emfvalidationName="@emfvalidationName@";
-$emfvalidationDescription="@emfvalidationDescription@";
-
-$emfvalidationsourceURL="@emfvalidationsourceURL@";
-$emfvalidationsourceFile="@emfvalidationsourceFile@";
-$emfvalidationsourceMirrorPrefixuri="@emfvalidationsource.mirror.prefixuri@";
-$emfvalidationsourceBuildHome="@emfvalidationsourceBuildHome@";
-$emfvalidationsourceName="@emfvalidationsourceName@";
-$emfvalidationsourceDescription="@emfvalidationsourceDescription@";
-
-
-$dtpURL="@dtpURL@";
-$dtpFile="@dtpFile@";
-$dtpMirrorPrefixuri="@dtp.mirror.prefixuri@";
-$dtpBuildHome="@dtpBuildHome@";
-$dtpName="@dtpName@";
-$dtpDescription="@dtpDescription@";
-
-
-$eclipserelengFile="@eclipserelengFile@";
-$eclipserelengURL="@eclipserelengURL@";
-$orbitthirdpartyzipFile="@orbitthirdpartyzipFile@";
-$orbitthirdpartyzipURL="@orbitthirdpartyzipURL@";
-$orbitthirdpartyzipBuildHome="@orbitthirdpartyzipBuildHome@";
-$orbitthirdpartyzipMirrorPrefixuri="@orbitthirdpartyzip.mirror.prefixuri@";
-
-
-$prereq_eclipse="true";
-$prereq_eclipseplatform="false";
-$prereq_emf="true";
-$prereq_emfxsd="true";
-$prereq_emfvalidation="true";
-$prereq_gef="true";
-$prereq_dtp="true";
-$prereq_wst="false";
-$prereq_jst="false";
-$prereq_wtp="true";
-
-
-include("miscUtil.php");
-
-
-
-
-$debugScript = false;
-$debugFunctions = false;
-
-$defaultMirrorScript="";
-$defaultWTPMirrorPrefix="./";
-
-$eclipseMirrorScript="http://www.eclipse.org/downloads/download.php?file=";
-
-// TODO: improve so this hard coding isn't required.
-// This depends on the declare script changing webtools/committers to webtools/downloads
-// And, the logic is such that if it is not mirrored, this URI is not used at all, just
-// a relative reference only
-$eclipseWTPMirrorPrefix="/webtools/committers/drops/$buildBranch/$build/";
-
-
-$mirrorScript=$defaultMirrorScript;
-$downloadprefix=$defaultWTPMirrorPrefix;
-
-
-$keytestMirrorString=$eclipseMirrorScript . "$eclipseWTPMirrorPrefix/wtp-incubator-pave-sdk-$build.zip";
-if (isMirrored($keytestMirrorString) ) {
-	$mirrorScript=$eclipseMirrorScript;
-	$downloadprefix="${mirrorScript}${eclipseWTPMirrorPrefix}";
-}
-
-if ($debugScript)  {
-	echo "inferred platform: " . getPlatform();
-}
-
-
-// our summary results handling requires php 5 (for simple xml file loading)
-// so, if not php 5, just don't display any summary results
-// This was found to be required, since some mirror our whole site (e.g. IBM)
-// and not all mirrors use PHP 5
-$displayTestSummary=false;
-if (phpversion() >= 5) {
-
-	$code_totalBundles=0;
-	$code_totalErrors=0;
-	$code_totalWarnings=0;
-	$code_totalforbiddenAccessWarningCount=0;
-	$code_totaldiscouragedAccessWarningCount=0;
-
-	$test_totalBundles=0;
-	$test_totalErrors=0;
-	$test_totalWarnings=0;
-	$test_totalforbiddenAccessWarningCount=0;
-	$test_totaldiscouragedAccessWarningCount=0;
-
-
-	$displayTestSummary=true;
-	// expecting grandTotalErrors and grandTotalTests
-	$filename = "unitTestsSummary.xml";
-	if (file_exists($filename)) {
-		$prefix = "unitTests_";
-		$unitTestsSummary = simplexml_load_file($filename);
-		foreach ($unitTestsSummary->summaryItem as $summaryItem) {
-			$name = $summaryItem->name;
-			$value = $summaryItem->value;
-			$code= "\$" . $prefix . $name . " = " . $value . ";";
-			//echo "<br />code: " . $code;
-			eval($code);
-		}
-	}
-
-	$filename = "compilelogsSummary.xml";
-	if (file_exists($filename)) {
-		$prefix = "code_";
-		$compileSummary = simplexml_load_file($filename);
-		foreach ($compileSummary->summaryItem as $summaryItem) {
-			$name = $summaryItem->name;
-			$value = $summaryItem->value;
-			$code= "\$" . $prefix . $name . " = " . $value . ";";
-			//echo "<br />code: " . $code;
-			eval($code);
-		}
-	}
-
-	$filename = "testcompilelogsSummary.xml";
-	if (file_exists($filename)) {
-		$prefix = "test_";
-		$compileSummary = simplexml_load_file($filename);
-		foreach ($compileSummary->summaryItem as $summaryItem) {
-			$name = $summaryItem->name;
-			$value = $summaryItem->value;
-			$code= "\$" . $prefix . $name . " = " . $value . ";";
-			//echo "<br />code: " . $code;
-			eval($code);
-		}
-	}
-}
-
-$incubating="true";
-
-
-
-if ($incubating) {
-	echo '<title>WTP Incubator Downloads</title>';
-}
-else {
-	echo '<title>WTP Downloads</title>';
-}
-
-
-?>
-
-
-</head>
-
-<body>
-
-
-<?php
-
-// tiny banner to remind when looking at "local" machine results
-$serverName = $_SERVER["SERVER_NAME"];
-
-if (!stristr($serverName, "eclipse.org") && !stristr($serverName,"you.are.at.eclipsecon.org")) {
-	echo '<center>
-          <p>
-          Reminder: this is <font color="#FF0000">' .
-	$serverName .
-        '</font>
-          See also
-          <a href="http://download.eclipse.org/webtools/downloads" target="_top">the live public Eclipse site</a>.
-          </p>
-          <hr />
-          </center>';
-
-}
-?>
-
-<?php if ("true" === $incubating) {
-	echo "<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH=\"100%\">";
-	echo "	<tr>";
-	echo "		<td ALIGN=left><font face=\"'Bitstream Vera',Helvetica,Arial\" size=\"+2\"><b><?php echo \"$type\";?>";
-	echo "        Build: $build</b></font></td>";
-	echo "		<td align=\"right\" rowspan=\"3\"><a";
-	echo "			href=\"http://www.eclipse.org/projects/what-is-incubation.php\"><img";
-	echo "			src=\"http://www.eclipse.org/images/egg-incubation.png\"";
-	echo "			alt=\"Incubation\" align=\"middle\" border=\"0\"></a></td>";
-
-
-	echo "	<tr valign=\"top\">";
-	echo "		<td><font size=\"-1\">" . $builddate . "</font></td>";
-	echo "	</tr>";
-	echo "	<tr valign=\"top\">";
-	echo "		<td>";
-	echo "		<p>The Eclipse Web Tools Platform (WTP) Incubator Project provides";
-	echo "		tools for development that are just getting started, or are";
-	echo "		experimental in some fashion.</p>";
-	echo "		</td>";
-	echo "	</tr>";
-	echo "</table>";
-
-} else {
-
-	echo "<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH=\"100%\">";
-	echo "	<tr>";
-	echo "		<td ALIGN=left><font face=\"'Bitstream Vera',Helvetica,Arial\" size=\"+2\"><b>$type";
-	echo "		Build: " . $build . "</b></font></td>";
-
-	echo "	<tr valign=\"top\">";
-	echo "		<td><font size=\"-1\">" . $builddate . "</font></td>";
-	echo "	</tr>";
-	echo "	<tr valign=\"top\">";
-	echo "		<td>";
-	echo "		<p>Component build from the Eclipse Web Tools Platform (WTP) Project.</p>";
-	echo "		</td>";
-	echo "	</tr>";
-	echo "</table>";
-
-} ?>
-
-<!-- ***********  Prerequisites **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-	<tr>
-		<td align="left" valign="top" bgcolor="#0080C0"><font
-			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Prerequisites
-		and Handy Extras</font></td>
-	</tr>
-	<tr>
-		<td>
-		<p>These are the prerequisites to build or run these packages. All are
-		not necessarily required, but instead some subset. Also listed are
-		some frequently needed links for committer-required packages when
-		creating new development environments, or targets to run against.</p>
-		<p>Note that WTP requires Java 5 or higher (and, for some things,
-		actually requires a JDK rather than only a JRE) even though many other
-		<a href="http://www.eclipse.org/downloads/">Eclipse Projects</a> can
-		run with <a href="http://www.eclipse.org/downloads/moreinfo/jre.php">other
-		JRE levels</a>.</p>
-		<p></p>
-		</td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=1 cellpadding=1 width="90%" align="center">
-
-		<?php
-		if ("true" === $prereq_eclipseplatform) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td width=\"40%\">Eclipse Platform</td>";
-
-
-			//customize page depending on user's browser/platform, if we can detect it
-			$usersPlatform = getPlatform();
-			// assume windows by default, since likely most frequent, even for cases where
-			// platform is "unknown". I've noticed Opera reports 'unknown' :(
-			$recommendedFile=$eclipseplatformfilewindows;
-			if (strcmp($usersPlatform,"linux")== 0) {
-				$recommendedFile=$eclipseplatformfilelinux;
-			} else if (strcmp($usersPlatform,"mac") == 0) {
-				$recommendedFile=$eclipseplatformfilemacosx;
-			}
-
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $eclipseplatformBuildURL . "\">appropriate platform</a>";
-			echo " or <a href=\"" . $eclipseplatformBuildHome . "\">equivalent</a></td>";
-
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_eclipse) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td width=\"40%\">Eclipse SDK (Platform, JDT)</td>";
-
-
-			//customize page depending on user's browser/platform, if we can detect it
-			$usersPlatform = getPlatform();
-			// assume windows by default, since likely most frequent, even for cases where
-			// platform is "unknown". I've noticed Opera reports 'unknown' :(
-			$recommendedFile=$eclipsefilewindows;
-			if (strcmp($usersPlatform,"linux")== 0) {
-				$recommendedFile=$eclipsefilelinux;
-			} else if (strcmp($usersPlatform,"mac") == 0) {
-				$recommendedFile=$eclipsefilemacosx;
-			}
-
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $eclipseBuildURL . "\">appropriate platform</a>";
-			echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_emf) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $emfName . "&nbsp;" . $emfDescription ;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $emfMirrorPrefixuri, $emfURL, $emfFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $emfBuildHome . "\">equivalent</a></td>";
-			echo " </tr>";
-		}
-		?>
-
-
-		<?php
-		if ("true" === $prereq_emfxsd) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $emfxsdName . "&nbsp;" . $emfxsdDescription ;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdMirrorPrefixuri, $emfxsdURL, $emfxsdFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $emfxsdBuildHome . "\">equivalent</a></td>";
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_emfvalidation) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $emfvalidationName  . "&nbsp;" . $emfvalidationDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $emfvalidationMirrorPrefixuri, $emfvalidationURL, $emfvalidationFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $emfvalidationBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_gef) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $gefName  . "&nbsp;" . $gefDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $gefMirrorPrefixuri, $gefURL, $gefFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $gefBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_dtp) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $dtpName . "&nbsp;" . $dtpDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $dtpMirrorPrefixuri, $dtpURL, $dtpFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $dtpBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_wst) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $wstName . "&nbsp;" . $wstDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $wstMirrorPrefixuri, $wstURL, $wstFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $wstBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_jst) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $jstName . "&nbsp;" . $jstDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $jstMirrorPrefixuri, $jstURL, $jstFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $jstBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-		<?php
-		if ("true" === $prereq_wtp) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $wtpName . "&nbsp;" . $wtpDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $wtpMirrorPrefixuri, $wtpURL, $wtpFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $wtpBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-			<tr valign="middle">
-				<td width="10%"></td>
-				<td colspan="2">
-				<hr />
-				</td>
-			</tr>
-
-
-
-			<?php
-			if ("true" === $prereq_emf) {
-				echo "<tr valign=\"top\">";
-				echo "<td width=\"10%\"></td>";
-				echo "<td>";
-				echo $emfsourceName . "&nbsp;" . $emfsourceDescription;
-				echo "</td> ";
-				echo "<td align=\"right\">";
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfsourceMirrorPrefixuri, $emfsourceURL, $emfsourceFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $emfsourceBuildHome . "\">equivalent</a></td>";
-				echo "</tr>";
-			}
-			?>
-			<?php
-			if ("true" === $prereq_emfxsd) {
-				echo "<tr valign=\"top\">";
-				echo "<td width=\"10%\"></td>";
-				echo "<td>";
-				echo $emfxsdsourceName . "&nbsp;" . $emfxsdsourceDescription;
-				echo "</td> ";
-				echo "<td align=\"right\">";
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdsourceMirrorPrefixuri, $emfxsdsourceURL, $emfxsdsourceFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $emfxsdsourceBuildHome . "\">equivalent</a></td>";
-				echo "</tr>";
-			}
-			?>
-
-			<?php
-			if ("true" === $prereq_emfvalidation) {
-				echo "<tr valign=\"top\">";
-				echo "<td width=\"10%\"></td>";
-				echo "<td>";
-				echo $emfvalidationsourceName . "&nbsp;" . $emfvalidationsourceDescription;
-				echo "</td> ";
-				echo "<td align=\"right\">";
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfvalidationsourceMirrorPrefixuri, $emfvalidationsourceURL, $emfvalidationsourceFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $emfvalidationsourceBuildHome . "\">equivalent</a></td>";
-				echo "</tr>";
-			}
-			?>
-
-			<?php
-			if (true) {
-				echo "<tr valign=\"top\">";
-				echo "<td width=\"10%\"></td>";
-				echo "<td>";
-				echo "Eclipse Test Framework (required only for Automated JUnit tests)";
-				echo "</td> ";
-				echo "<td align=\"right\">";
-
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $testURL, $testFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-				echo "</tr>";
-			}
-			?>
-
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>Eclipse releng tool (required only for committers to more easily
-				"release" code to a build)</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipserelengURL, $eclipserelengFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>Third Party code from Orbit. Not required and is currently much
-				more than needed for WTP, but some committers like using to create a
-				PDE target.</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $orbitthirdpartyzipMirrorPrefixuri, $orbitthirdpartyzipURL, $orbitthirdpartyzipFile,$eclipseFSpathPrefix);
-				echo " or <a href=\"" . $orbitthirdpartyzipBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-		</table>
-		</td>
-	</tr>
-</table>
-
-<!-- ***********  WTP **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-	<tr>
-		<td align=left valign=top colspan="5" bgcolor="#0080C0"><font
-			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF"> Web Tools
-		Platform</font></td>
-	</tr>
-
-	<tr>
-		<td align="left" valign="top" colspan="5">
-		<p>The Zip files includes the features and plugins for the WTP Incubator Pave Framework and reference implementation for Java EE patterns: CRUD, and CRUD Application.</p>
-		</td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
-
-
-			<tr>
-				<td align="left" valign="top" width="10%"><b>Minimal</b></td>
-				<td align="left" valign="top">
-				<p>Executable code only.</p>
-				</td>
-				<?php
-				$zipfilename="wtp-incubator-pave-${build}";
-				$filename=$zipfilename.".zip";
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription="pave";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-				?>
-			</tr>
-
-			<tr>
-				<td align="left" valign="top" width="10%"><b>SDK</b></td>
-				<td align="left" valign="top">
-				<p>Executable code and source code.</p>
-				</td>
-				<?php
-				$zipfilename="wtp-incubator-pave-sdk-${build}";
-				$filename=$zipfilename.".zip";
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription="pave sdk";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-				?>
-			</tr>
-			<tr>
-				<td align="left" valign="top" width="10%"><b>Tests</b></td>
-				<td align="left" valign="top">
-				<p>Unit tests.</p>
-				</td>
-				<?php
-				$zipfilename="wtp-incubator-pave-tests-${build}";
-				$filename=$zipfilename.".zip";
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription="pave tests";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-				?>
-			</tr>
-		</table>
-		</td>
-	
-	
-	<tr>
-
-</table>
-
-
-
-
-
-
-
-<!-- ***********  Build Status **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-	<tr>
-		<td align=left valign=top bgcolor="#0080C0"><font
-			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Status, tests
-		and other interesting details</font></td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
-
-			<tr>
-				<td><!-- 
-				Its silly to always display 'Build notes', but hard to 
-				compute if required or not. 
-				<a href="buildNotes.php">Build notes</a> <br /> 
-				--> <a href="directory.txt">map files</a> <br />
-				<?php
-
-				if ($displayTestSummary) {
-
-
-					if (isset($unitTests_grandTotalErrors)) {
-						$errorColor="green";
-						if ($unitTests_grandTotalErrors > 0) {
-							$errorColor="red";
-						}
-						echo "<a href=\"testResults.php\">Unit test results</a>&nbsp;";
-						echo "<img src=\"junit_err.gif\"/><font color=\"" . $errorColor . "\">" . $unitTests_grandTotalErrors . "</font>&nbsp;&nbsp;Total: " . $unitTests_grandTotalTests;
-					}
-					else {
-						// we hardly ever "pend" anymore ... abscense usually signifies no tests or a build error.
-						echo "<br /><font color=\"orange\">Unit tests don't exists, are pending, or there's a build error.</font>";
-						//&nbsp;&nbsp;<img src=\"pending.gif\"/>";
-					}
-
-					echo "<br />";
-					echo "<a href=\"compileResults.php\">Compile logs: Code Bundles</a>";
-
-					echo "&nbsp;&nbsp;($code_totalBundles)&nbsp;&nbsp;";
-					echo "<img src=\"compile_err.gif\"/><font color=red>$code_totalErrors</font>&nbsp;";
-					echo "<img src=\"compile_warn.gif\"/><font color=orange>$code_totalWarnings</font>&nbsp;";
-					echo "<img src=\"access_err.gif\"/><font color=red>$code_totalforbiddenAccessWarningCount</font>&nbsp;";
-					echo "<img src=\"access_warn.gif\"/><font color=orange>$code_totaldiscouragedAccessWarningCount</font>&nbsp;";
-
-					echo "<br />";
-					echo "<a href=\"testCompileResults.php\">Compile logs: Test Bundles</a>";
-
-					echo "&nbsp;&nbsp;($test_totalBundles)&nbsp;&nbsp;";
-					echo "<img src=\"compile_err.gif\"/><font color=red>$test_totalErrors</font>&nbsp;";
-					echo "<img src=\"compile_warn.gif\"/><font color=orange>$test_totalWarnings</font>&nbsp;";
-					echo "<img src=\"access_err.gif\"/><font color=red>$test_totalforbiddenAccessWarningCount</font>&nbsp;";
-					echo "<img src=\"access_warn.gif\"/><font color=orange>$test_totaldiscouragedAccessWarningCount</font>&nbsp;";
-				}
-
-				?> <br />
-
-				<?php
-				if (file_exists("versioningReportName.php")) {
-					include "versioningReportName.php";
-					$fname="${versionReportFilename}.html";
-					if (file_exists($fname)) {
-						echo "<br /> <a href='$fname'>Versioning Information</a>";
-					}
-}
-?> <?php
-echo "<br />";
-if (file_exists("./apiresults/api-progress.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-progress.html\">API Progress Report</a>";
-}
-if (file_exists("./apiresults/api-info-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-info-summary.html\">APIs Defined by Each Component</a>";
-}
-if (file_exists("./apiresults/api-ref-compatibility.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-ref-compatibility.html\">Adopter Breakage Report</a>";
-}
-if (file_exists("./apiresults/api-violation-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-violation-summary.html\">API Violations</a>";
-}
-if (file_exists("./apiresults/component-api-violation-all.html"))
-{
-	echo "<br /> <a href=\"apiresults/component-api-violation-all.html\">Non-API dependencies</a>";
-}
-if (file_exists("./apiresults/api-tc-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-tc-summary.html\">API Test Coverage</a>";
-}
-if (file_exists("./apiresults/api-javadoc-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-javadoc-summary.html\">API Javadoc Coverage</a>";
-}
-if (file_exists("./apiresults/api-tc-summary.html"))
-{
-	echo "<br /><br /> <a href=\"apiresults/full_test_coverage/api-tc-summary.html\">Test Coverage for All Classes and Methods</a>";
-}
-?> <?php
-if (file_exists("./perfresults/graph/performance.php"))
-{
-	echo "<br />";
-	echo "<br /> <a href=\"perfresults/graph/performance.php\">Performance Results</a>";
-	echo "<br />";
-}
-?></td>
-			</tr>
-
-
-		</table>
-		</td>
-	</tr>
-</table>
-
-
-
-<!-- footer -->
-<center>
-<hr>
-<p>All downloads are provided under the terms and conditions of the <a
-	href="http://www.eclipse.org/legal/notice.html">Eclipse.org Software
-User Agreement</a> unless otherwise specified.</p>
-
-<p>If you have problems downloading the drops, contact the <font
-	face="'Bitstream Vera',Helvetica,Arial" size="-1"><a
-	href="mailto:webmaster@eclipse.org">webmaster</a></font>.</p>
-
-</center>
-<!-- end footer -->
-
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/pave.site/templateFiles/siteEnablingFeatures.xml b/releng.wtpbuilder/distribution/pave.site/templateFiles/siteEnablingFeatures.xml
deleted file mode 100644
index cc3ed81..0000000
--- a/releng.wtpbuilder/distribution/pave.site/templateFiles/siteEnablingFeatures.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-    <description> The update site contains the enabling features. </description>
-    <category-def
-        name="Enabling Features"
-        label="Enabling Features">
-        <description> This category contains features used by several
-            projects that enable some functionality, but which by
-            themselves are not very interesting. </description>
-    </category-def>
-</site>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/pave.site/templateFiles/siteWTP.xml b/releng.wtpbuilder/distribution/pave.site/templateFiles/siteWTP.xml
deleted file mode 100644
index f94e83f..0000000
--- a/releng.wtpbuilder/distribution/pave.site/templateFiles/siteWTP.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site
-    pack200="true"
-    mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/webtools/testUpdates/site.xml&amp;format=xml"
-    digestURL="http://download.eclipse.org/webtools/testUpdates/">
-    <description
-        url="http://download.eclipse.org/webtools/declaredUpdates/index.html"> The update site contains the features of the of Eclipse Web
-        Tools Project (WTP) </description>
-    <feature
-        url="features/org.eclipse.wst_@org.eclipse.wst@.jar"
-        id="org.eclipse.wst"
-        version="@org.eclipse.wst@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.wst.sdk_@org.eclipse.wst.sdk@.jar"
-        id="org.eclipse.wst.sdk"
-        version="@org.eclipse.wst.sdk@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jst_@org.eclipse.jst@.jar"
-        id="org.eclipse.jst"
-        version="@org.eclipse.jst@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jst.sdk_@org.eclipse.jst.sdk@.jar"
-        id="org.eclipse.jst.sdk"
-        version="@org.eclipse.jst.sdk@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jpt.feature_@org.eclipse.jpt.feature@.jar"
-        id="org.eclipse.jpt.feature"
-        version="@org.eclipse.jpt.feature@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jpt_sdk.feature_@org.eclipse.jpt_sdk.feature@.jar"
-        id="org.eclipse.jpt_sdk.feature"
-        version="@org.eclipse.jpt_sdk.feature@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <category-def
-        name="Web Tools Platform (WTP)"
-        label="Web Tools Platform (WTP)">
-        <description> This category contains the features of the Eclipse
-            Web Tools Project (WTP). </description>
-    </category-def>
-</site>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/pave.site/templateFiles/testCompileResults.php.template b/releng.wtpbuilder/distribution/pave.site/templateFiles/testCompileResults.php.template
deleted file mode 100644
index 42d6f65..0000000
--- a/releng.wtpbuilder/distribution/pave.site/templateFiles/testCompileResults.php.template
+++ /dev/null
@@ -1,76 +0,0 @@
-<html>
-<head>
-
-<?php
-        $parts = explode("/", getcwd());
-        $parts2 = explode("-", $parts[count($parts) - 1]);
-        $buildName = $parts2[1];
-
-        echo "<title>Compile Logs: Test Bundles for $buildName</title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2em;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:Bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-}
-</style>
-</head>
-<body>
-
-<?php
-        echo "<h1>Compile Logs: Test Bundles for $buildName</h1>";
-?>
-
-
-<table id=tabledata align = "center" width="75%" border="1">
-  <tr>
-    <td class="bold" align="center">Compile Logs</td>
-    <td class="bold" align="center">Compile Errors</td>
-    <td class="bold" align="center">Compiler Warnings</td>
-    <td class="bold" align="center">Access Violations</td>
-    <td class="bold" align="center">Access Warnings</td>
-  </tr>
-
-  %compilelogs%
-
-</table>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/pave.site/templateFiles/testResults.php.template b/releng.wtpbuilder/distribution/pave.site/templateFiles/testResults.php.template
deleted file mode 100644
index ddad0b7..0000000
--- a/releng.wtpbuilder/distribution/pave.site/templateFiles/testResults.php.template
+++ /dev/null
@@ -1,119 +0,0 @@
-<html>
-<head>
-
-<?php
-	$parts = explode("/", getcwd());
-	$parts2 = explode("-", $parts[count($parts) - 1]);
-	$buildName = $parts2[1];
-	
-	echo "<title>Test Results for $buildName </title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2em;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:Bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-
-}
-</style>
-
-
-</head>
-<body>
-<p><b><font face="Verdana" size="+3">Test Results</font></b> </p>
-
-<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">
-    Unit Test Results for <?php echo "$buildName"; ?> on Various Platforms and JRE</font></b></td>
-  </tr>
-</table>
-
-<?php
-if (file_exists("testResults"))
-{
-$dir = dir("testResults");
-while ($anEntry = $dir->read())
-{
-  if ($anEntry != "." && $anEntry != ".." && $anEntry != "consolelogs" && $anEntry != "html" && $anEntry != "xml")
-  {
-    $link = "testResults/".$anEntry."/results/index.php";
-    echo "<p><a href=\"$link\">$anEntry</a></p>";
-  }
-}
-}
-?>
-
-<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">Unit 
-      Test Results for <?php echo "$buildName"; ?> </font></b></td>
-  </tr>
-</table>
-
-<table id=tableunittestdata align = "center" width="75%" border="1">
-  <tr> 
-    <td class="bold" align="center" width="70%">Test Suite</td>
-    <td class="bold" align="center" width="10%">Errors &amp; Failures</td>
-    <td class="bold" align="center" width="10%">Total Tests</td>
-    <td class="bold" align="center" width="10%">Total Time (s)</td>
-  </tr>
-  
-  
-  %testresults%
-  
-</table>
-<p></p>
-<br>
-<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"> 
-      Console output logs 
-      <?php echo "$buildName"; ?>
-      </font></b></td>
-  </tr>
-</table>
-<br>
-These <a href="consoleLogs.php">logs</a> contain the console output captured while 
-running the JUnit automated tests. <br>
-<br>
-
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/pave.site/transformReportToHTML.xml b/releng.wtpbuilder/distribution/pave.site/transformReportToHTML.xml
deleted file mode 100644
index b72f6cd..0000000
--- a/releng.wtpbuilder/distribution/pave.site/transformReportToHTML.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-    name="xsl-conversion"
-    default="main"
-    basedir=".">
-    <target
-        name="main"
-        description="example.@dot.xml to produce example.@dot.html">
-        <xslt
-            destdir="${resultDir}/compilelogs"
-            scanincludeddirectories="true"
-            style="compilerXMLOutputToHTML.xsl"
-            force="true">
-            <fileset
-                dir="${resultDir}/compilelogs"
-                includes="**/*.xml"/>
-        </xslt>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/pave.tests/build.xml b/releng.wtpbuilder/distribution/pave.tests/build.xml
deleted file mode 100644
index 8805e05..0000000
--- a/releng.wtpbuilder/distribution/pave.tests/build.xml
+++ /dev/null
@@ -1,330 +0,0 @@
-<project
-    name="Build specific targets and properties"
-    default="runTest">
-    <!--
-        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"/>
-    <fail
-        message="testRoot must be set for this task"
-        unless="testRoot"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-
-
-    <!-- 
-        typcially already set, but in case of standalone tests, may not
-        be
-    -->
-    <property
-        name="buildLabel"
-        value="${buildType}-${buildId}-${timestamp}"/>
-
-
-    <!-- 
-	   Steps to do after the build is done. 
-	 -->
-    <target
-        name="test">
-        <dirname
-            file="${ant.file}"
-            property="currentDirectory"/>
-        <ant
-            antfile="${ant.file}"
-            target="runTest"
-            dir="${currentDirectory}"/>
-    </target>
-
-    <!-- 
-	  Steps to do to test the build results
-   -->
-    <target
-        name="runTest">
-        <dirname
-            file="${ant.file}"
-            property="test.component.dir"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-        <property
-            file="${buildDirectory}/label.properties"/>
-        <property
-            file="${wtp.builder.home}/build.properties"/>
-        <fail
-            message="testRoot must be set for this task"
-            unless="testRoot"/>
-        <mkdir
-            dir="${testRoot}"/>
-
-        <!-- if results already exist, delete them -->
-        <delete
-            dir="${testRoot}/results"
-            failOnError="false"/>
-        <mkdir
-            dir="${testRoot}/results"/>
-        <mkdir
-            dir="${testRoot}/results/consolelogs"/>
-        <copy
-            todir="${testRoot}"
-            overwrite="true">
-            <fileset
-                dir="${test.component.dir}/testScripts"/>
-        </copy>
-        <echo
-            message="BASEOS: ${env.BASEOS}   BASEWS: ${env.BASEWS}   BASEARCH: ${env.BASEARCH} "/>
-        <ant
-            antfile="${test.component.dir}/testdependency.xml"
-            target="get">
-            <property
-                name="dependency.properties"
-                value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-            <property
-                name="base.install.dir"
-                value="${testRoot}"/>
-        </ant>
-        <antcall
-            target="unzipTests"/>
-        <antcall
-            target="runTestEclipse">
-            <param
-                name="testTarget"
-                value="all"/>
-        </antcall>
-        <antcall
-            target="postRunTestEclipse">
-            <param
-                name="testTarget"
-                value="all"/>
-        </antcall>
-    </target>
-    <target
-        name="unzipTests">
-        <!--
-            unzip the builds and junit tests we use 'unzip' here, so we
-            can continue on error, if desired. (such as if zip was not
-            created, due to other failures or options).
-        -->
-        <echo
-            message="installing sdk"/>
-        <exec
-            dir="${buildDirectory}/${buildLabel}"
-            executable="unzip"
-            failonerror="true">
-            <arg
-                line="-o -qq  wtp-incubator-pave-sdk-${buildLabel}.zip -d ${testRoot}${dropinsFolder}"/>
-        </exec>
-        <echo
-            message="installing tests"/>
-        <exec
-            dir="${buildDirectory}/${buildLabel}"
-            executable="unzip"
-            failonerror="false">
-            <arg
-                line="-o -qq wtp-incubator-pave-tests-${buildLabel}.zip -d ${testRoot}${dropinsFolder}"/>
-        </exec>
-    </target>
-    <!--
-        time out may need to be set/adjust for api or performance tests?
-        This testTimeLimit is the whole, overall limit on tests. There's
-        a shorter one for individual suites. some common values, of
-        milliseconds to more recognizable units: 7200000: 2 hours
-        3600000: 1 hour 1800000: 30 minutes 600000: 10 minutes
-    -->
-    <property
-        name="testTimeLimit"
-        value="7200000"/>
-    <property
-        name="testFailOnError"
-        value="false"/>
-    <target
-        name="runTestEclipse"
-        description="Run our JUnit's within an instance of antRunner">
-        <property
-            name="test-vm"
-            value="${env.JAVA_6_HOME}/bin/java"/>
-
-        <property
-            name="vmargs"
-            value="-Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm}  -Dperf.buildId=${buildType}${date}-${time}"/>
-        <!--
-            set path to eclipse folder. If local folder, use '.';
-            otherwise, use c:\path\to\eclipse or /path/to/eclipse/
-        -->
-        <property
-            name="eclipse.home"
-            value="${testRoot}"/>
-        <echo
-            message="Running junits"/>
-        <!--
-            Remember: using -debug for org.eclipse.ant.core.antRunner
-            produces ant debug info to be output ... which is a TON of
-            stuff
-        -->
-        <echo
-            message="eclipse.launcher: ${eclipse.launcher}"/>
-        <java
-            taskname="unit-test-masterprocess"
-            fork="true"
-            resultProperty="wtpmasterjunitresult"
-            failonerror="false"
-            timeout="${testTimeLimit}"
-            dir="${testRoot}/eclipse"
-            jvm="${env.JAVA_6_HOME}/bin/java"
-            classname="org.eclipse.equinox.launcher.Main">
-            <classpath>
-                <fileset
-                    dir="${testRoot}/eclipse/plugins">
-                    <include
-                        name="org.eclipse.equinox.launcher_*.jar"/>
-                </fileset>
-            </classpath>
-            <jvmarg
-                value="-Xmx512m"/>
-            <jvmarg
-                value="-Dosgi.ws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dosgi.os=${env.BASEOS}"/>
-            <jvmarg
-                value="-Dosgi.arch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-Dws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dos=${env.BASEOS}"/>
-            <jvmarg
-                value="-Darch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-Dnoclean=true"/>
-            <jvmarg
-                value="-DbuildBranch=${buildBranch}"/>
-            <jvmarg
-                value="-DbuildType=${buildType}"/>
-            <jvmarg
-                value="-DbuildId=${buildId}"/>
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <jvmarg
-                value="-Dprojectname=${projectname}"/>
-            <arg
-                value="-nosplash"/>
-            <arg
-                value="-consolelog"/>
-            <arg
-                value="-data"/>
-            <arg
-                value="${testRoot}/overallTestWorkspace"/>
-            <arg
-                value="-application"/>
-            <arg
-                value="org.eclipse.ant.core.antRunner"/>
-            <arg
-                value="-file"/>
-            <arg
-                value="${testRoot}/test.xml"/>
-            <arg
-                value="-logger"/>
-            <arg
-                value="org.apache.tools.ant.DefaultLogger"/>
-            <env
-                key="DISPLAY"
-                value="${env.DISPLAY}"/>
-            <redirector
-                output="${testRoot}/results/fullOutput.txt"
-                error="${testRoot}/results/fullErrorLog.txt"/>
-            <sysproperty
-                key="build.home"
-                value="${env.BUILD_HOME}"/>
-            <sysproperty
-                key="buildDirectory"
-                value="${buildDirectory}"/>
-            <sysproperty
-                key="buildLabel"
-                value="${buildLabel}"/>
-            <sysproperty
-                key="baseLocation"
-                value="${baseLocation}"/>
-            <sysproperty
-                key="testRoot"
-                value="${testRoot}"/>
-            <sysproperty
-                key="testDir"
-                value="${testRoot}"/>
-            <sysproperty
-                key="perf.buildId"
-                value="${buildType}${date}-${time}"/>
-            <sysproperty
-                key="eclipseBuilderDirectory"
-                value="${pde.builder.path}"/>
-            <sysproperty
-                key="buildLabel"
-                value="${buildLabel}"/>
-        </java>
-        <echo
-            message="wtpmasterjunitresult ${wtpmasterjunitresult}"/>
-    </target>
-    <target
-        name="postRunTestEclipse">
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/consolelogs/testLogs"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results">
-                <include
-                    name="*output.txt"/>
-            </fileset>
-        </copy>
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/consolelogs/testSysErrorLogs"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results">
-                <include
-                    name="*error.txt"/>
-            </fileset>
-        </copy>
-        <copy
-            file="${testRoot}/results/fullOutput.txt"
-            toDir="${buildDirectory}/${buildLabel}/testResults/consolelogs/full"
-            overwrite="true"
-            failonerror="false">
-        </copy>
-        <copy
-            file="${testRoot}/results/fullErrorLog.txt"
-            toDir="${buildDirectory}/${buildLabel}/testResults/consolelogs/full"
-            overwrite="true"
-            failonerror="false">
-        </copy>
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/xml"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results/xml">
-                <include
-                    name="*.xml"/>
-            </fileset>
-        </copy>
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/html"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results/html">
-                <include
-                    name="*.html"/>
-            </fileset>
-        </copy>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/pave.tests/templateFiles/index.php b/releng.wtpbuilder/distribution/pave.tests/templateFiles/index.php
deleted file mode 100644
index a42c883..0000000
--- a/releng.wtpbuilder/distribution/pave.tests/templateFiles/index.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<html>
-<head>
-
-<?php
-$parts = explode("/", realpath(".."));
-$label = $parts[count($parts) - 1];
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-</head>
-<body>
-<p><b><font face="Verdana" size="+3">Test Results</font></b></p>
-<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">Unit Test Results for <?php echo "$label"; ?>
-		</font></b></td>
-	</tr>
-</table>
-<p></p>
-<table border="0">
-</table>
-
-<table width="77%" border="1">
-	<tr>
-		<td width="81%"><b>Tests Performed</b></td>
-		<td width="19%"><b>Errors &amp; Failures</b></td>
-	</tr>
-
-	<?
-	$dir = dir("html");
-	while ($anEntry = $dir->read())
-	{
-		if ($anEntry != "." && $anEntry != "..")
-		{
-			$link = "html/".$anEntry;
-			$xml = "xml/".substr($anEntry, 0, strlen($anEntry)-4)."xml";
-			$count = 0;
-			$fileHandle = fopen($xml, "r");
-			while (!feof($fileHandle))
-			{
-				$aLine = fgets($fileHandle, 4096); // Length parameter only optional after 4.2.0
-				$count = $count + substr_count($aLine, '<error');
-			}
-			fclose($fileHandle);
-			if ($count > 0)
-			{
-				echo "<tr><td><a href=\"$link\"><b><font color=\"red\">";
-				echo "$anEntry";
-				echo "</font></b></a></td>";
-				echo "<td><b><font color=\"red\">$count</font></b></td></tr>";
-			}
-			else
-			{
-				echo "<tr><td><a href=\"$link\">";
-				echo "$anEntry";
-				echo "</a></td>";
-				echo "<td>$count</td></tr>";
-			}
-		}
-	}
-	?>
-
-</table>
-<p></p>
-<br>
-<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"> Console output logs <?php echo "$label"; ?>
-		</font></b></td>
-	</tr>
-</table>
-<br>
-These
-<a href="consolelogs/wtptestlog.txt">logs</a>
-contain the console output captured while running the JUnit automated
-tests.
-<br>
-<br>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/pave.tests/testScripts/JUNIT.XSL b/releng.wtpbuilder/distribution/pave.tests/testScripts/JUNIT.XSL
deleted file mode 100644
index 9cdd80e..0000000
--- a/releng.wtpbuilder/distribution/pave.tests/testScripts/JUNIT.XSL
+++ /dev/null
@@ -1,703 +0,0 @@
-<xsl:stylesheet
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="1.0">
-    <xsl:output
-        method="html"
-        indent="yes"/>
-    <xsl:decimal-format
-        decimal-separator="."
-        grouping-separator=","/>
-    <xsl:template
-        match="testsuites">
-        <HTML>
-            <HEAD>
-                <style
-                    type="text/css"> body { font:normal 68%
-                    verdana,arial,helvetica; color:#000000; } table tr
-                    td, table tr th { font-size: 68%; } table.details tr
-                    th{ font-weight: bold; text-align:left;
-                    background:#a6caf0; } table.details tr td{
-                    background:#eeeee0; } p { line-height:1.5em;
-                    margin-top:0.5em; margin-bottom:1.0em; } h1 {
-                    margin: 0px 0px 5px; font: 165%
-                    verdana,arial,helvetica } h2 { margin-top: 1em;
-                    margin-bottom: 0.5em; font: bold 125%
-                    verdana,arial,helvetica } h3 { margin-bottom: 0.5em;
-                    font: bold 115% verdana,arial,helvetica } h4 {
-                    margin-bottom: 0.5em; font: bold 100%
-                    verdana,arial,helvetica } h5 { margin-bottom: 0.5em;
-                    font: bold 100% verdana,arial,helvetica } h6 {
-                    margin-bottom: 0.5em; font: bold 100%
-                    verdana,arial,helvetica } .Error { font-weight:bold;
-                    color:red; } .Failure { font-weight:bold;
-                    color:purple; } .Properties { text-align:right; } </style>
-                <script
-                    language="JavaScript">
-                    var TestCases = new Array(); var cur;
-                    <xsl:for-each
-                        select="./testsuite">
-                        <xsl:apply-templates
-                            select="properties"/>
-                    </xsl:for-each>
-                </script>
-                <script
-                    language="JavaScript"><![CDATA[
-        function displayProperties (name) {
-          var win = window.open('','JUnitSystemProperties','scrollbars=1,resizable=1');
-          var doc = win.document.open();
-          doc.write("<html><head><title>Properties of " + name + "</title>");
-          doc.write("<style>")
-          doc.write("body {font:normal 68% verdana,arial,helvetica;	color:#000000; }");
-          doc.write("table tr td, table tr th { font-size: 68%; }");
-          doc.write("table.properties { border-collapse:collapse; border-left:solid 1 #cccccc; border-top:solid 1 #cccccc; padding:5px; }");
-          doc.write("table.properties th { text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#eeeeee; }");
-          doc.write("table.properties td { font:normal; text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#fffffff; }");
-          doc.write("h3 { margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica }");
-          doc.write("</style>");
-          doc.write("</head><body>");
-          doc.write("<h3>Properties of " + name + "</h3>");
-          doc.write("<div align=\"right\"><a href=\"javascript:window.close();\">Close</a></div>");
-          doc.write("<table class='properties'>");
-          doc.write("<tr><th>Name</th><th>Value</th></tr>");
-          for (prop in TestCases[name]) {
-            doc.write("<tr><th>" + prop + "</th><td>" + TestCases[name][prop] + "</td></tr>");
-          }
-          doc.write("</table>");
-          doc.write("</body></html>");
-          doc.close();
-          win.focus();
-        }
-      ]]>
-                </script>
-            </HEAD>
-            <body>
-                <a
-                    name="top"></a>
-                <xsl:call-template
-                    name="pageHeader"/>
-
-                <!-- Summary part -->
-                <xsl:call-template
-                    name="summary"/>
-                <hr
-                    size="1"
-                    width="95%"
-                    align="left"/>
-
-                <!-- Package List part -->
-                <xsl:call-template
-                    name="packagelist"/>
-                <hr
-                    size="1"
-                    width="95%"
-                    align="left"/>
-
-                <!-- For each package create its part -->
-                <xsl:call-template
-                    name="packages"/>
-                <hr
-                    size="1"
-                    width="95%"
-                    align="left"/>
-
-                <!-- For each class create the  part -->
-                <xsl:call-template
-                    name="classes"/>
-            </body>
-        </HTML>
-    </xsl:template>
-    <!--
-        ==================================================================
-    -->
-    <!--
-        Write a list of all packages with an hyperlink to the anchor of
-    -->
-    <!--
-        of the package name.
-    -->
-    <!--
-        ==================================================================
-    -->
-    <xsl:template
-        name="packagelist">
-        <h2>Packages</h2>
-        Note: package statistics are not computed recursively, they only
-        sum up all of its testsuites numbers.
-        <table
-            class="details"
-            border="0"
-            cellpadding="5"
-            cellspacing="2"
-            width="95%">
-            <xsl:call-template
-                name="testsuite.test.header"/>
-            <!-- list all packages recursively -->
-            <xsl:for-each
-                select="./testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
-                <xsl:sort
-                    select="@package"/>
-                <xsl:variable
-                    name="testsuites-in-package"
-                    select="/testsuites/testsuite[./@package = current()/@package]"/>
-                <xsl:variable
-                    name="testCount"
-                    select="sum($testsuites-in-package/@tests)"/>
-                <xsl:variable
-                    name="errorCount"
-                    select="sum($testsuites-in-package/@errors)"/>
-                <xsl:variable
-                    name="failureCount"
-                    select="sum($testsuites-in-package/@failures)"/>
-                <xsl:variable
-                    name="timeCount"
-                    select="sum($testsuites-in-package/@time)"/>
-
-                <!-- write a summary for the package -->
-                <tr
-                    valign="top">
-                    <!-- set a nice color depending if there is an error/failure -->
-                    <xsl:attribute
-                        name="class">
-						<xsl:choose>
-							<xsl:when
-                        test="$failureCount &gt; 0">Failure</xsl:when>
-							<xsl:when
-                        test="$errorCount &gt; 0">Error</xsl:when>
-						</xsl:choose>
-					</xsl:attribute>
-                    <td>
-                        <a
-                            href="#{@package}">
-                            <xsl:value-of
-                                select="@package"/>
-                        </a>
-                    </td>
-                    <td>
-                        <xsl:value-of
-                            select="$testCount"/>
-                    </td>
-                    <td>
-                        <xsl:value-of
-                            select="$errorCount"/>
-                    </td>
-                    <td>
-                        <xsl:value-of
-                            select="$failureCount"/>
-                    </td>
-                    <td>
-                        <xsl:call-template
-                            name="display-time">
-                            <xsl:with-param
-                                name="value"
-                                select="$timeCount"/>
-                        </xsl:call-template>
-                    </td>
-                </tr>
-            </xsl:for-each>
-        </table>
-    </xsl:template>
-    <!--
-        ==================================================================
-    -->
-    <!--
-        Write a package level report
-    -->
-    <!--
-        It creates a table with values from the document:
-    -->
-    <!--
-        Name | Tests | Errors | Failures | Time
-    -->
-    <!--
-        ==================================================================
-    -->
-    <xsl:template
-        name="packages">
-        <!-- create an anchor to this package name -->
-        <xsl:for-each
-            select="/testsuites/testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
-            <xsl:sort
-                select="@package"/>
-            <a
-                name="{@package}"></a>
-            <h3>
-                Package
-                <xsl:value-of
-                    select="@package"/>
-            </h3>
-            <table
-                class="details"
-                border="0"
-                cellpadding="5"
-                cellspacing="2"
-                width="95%">
-                <xsl:call-template
-                    name="testsuite.test.header"/>
-
-                <!-- match the testsuites of this package -->
-                <xsl:apply-templates
-                    select="/testsuites/testsuite[./@package = current()/@package]"
-                    mode="print.test"/>
-            </table>
-            <a
-                href="#top">Back to top</a>
-            <p/>
-            <p/>
-        </xsl:for-each>
-    </xsl:template>
-    <xsl:template
-        name="classes">
-        <xsl:for-each
-            select="testsuite">
-            <xsl:sort
-                select="@name"/>
-            <!-- create an anchor to this class name -->
-            <a
-                name="{@name}"></a>
-            <h3>
-                TestCase
-                <xsl:value-of
-                    select="@name"/>
-            </h3>
-            <table
-                class="details"
-                border="0"
-                cellpadding="5"
-                cellspacing="2"
-                width="95%">
-                <xsl:call-template
-                    name="testcase.test.header"/>
-                <!--
-                    test can even not be started at all (failure to load
-                    the class) so report the error directly
-                -->
-                <xsl:if
-                    test="./error">
-                    <tr
-                        class="Error">
-                        <td
-                            colspan="4">
-                            <xsl:apply-templates
-                                select="./error"/>
-                        </td>
-                    </tr>
-                </xsl:if>
-                <xsl:apply-templates
-                    select="./testcase"
-                    mode="print.test"/>
-            </table>
-            <div
-                class="Properties">
-                <a>
-                    <xsl:attribute
-                        name="href">javascript:displayProperties('<xsl:value-of
-                        select="@package"/>.<xsl:value-of
-                        select="@name"/>');</xsl:attribute>
-                    Properties &gt;&gt;
-                </a>
-            </div>
-            <p/>
-            <a
-                href="#top">Back to top</a>
-        </xsl:for-each>
-    </xsl:template>
-    <xsl:template
-        name="summary">
-        <h2>Summary</h2>
-        <xsl:variable
-            name="testCount"
-            select="sum(testsuite/@tests)"/>
-        <xsl:variable
-            name="errorCount"
-            select="sum(testsuite/@errors)"/>
-        <xsl:variable
-            name="failureCount"
-            select="sum(testsuite/@failures)"/>
-        <xsl:variable
-            name="timeCount"
-            select="sum(testsuite/@time)"/>
-        <xsl:variable
-            name="successRate"
-            select="($testCount - $failureCount - $errorCount) div $testCount"/>
-        <table
-            class="details"
-            border="0"
-            cellpadding="5"
-            cellspacing="2"
-            width="95%">
-            <tr
-                valign="top">
-                <th>Tests</th>
-                <th>Failures</th>
-                <th>Errors</th>
-                <th>Success rate</th>
-                <th>Time</th>
-            </tr>
-            <tr
-                valign="top">
-                <xsl:attribute
-                    name="class">
-				<xsl:choose>
-					<xsl:when
-                    test="$failureCount &gt; 0">Failure</xsl:when>
-					<xsl:when
-                    test="$errorCount &gt; 0">Error</xsl:when>
-				</xsl:choose>
-			</xsl:attribute>
-                <td>
-                    <xsl:value-of
-                        select="$testCount"/>
-                </td>
-                <td>
-                    <xsl:value-of
-                        select="$failureCount"/>
-                </td>
-                <td>
-                    <xsl:value-of
-                        select="$errorCount"/>
-                </td>
-                <td>
-                    <xsl:call-template
-                        name="display-percent">
-                        <xsl:with-param
-                            name="value"
-                            select="$successRate"/>
-                    </xsl:call-template>
-                </td>
-                <td>
-                    <xsl:call-template
-                        name="display-time">
-                        <xsl:with-param
-                            name="value"
-                            select="$timeCount"/>
-                    </xsl:call-template>
-                </td>
-            </tr>
-        </table>
-        <table
-            border="0"
-            width="95%">
-            <tr>
-                <td
-                    style="text-align: justify;">
-                    Note:
-                    <i>failures</i>
-                    are anticipated and checked for with assertions
-                    while
-                    <i>errors</i>
-                    are unanticipated.
-                </td>
-            </tr>
-        </table>
-    </xsl:template>
-    <!--
-        Write properties into a JavaScript data structure. This is based
-        on the original idea by Erik Hatcher (erik@hatcher.net)
-    -->
-    <xsl:template
-        match="properties">
-        cur = TestCases['
-        <xsl:value-of
-            select="../@package"/>
-        .
-        <xsl:value-of
-            select="../@name"/>
-        '] = new Array();
-        <xsl:for-each
-            select="property">
-            <xsl:sort
-                select="@name"/>
-            cur['
-            <xsl:value-of
-                select="@name"/>
-            '] = '
-            <xsl:call-template
-                name="JS-escape">
-                <xsl:with-param
-                    name="string"
-                    select="@value"/>
-            </xsl:call-template>
-            ';
-        </xsl:for-each>
-    </xsl:template>
-
-    <!-- Page HEADER -->
-    <xsl:template
-        name="pageHeader">
-        <h1>Unit Test Results</h1>
-        <table
-            width="100%">
-            <tr>
-                <td
-                    align="left"></td>
-                <td
-                    align="right">
-                    Designed for use with
-                    <a
-                        href='http://www.junit.org'>JUnit</a>
-                    and
-                    <a
-                        href='http://jakarta.apache.org/ant'>Ant</a>
-                    .
-                </td>
-            </tr>
-        </table>
-        <hr
-            size="1"/>
-    </xsl:template>
-    <xsl:template
-        match="testsuite"
-        mode="header">
-        <tr
-            valign="top">
-            <th
-                width="80%">Name</th>
-            <th>Tests</th>
-            <th>Errors</th>
-            <th>Failures</th>
-            <th
-                nowrap="nowrap">Time(s)</th>
-        </tr>
-    </xsl:template>
-
-    <!-- class header -->
-    <xsl:template
-        name="testsuite.test.header">
-        <tr
-            valign="top">
-            <th
-                width="80%">Name</th>
-            <th>Tests</th>
-            <th>Errors</th>
-            <th>Failures</th>
-            <th
-                nowrap="nowrap">Time(s)</th>
-        </tr>
-    </xsl:template>
-
-    <!-- method header -->
-    <xsl:template
-        name="testcase.test.header">
-        <tr
-            valign="top">
-            <th>Name</th>
-            <th>Status</th>
-            <th
-                width="80%">Type</th>
-            <th
-                nowrap="nowrap">Time(s)</th>
-        </tr>
-    </xsl:template>
-
-
-    <!-- class information -->
-    <xsl:template
-        match="testsuite"
-        mode="print.test">
-        <tr
-            valign="top">
-            <!-- set a nice color depending if there is an error/failure -->
-            <xsl:attribute
-                name="class">
-			<xsl:choose>
-				<xsl:when
-                test="@failures[.&gt; 0]">Failure</xsl:when>
-				<xsl:when
-                test="@errors[.&gt; 0]">Error</xsl:when>
-			</xsl:choose>
-		</xsl:attribute>
-
-            <!-- print testsuite information -->
-            <td>
-                <a
-                    href="#{@name}">
-                    <xsl:value-of
-                        select="@name"/>
-                </a>
-            </td>
-            <td>
-                <xsl:value-of
-                    select="@tests"/>
-            </td>
-            <td>
-                <xsl:value-of
-                    select="@errors"/>
-            </td>
-            <td>
-                <xsl:value-of
-                    select="@failures"/>
-            </td>
-            <td>
-                <xsl:call-template
-                    name="display-time">
-                    <xsl:with-param
-                        name="value"
-                        select="@time"/>
-                </xsl:call-template>
-            </td>
-        </tr>
-    </xsl:template>
-    <xsl:template
-        match="testcase"
-        mode="print.test">
-        <tr
-            valign="top">
-            <xsl:attribute
-                name="class">
-			<xsl:choose>
-				<xsl:when
-                test="failure | error">Error</xsl:when>
-			</xsl:choose>
-		</xsl:attribute>
-            <td>
-                <xsl:value-of
-                    select="@name"/>
-            </td>
-            <xsl:choose>
-                <xsl:when
-                    test="failure">
-                    <td>Failure</td>
-                    <td>
-                        <xsl:apply-templates
-                            select="failure"/>
-                    </td>
-                </xsl:when>
-                <xsl:when
-                    test="error">
-                    <td>Error</td>
-                    <td>
-                        <xsl:apply-templates
-                            select="error"/>
-                    </td>
-                </xsl:when>
-                <xsl:otherwise>
-                    <td>Success</td>
-                    <td></td>
-                </xsl:otherwise>
-            </xsl:choose>
-            <td>
-                <xsl:call-template
-                    name="display-time">
-                    <xsl:with-param
-                        name="value"
-                        select="@time"/>
-                </xsl:call-template>
-            </td>
-        </tr>
-    </xsl:template>
-    <xsl:template
-        match="failure">
-        <xsl:call-template
-            name="display-failures"/>
-    </xsl:template>
-    <xsl:template
-        match="error">
-        <xsl:call-template
-            name="display-failures"/>
-    </xsl:template>
-
-    <!-- Style for the error and failure in the tescase template -->
-    <xsl:template
-        name="display-failures">
-        <xsl:choose>
-            <xsl:when
-                test="not(@message)">
-                N/A
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of
-                    select="@message"/>
-            </xsl:otherwise>
-        </xsl:choose>
-        <!-- display the stacktrace -->
-        <code>
-            <p/>
-            <xsl:call-template
-                name="br-replace">
-                <xsl:with-param
-                    name="word"
-                    select="."/>
-            </xsl:call-template>
-        </code>
-        <!--
-            the later is better but might be problematic for non-21"
-            monitors...
-        -->
-        <!--pre><xsl:value-of select="."/></pre-->
-    </xsl:template>
-    <xsl:template
-        name="JS-escape">
-        <xsl:param
-            name="string"/>
-        <xsl:choose>
-            <!--
-                something isn't right here, basically all single quotes
-                need to be replaced with backslash-single-quote
-                <xsl:when test="contains($string,'&apos;')">
-                <xsl:value-of
-                select="substring-before($string,'&apos;')"/> \&apos;
-                <xsl:call-template name="JS-escape"> <xsl:with-param
-                name="string"
-                select="substring-after($string,'&apos;')"/>
-                </xsl:call-template> </xsl:when>
-            -->
-            <xsl:when
-                test="contains($string,'\')">
-                <xsl:value-of
-                    select="substring-before($string,'\')"/>
-                \\
-                <xsl:call-template
-                    name="JS-escape">
-                    <xsl:with-param
-                        name="string"
-                        select="substring-after($string,'\')"/>
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of
-                    select="$string"/>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-    <!--
-        template that will convert a carriage return into a br tag
-        @param word the text from which to convert CR to BR tag
-    -->
-    <xsl:template
-        name="br-replace">
-        <xsl:param
-            name="word"/>
-        <xsl:choose>
-            <xsl:when
-                test="contains($word,'&#xA;')">
-                <xsl:value-of
-                    select="substring-before($word,'&#xA;')"/>
-                <br/>
-                <xsl:call-template
-                    name="br-replace">
-                    <xsl:with-param
-                        name="word"
-                        select="substring-after($word,'&#xA;')"/>
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of
-                    select="$word"/>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-    <xsl:template
-        name="display-time">
-        <xsl:param
-            name="value"/>
-        <xsl:value-of
-            select="format-number($value,'0.000')"/>
-    </xsl:template>
-    <xsl:template
-        name="display-percent">
-        <xsl:param
-            name="value"/>
-        <xsl:value-of
-            select="format-number($value,'0.00%')"/>
-    </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/pave.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/pave.tests/testScripts/test.xml
deleted file mode 100644
index 96c6ddc..0000000
--- a/releng.wtpbuilder/distribution/pave.tests/testScripts/test.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<project
-    name="Automated Eclipse Testing"
-    default="all"
-    basedir=".">
-    <property
-        environment="env"/>
-
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-    <echo
-        level="info"
-        message="starting Automated Eclipse Testing"/>
-    <echo
-        level="debug"
-        message="basedir: ${basedir}"/>
-    <echo
-        level="debug"
-        message="testRoot: ${testRoot}"/>
-    <fail
-        message="testRoot must be set"
-        unless="testRoot"/>
-
-    <!--properties file containing the build information-->
-    <property
-        file="${buildDirectory}/label.properties"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-    <!--default directory where test-eclipse will be installed-->
-    <property
-        name="install"
-        value="${testRoot}"/>
-    <!--
-        name that can be added to report name to identify which platform
-        tests results come from
-    -->
-    <property
-        name="platform"
-        value=""/>
-
-    <!-- The root of the eclipse installation -->
-    <property
-        name="eclipse-home"
-        value="${testRoot}${dropinsFolder}/eclipse/"/>
-    <!--
-        The directory that will contain the xml and html results from
-        the tests that are run
-    -->
-    <property
-        name="results"
-        value="${testRoot}/results"/>
-    <property
-        name="library-file"
-        value="${testRoot}/wtp-junit-tests.xml"/>
-    <target
-        name="init">
-    </target>
-    <target
-        name="all"
-        depends="init">
-        <echo
-            level="info"
-            message="Starting Unit Tests"/>
-        <!--
-            unlike other ant tasks, subant defaults to false for
-            inheritall!
-        -->
-        <subant
-            target=""
-            inheritall="true">
-            <fileset
-                dir="${eclipse-home}/plugins/">
-                <exclude
-                    name="**/*performance*/test.xml"/>
-                <include
-                    name="**/test.xml"/>
-            </fileset>
-        </subant>
-        <echo
-            level="info"
-            message="Ended Unit Tests"/>
-        <antcall
-            target="genHtml"/>
-    </target>
-    <target
-        name="genHtml"
-        description="Generates HTML results with provided JUNIT.XSL provided"
-        unless="genHtml.disable">
-        <xslt
-            style="JUNIT.XSL"
-            basedir="${results}/xml"
-            destdir="${results}/html"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/pave.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/pave.tests/testScripts/wtp-junit-tests.xml
deleted file mode 100644
index 62f4501..0000000
--- a/releng.wtpbuilder/distribution/pave.tests/testScripts/wtp-junit-tests.xml
+++ /dev/null
@@ -1,317 +0,0 @@
-<?xml version="1.0"?>
-<project
-    name="JUnit tests"
-    basedir=".">
-    <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-    <target
-        name="init">
-        <property
-            name="junit-report-output"
-            value="${testRoot}/results"/>
-        <mkdir
-            dir="${junit-report-output}/raw"/>
-        <!--
-            if not otherwise set, be sure extraVMargs is at least some
-            string, even if unused string. 
-            
-            Remember, though, extraVMArgs can contain more than one extra arg, 
-            so much be passed to VM as a "line", not "value". 
-        -->
-        <property
-            name="extraVMargs"
-            value="-DextraVMargsunused=notused"/>
-
-        <!-- if not otherwise set, use a unique workspace name -->
-        <property
-            name="data-dir"
-            value="${testRoot}/junitworkspaces/workspace-${classname}"/>
-        <property
-            name="testRoot"
-            value="${testRoot}"/>
-        <!--
-            Some common values, of milliseconds to more recognizable
-            units: 14400000: 4 hours 7200000: 2 hours 3600000: 1 hour
-            1800000: 30 minutes 600000: 10 minutes
-        -->
-        <property
-            name="timeout"
-            value="1800000"/>
-        <property
-            name="junit-report-output"
-            value="${junit-report-output}"/>
-        <property
-            name="formatter"
-            value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter"/>
-        <property
-            name="test-output"
-            value="${junit-report-output}/raw/${classname}.xml"/>
-        <property
-            name="jvm"
-            value="${env.JAVA_6_HOME}/bin/java"/>
-        <dirname
-            file="${ant.file}"
-            property="currentDir"/>
-        <echo
-            level="debug"
-            message="data-dir: ${data-dir}"/>
-        <echo
-            level="debug"
-            message="plugin-name: ${plugin-name}"/>
-        <echo
-            level="debug"
-            message="classname: ${classname}"/>
-        <echo
-            level="info"
-            message="extraVMargs: ${extraVMargs}"/>
-        <echo
-            level="debug"
-            message="timeout: ${timeout}"/>
-        <echo
-            level="debug"
-            message="testRoot: ${testRoot}"/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="debug"
-            message="eclipse-home: ${eclipse-home}"/>
-        <echo
-            level="debug"
-            message="junit-report-output: ${junit-report-output}"/>
-        <echo
-            level="debug"
-            message="test-output: ${test-output}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="buildLabel: ${buildLabel}"/>
-        <echo
-            level="debug"
-            message="jvm: ${jvm}"/>
-    </target>
-    <target
-        name="core-test"
-        depends="init">
-        <echo
-            level="info"
-            message="test-type: core-test"/>
-        <ant
-            antfile="${ant.file}"
-            dir="${currentDir}"
-            target="eclipse-test">
-            <property
-                name="application"
-                value="org.eclipse.test.coretestapplication"/>
-        </ant>
-    </target>
-    <target
-        name="ui-test"
-        depends="init">
-        <echo
-            level="info"
-            message="test-type: ui-test"/>
-        <ant
-            antfile="${ant.file}"
-            dir="${currentDir}"
-            target="eclipse-test">
-            <property
-                name="application"
-                value="org.eclipse.test.uitestapplication"/>
-        </ant>
-    </target>
-    <target
-        name="eclipse-test"
-        description="Runs the specified classname as a plug-in test.">
-        <echo
-            level="info"
-            message="Running ${classname}"/>
-        <echo
-            level="debug"
-            message="Result file: ${junit-report-output}/${classname}.xml."/>
-        <echo
-            level="debug"
-            message="DISPLAY: ${env.DISPLAY}"/>
-        <mkdir
-            dir="${buildDirectory}/${buildLabel}/httplogstest"/>
-        <echo
-            message="http log messages to: ${buildDirectory}/${buildLabel}/httplogstest"/>
-    	
-       <condition
-           property="xulRunnerParam"
-           value="org.eclipse.swt.browser.XULRunnerPath"
-           else="XULRunnerPathNotSpecified">
-           <isset
-               property="env.WTP_XULRUNNER"/>
-       </condition>
-        <echo
-            message="xulRunnerParam: ${xulRunnerParam}"/>
-        <echo
-            message="WTP_XULRUNNER: ${env.WTP_XULRUNNER}"/>
-        <!--
-            If there is not exactly one launcher in the stack, we'd best
-            fail fast, since we are not expecting that, and may indicate
-            an installation that would produce unpredictable results
-        -->
-        <!--
-            requires ant 1.7, and at this point, we're running 1.6 from
-            eclipse ... <condition property="expectedNumberOfLaunchers">
-            <resourcecount when="equal" count="1" > <fileset
-            dir="${testRoot}/eclipse/plugins"> <include
-            name="org.eclipse.equinox.launcher_*.jar" /> </fileset>
-            </resourcecount> </condition> <fail message="Did not find
-            expected number of launcher jars. Check installation."
-            unless="expectedNumberOfLaunchers" />
-        -->
-        <java
-            taskname="suiteUnitTest"
-            fork="true"
-            resultProperty="suitejunitresult"
-            failonerror="false"
-            timeout="${timeout}"
-            dir="${testRoot}/eclipse"
-            jvm="${jvm}"
-            classname="org.eclipse.equinox.launcher.Main">
-            <classpath>
-                <fileset
-                    dir="${testRoot}/eclipse/plugins">
-                    <include
-                        name="org.eclipse.equinox.launcher_*.jar"/>
-                </fileset>
-            </classpath>
-            <jvmarg
-                value="-Xmx512m"/>
-            <jvmarg
-                value="-Dosgi.ws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dosgi.os=${env.BASEOS}"/>
-            <jvmarg
-                value="-Dosgi.arch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-DbuildLabel=${buildLabel}"/>
-            <jvmarg
-                value="-DbuildDirectory=${buildDirectory}"/>
-            <jvmarg
-                value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
-            <jvmarg
-                value="-DurlLogLocation=${buildDirectory}/${buildLabel}/httplogstest/outgoinghttplog-${plugin-name}.log"/>
-            <jvmarg
-                value="-Dwtp.autotest.noninteractive=true"/>
-            <jvmarg
-                line="${extraVMargs}"/>
-            <jvmarg
-                value="-Declipse.consolelog=true"/>
-            <jvmarg
-                value="-Dosgi.debug"/>
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <jvmarg
-                value="-Dprojectname=${projectname}"/>
-        	
-              <jvmarg
-                  value="-D${xulRunnerParam}=${env.WTP_XULRUNNER}"/> 	
-        	
-        	
-            <arg
-                value="-nosplash"/>
-            <arg
-                value="-data"/>
-            <arg
-                value="${data-dir}"/>
-            <arg
-                value="-application"/>
-            <arg
-                value="${application}"/>
-            <arg
-                value="formatter=${formatter},${test-output}"/>
-            <arg
-                value="-testPluginName"/>
-            <arg
-                value="${plugin-name}"/>
-            <arg
-                value="-className"/>
-            <arg
-                value="${classname}"/>
-            <env
-                key="DISPLAY"
-                value="${env.DISPLAY}"/>
-            <redirector
-                output="${junit-report-output}/${classname}.output.txt"
-                error="${junit-report-output}/${classname}.error.txt"/>
-        </java>
-        <echo
-            level="info"
-            message="suitejunitresult: ${suitejunitresult}"/>
-        <antcall
-            target="summarizeFailure"/>
-        <antcall
-            target="collect-results"/>
-    </target>
-    <target
-        name="collect-results">
-        <dirname
-            property="output-dir"
-            file="${test-output}"/>
-        <basename
-            property="output-file-name"
-            file="${test-output}"/>
-        <mkdir
-            dir="${junit-report-output}/xml"/>
-        <junitreport
-            todir="${junit-report-output}/xml"
-            tofile="${classname}.xml">
-            <fileset
-                dir="${output-dir}">
-                <include
-                    name="${output-file-name}"/>
-            </fileset>
-        </junitreport>
-        <mkdir
-            dir="${junit-report-output}/html"/>
-        <xslt
-            style="${testRoot}/JUNIT.XSL"
-            basedir="${junit-report-output}"
-            includes="${classname}.xml"
-            destdir="${junit-report-output}/html"/>
-    </target>
-    <target
-        name="collect">
-        <!--
-            deprecated, each test.xml uses it, and we should remove,
-            eventually
-        -->
-        <echo
-            message="Deprecated. There is no need to call the collect task. It no longer does anything. Please remove from your test.xml file"/>
-    </target>
-    <target
-        name="summarizeFailure"
-        depends="checkFailure"
-        if="doFailure">
-        <echo
-            append="true"
-            file="${buildDirectory}/junitFailureList.log">${plugin-name}${line.separator}</echo>
-    </target>
-    <target
-        name="checkFailure">
-        <condition
-            property="doFailure">
-            <not>
-                <equals
-                    arg1="${suitejunitresult}"
-                    arg2="0"
-                    trim="true"/>
-            </not>
-        </condition>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/pave.tests/testdependency.xml b/releng.wtpbuilder/distribution/pave.tests/testdependency.xml
deleted file mode 100644
index 40451d4..0000000
--- a/releng.wtpbuilder/distribution/pave.tests/testdependency.xml
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-    <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <fail
-        message="Required property file does not exist: ${keyCfgFile}">
-        <condition>
-            <not>
-                <available
-                    file="${keyCfgFile}"/>
-            </not>
-        </condition>
-    </fail>
-    <property
-        file="${keyCfgFile}"/>
-    <condition
-        property="getprereq.eclipse">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.eclipseplatform">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.emf">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.emfxsd">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.emfvalidation">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.gef">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.dtp">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.wst">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.jst">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.wtp">
-        <istrue
-            value="true"/>
-    </condition>
-    <target
-        name="get">
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined, which we do later with
-            statements such if="${groupId}.url"
-        -->
-        <property
-            file="${dependency.properties}"/>
-        <antcall
-            target="prereq.emf"/>
-        <antcall
-            target="prereq.emfxsd"/>
-        <antcall
-            target="prereq.emfvalidation"/>
-        <antcall
-            target="prereq.gef"/>
-        <antcall
-            target="prereq.dtp"/>
-        <antcall
-            target="prereq.wst"/>
-        <antcall
-            target="prereq.jst"/>
-        <antcall
-            target="prereq.wtp"/>
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="eclipseTestFramework"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.eclipse"
-        if="getprereq.eclipse">
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.eclipseplatform"
-        if="getprereq.eclipseplatform">
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="eclipseplatform"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emf"
-        if="getprereq.emf">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfxsd"
-        if="getprereq.emfxsd">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfvalidation"
-        if="getprereq.emfvalidation">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="emfvalidation"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.gef"
-        if="getprereq.gef">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.dtp"
-        if="getprereq.dtp">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="dtp"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wst"
-        if="getprereq.wst">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="wst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.jst"
-        if="getprereq.jst">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="jst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wtp"
-        if="getprereq.wtp">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="wtp"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstallBase"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-    <target
-        name="getAndInstallDropins"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}${dropinsFolder}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/servadapt.build/build.xml b/releng.wtpbuilder/distribution/servadapt.build/build.xml
deleted file mode 100644
index 6c797f1..0000000
--- a/releng.wtpbuilder/distribution/servadapt.build/build.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<project
-    default="build"
-    basedir=".">
-    <fail
-        unless="wtp.builder.home"/>
-    <property
-        file="${wtp.builder.home}/build.properties"/>
-    <target
-        name="build"
-        depends="getBaseBuilder">
-        <dirname
-            file="${ant.file}"
-            property="distribution.wtp.build.dir"/>
-        <property
-            name="buildTargets"
-            value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
-        <!--
-            for this distribution, dependencies come from project's
-            releng map project
-        -->
-        <property
-            name="dependency.properties"
-            value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-
-        <!-- calling label.xml to createg label.properties file -->
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-        <echo
-            level="info"
-            message="invoking buildTargets: ${buildTargets} to build for each component"/>
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="servadapt"/>
-        </ant>
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="servadapt_sdk"/>
-        </ant>
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="servadapt_tests"/>
-            <property
-                name="eclipseBuildFailOnError"
-                value="false"/>
-        </ant>
-
-        <!-- package -->
-        <antcall
-            target="package"/>
-    </target>
-
-    <!-- invoking runbuild.xml targetting getBaseBuilder -->
-    <target
-        name="getBaseBuilder"
-        if="eclipse.builder.fetch">
-        <dirname
-            file="${ant.file}"
-            property="wtbuilder.dir"/>
-        <property
-            name="buildTargets"
-            value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
-        <echo
-            level="info"
-            message="invoking buildTargets: ${buildTargets} -> getBaseBuilder"/>
-        <ant
-            antfile="${buildTargets}"
-            target="getBaseBuilder"/>
-    </target>
-    <target
-        name="package">
-        <!--
-            post, post packaging, for WTP ... "manually" assemble the
-            desired zips
-        -->
-        <!-- nothing to assemble right now -->
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/servadapt.site/build.xml b/releng.wtpbuilder/distribution/servadapt.site/build.xml
deleted file mode 100644
index 39fc90e..0000000
--- a/releng.wtpbuilder/distribution/servadapt.site/build.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-<project
-    name="Build specific targets and properties"
-    default="build"
-    basedir=".">
-    <!--
-        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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- = = = end standard properties pattern = = = -->
-    <echo
-        message="ant.file: ${ant.file}"/>
-    <target
-        name="build">
-    	<mkdir dir="${buildDirectory}/${buildLabel} "/>
-        <java
-            jar="${eclipse.launcher}"
-            fork="true"
-            failonerror="true">
-            <jvmarg
-                value="-Dosgi.ws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dosgi.os=${env.BASEOS}"/>
-            <jvmarg
-                value="-Dosgi.arch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-Dbuild.donottagmaps=${build.donottagmaps}"/>
-            <jvmarg
-                value="-DbuildBranch=${buildBranch}"/>
-            <jvmarg
-                value="-DbuildType=${buildType}"/>
-            <jvmarg
-                value="-DbuildId=${buildId}"/>
-            <jvmarg
-                value="-DmapVersionTag=${mapVersionTag}"/>
-            <jvmarg
-                value="-Dbuild.distribution=${build.distribution}"/>
-            <jvmarg
-                value="-DbuildDirectory=${buildDirectory}"/>
-            <jvmarg
-                value="-Dwtp.builder.home=${wtp.builder.home}"/>
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <jvmarg
-                value="-Dprojectname=${projectname}"/>
-            <jvmarg
-                value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
-            <jvmarg
-                value="-DurlLogLocation=${buildDirectory}/${buildLabel}/outgoinghttplogfromsitebuild.log"/>
-            <arg
-                value="-data"/>
-            <arg
-                value="${basedir}/workspace"/>
-            <arg
-                value="-application"/>
-            <arg
-                value="org.eclipse.ant.core.antRunner"/>
-            <arg
-                value="-buildfile"/>
-            <arg
-                value="${ant.file}"/>
-            <arg
-                value="publish"/>
-        </java>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Steps to do to publish the build results -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="publish">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-        <property
-            file="${buildDirectory}/label.properties"/>
-        <property
-            name="publish.xml"
-            value="${component.dir}/publish.xml"/>
-        <property
-            name="indexFileName"
-            value="index.php"/>
-        <property
-            name="result"
-            value="${buildDirectory}/${buildLabel}"/>
-        <property
-            name="indexTemplateFilename"
-            value="index.html.template.php"/>
-        <copy
-            file="${wtp.builder.home}/distribution/wtp.site/templateFiles/${indexTemplateFilename}"
-            tofile="${buildDirectory}/${indexFileName}"/>
-        <condition
-            property="isBuildTested"
-            value="true">
-            <available
-                file="${buildDirectory}/${buildLabel}/testResults/html"/>
-        </condition>
-        <ant
-            antfile="${publish.xml}"
-            dir="${component.dir}">
-            <property
-                name="dropTokenList"
-                value="%wtpruntime%,%wtpsdk%,%wtptest%,%wst%,%wst-sdk%,%wst-tests%,%jst-tests%,%wst-perf-tests%,%jst-perf-tests%,%jpt-runtime%,%jpt-sdk%,%jpt-tests%"/>
-            <property
-                name="webtoolsDownloadURL"
-                value="http://www.eclipse.org/downloads/download.php?file=/webtools/committers/drops"/>
-            <property
-                name="buildBranch"
-                value="${buildBranch}"/>
-            <property
-                name="isBuildTested"
-                value="${isBuildTested}"/>
-            <property
-                name="indexTemplateFilename"
-                value="${indexTemplateFilename}"/>
-        </ant>
-
-        <!--  Get the build map over for the results to point to. -->
-        <copy
-            file="${buildDirectory}/directory.txt"
-            tofile="${result}/directory.txt"/>
-
-        <!-- Copy info for build identification -->
-        <copy
-            file="${buildDirectory}/buildmachineinfo.properties"
-            tofile="${result}/buildmachineinfo.properties"/>
-
-        <!-- http access logs -->
-        <copy
-            todir="${result}/"
-            failonerror="false">
-            <fileset
-                dir="${buildDirectory}"
-                includes="*.log"/>
-        </copy>
-
-        <!-- ant build log, from control directory -->
-        <copy
-            todir="${result}/"
-            failonerror="false">
-            <fileset
-                dir="${env.ANT_WORKING}/${projectname}"
-                includes="antBuilderOutput.log"/>
-        </copy>
-
-
-
-        <!-- final count files -->
-        <countBuildFiles
-            sourceDirectory="${buildDirectory}/${buildLabel}"
-            filterString=".zip,.tar.gz"
-            outputFile="${buildDirectory}/${buildLabel}/files.count"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/servadapt.site/compilerXMLOutputToHTML.xsl b/releng.wtpbuilder/distribution/servadapt.site/compilerXMLOutputToHTML.xsl
deleted file mode 100644
index ffc7905..0000000
--- a/releng.wtpbuilder/distribution/servadapt.site/compilerXMLOutputToHTML.xsl
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet
-    version="1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-    <xsl:output
-        method="html"
-        indent="yes"/>
-    <xsl:template
-        match="/">
-        <html>
-            <body>
-                <xsl:apply-templates
-                    select="compiler"/>
-            </body>
-        </html>
-    </xsl:template>
-    <xsl:template
-        match="compiler">
-        <h2>Compiler Report</h2>
-        <p>
-            Compiler:
-            <xsl:value-of
-                select="@name"/>
-            <xsl:text>   </xsl:text>
-            Version:
-            <xsl:value-of
-                select="@version"/>
-        </p>
-        <xsl:apply-templates
-            select="stats"/>
-        <xsl:apply-templates
-            select="sources"/>
-    </xsl:template>
-    <xsl:template
-        name="stats"
-        match="stats">
-        <p>
-            Number of source files:
-            <xsl:value-of
-                select="count(..//source)"/>
-            Number of classfiles:
-            <xsl:value-of
-                select="number_of_classfiles/@value"/>
-        </p>
-        <p>
-            Problems:
-            <xsl:value-of
-                select="problem_summary/@problems"/>
-            (Errors:
-            <xsl:value-of
-                select="problem_summary/@errors"/>
-            Warnings:
-            <xsl:value-of
-                select="problem_summary/@warnings"/>
-            )
-        </p>
-    </xsl:template>
-    <xsl:template
-        name="sources"
-        match="sources">
-        <xsl:if
-            test="count(source) > 0">
-            <dl>
-                <xsl:for-each
-                    select="source">
-                    <xsl:variable
-                        name="package"
-                        select="normalize-space(@package)">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="path"
-                        select="normalize-space(@path)">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="classname"
-                        select="substring-after($path, $package)">
-                    </xsl:variable>
-                    <xsl:if
-                        test="count(problems) > 0">
-                        <dt
-                            style="font-weight: bold; color: black">
-                            Source File:
-                            <xsl:value-of
-                                select="$package"/>
-                            <xsl:value-of
-                                select="$classname"/>
-                        </dt>
-                        <xsl:apply-templates
-                            select="problems">
-                            <xsl:with-param
-                                name="classname">
-                                <xsl:value-of
-                                    select="$classname"/>
-                            </xsl:with-param>
-                        </xsl:apply-templates>
-                    </xsl:if>
-                </xsl:for-each>
-            </dl>
-        </xsl:if>
-    </xsl:template>
-    <xsl:template
-        match="problems">
-        <xsl:param
-            name="classname"/>
-        <xsl:for-each
-            select="problem">
-            <dd
-                style="font-weight: normal; color: black">
-                <xsl:value-of
-                    select="position()"/>
-                <xsl:text>.  </xsl:text>
-                <xsl:value-of
-                    select="@severity"/>
-                <xsl:text>:  </xsl:text>
-                <xsl:value-of
-                    select="@id"/>
-                <xsl:variable
-                    name="lineNumber"
-                    select="@line">
-                </xsl:variable>
-                <xsl:for-each
-                    select="message">
-                    <p
-                        style="margin-left: +.5in; font-size: -1; margin-top: 0;margin-bottom:0;">
-                        <small>
-                            <xsl:value-of
-                                select="@value"/>
-                        </small>
-                    </p>
-                </xsl:for-each>
-                <xsl:for-each
-                    select="source_context">
-                    <xsl:variable
-                        name="pre"
-                        select="substring(@value,0,(@sourceStart + 1))">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="main"
-                        select="substring(@value,(@sourceStart + 1),(((@sourceEnd + 1) - (@sourceStart + 1)) + 1))">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="end"
-                        select="substring(@value,(@sourceEnd + 2))">
-                    </xsl:variable>
-                    <p
-                        style="margin-left: +.5in; font-size: -2; margin-top: 0;margin-bottom:0;">
-                        <xsl:value-of
-                            select="substring($classname,2)"/>
-                        :
-                    </p>
-                    <p
-                        style="margin-left: +.5in; font-size: -2;font-family: monospace; margin-top: 0;margin-bottom:0;">
-                        <xsl:value-of
-                            select="$lineNumber"/>
-                        :
-                        <xsl:value-of
-                            select="$pre"/>
-                        <b>
-                            <u>
-                                <xsl:value-of
-                                    select="$main"/>
-                            </u>
-                        </b>
-                        <xsl:value-of
-                            select="$end"/>
-                    </p>
-                </xsl:for-each>
-            </dd>
-        </xsl:for-each>
-    </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/servadapt.site/publish.xml b/releng.wtpbuilder/distribution/servadapt.site/publish.xml
deleted file mode 100644
index 71afb65..0000000
--- a/releng.wtpbuilder/distribution/servadapt.site/publish.xml
+++ /dev/null
@@ -1,821 +0,0 @@
-<project
-    name="Publish Build"
-    default="default"
-    basedir=".">
-    <!--
-        Properties that must be passed to this script: buildDirectory:
-        Path to perform the build in. (A working directory) buildType:
-        Type of build (nightly, integration etc.) buildId: Build name
-        buildLabel: <buildType>-<buildName>-<timestamp>
-    -->
-    <property
-        environment="env"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be provided to publish"/>
-    <fail
-        unless="buildLabel"
-        message="buildLabel must be provided to publish"/>
-    <fail
-        unless="wtp.builder.home"
-        message="wtp.builder.home must be provided to publish"/>
-    <fail
-        unless="build.distribution"
-        message="build.distribution must be provided to publish"/>
-    <property
-        name="resultDir"
-        value="${buildDirectory}/${buildLabel}"/>
-    <!--name of generated index page-->
-    <property
-        name="indexFileName"
-        value="index.php"/>
-    <property
-        name="templateDir"
-        value="${wtp.builder.home}/distribution/${build.distribution}.site"/>
-    <property
-        name="resultingIndex"
-        value="${resultDir}/${indexFileName}"/>
-    <echo
-        level="debug"
-        message="resultDir: ${resultDir}"/>
-    <echo
-        level="debug"
-        message="templateDir: ${templateDir}"/>
-    <echo
-        level="debug"
-        message="resultingIndex: ${resultingIndex}"/>
-    <target
-        name="default">
-        <copy
-            overwrite="true"
-            file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/${indexTemplateFilename}"
-            tofile="${resultingIndex}"/>
-        <antcall
-            target="countFiles"/>
-        <antcall
-            target="generateCompileIndex"/>
-        <antcall
-            target="generateJUnitTestsIndex"/>
-        <antcall
-            target="getStaticFiles"/>
-    </target>
-    <target
-        name="generateCompileIndex">
-        <!--
-            <taskdef name="indexResults"
-            classname="org.eclipse.wtp.releng.tools.ResultsSummaryGenerator"
-            />
-        -->
-        <!--
-            isBuildTested: true|false should JUnit plugin test results
-            be used to generate index page dropTokenList: comma
-            separated list of strings which should be replaced by the
-            fileName attribute settings in the testManifest.xml.
-            xmlDirectoryName: path to directory containing JUnit plugin
-            test results in xml format (see doc is org.eclipse.test).
-            dropDirectoryName: path to directory containing the result
-            of the build. testResultsTemplateFileName: path to template
-            file used to generate page with links to JUnit test results
-            testResultsHtmlFileName: name of file which will be
-            generated with links to JUnit test results dropHtmlFileName:
-            name of generated index page hrefTestResultsTargetPath:
-            relative path from index page to directory containing JUnit
-            html test results hrefCompileLogsTargetPath: relative path
-            from index page directory containing compilelogs
-            testManifestFileName: name of xml file containing
-            descriptions of zip types and log files
-        -->
-        <property
-            file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-
-        <!-- create tables of test plugin compiles first -->
-        <antcall
-            target="generateTestCompileOutput">
-            <param
-                name="outputDirectory"
-                value="${resultDir}/testcompilelogs"/>
-        </antcall>
-
-        <!-- create table of code plugins compiles -->
-        <antcall
-            target="generateCompileOutput">
-            <param
-                name="outputDirectory"
-                value="${resultDir}/compilelogs"/>
-        </antcall>
-        <tstamp>
-            <format
-                property="TODAY"
-                pattern="MMMM d, yyyy"/>
-        </tstamp>
-
-        <!--  Insert Build Type descriptor  -->
-        <antcall
-            target="${buildType}"/>
-        <antcall
-            target="writeData"/>
-        <!--
-            Update timestamp on file to permit overwrite through Ant
-            copy task
-        -->
-        <touch
-            file="${resultingIndex}"/>
-    </target>
-    <target
-        name="generateTestCompileOutput"
-        depends="checkIfCompileLogs"
-        if="doCompileLogs">
-        <summarizeResults
-            isBuildTested="false"
-            includeAll="true"
-            dropTokenList="${dropTokenList}"
-            xmlDirectoryName=""
-            dropDirectoryName="${resultDir}"
-            testResultsTemplateFileName="${templateDir}/templateFiles/testCompileResults.php.template"
-            testResultsHtmlFileName="testCompileResults.php"
-            hrefTestResultsTargetPath=""
-            hrefCompileLogsTargetPath="testcompilelogs"
-            compileLogsDirectoryName="${outputDirectory}"/>
-        <antcall
-            target="compilerXMLToHTML"/>
-    </target>
-    <target
-        name="generateCompileOutput"
-        depends="checkIfCompileLogs"
-        if="doCompileLogs">
-        <summarizeResults
-            isBuildTested="false"
-            includeAll="true"
-            dropTokenList="${dropTokenList}"
-            xmlDirectoryName=""
-            dropDirectoryName="${resultDir}"
-            testResultsTemplateFileName="${templateDir}/templateFiles/compileResults.php.template"
-            testResultsHtmlFileName="compileResults.php"
-            hrefTestResultsTargetPath="testResults/html"
-            hrefCompileLogsTargetPath="compilelogs"
-            compileLogsDirectoryName="${outputDirectory}"/>
-        <antcall
-            target="compilerXMLToHTML"/>
-    </target>
-    <target
-        name="compilerXMLToHTML">
-        <xslt
-            basedir="${outputDirectory}"
-            destdir="${outputDirectory}"
-            includes="**/*.xml"
-            scanincludeddirectories="true"
-            style="compilerXMLOutputToHTML.xsl"
-            force="true"/>
-    </target>
-    <target
-        name="generateJUnitTestsIndex"
-        depends="checkIfTested"
-        if="doTests">
-        <!--
-            isBuildTested: true|false should JUnit plugin test results
-            be used to generate index page dropTokenList: comma
-            separated list of strings which should be replaced by the
-            fileName attribute settings in the testManifest.xml.
-            xmlDirectoryName: path to directory containing JUnit plugin
-            test results in xml format (see doc is org.eclipse.test).
-            dropDirectoryName: path to directory containing the result
-            of the build. testResultsTemplateFileName: path to template
-            file used to generate page with links to JUnit test results
-            testResultsHtmlFileName: name of file which will be
-            generated with links to JUnit test results dropHtmlFileName:
-            name of generated index page hrefTestResultsTargetPath:
-            relative path from index page to directory containing JUnit
-            html test results hrefCompileLogsTargetPath: relative path
-            from index page directory containing compilelogs
-            testManifestFileName: name of xml file containing
-            descriptions of zip types and log files
-        -->
-        <property
-            file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-
-        <!-- create table of test plugin compiles first -->
-        <!-- set isBuildTested to true for the "compile only" results -->
-        <summarizeResults
-            isBuildTested="true"
-            dropTokenList="${dropTokenList}"
-            dropDirectoryName="${resultDir}"
-            xmlDirectoryName="${resultDir}/testResults/xml"
-            testResultsTemplateFileName="${templateDir}/templateFiles/testResults.php.template"
-            testResultsHtmlFileName="testResults.php"
-            hrefTestResultsTargetPath="testResults/html"
-            compileLogsDirectoryName=""/>
-        <tstamp>
-            <format
-                property="TODAY"
-                pattern="MMMM d, yyyy"/>
-        </tstamp>
-
-        <!--  Insert Build Type descriptor  -->
-        <antcall
-            target="${buildType}"/>
-        <antcall
-            target="writeData"/>
-        <!--
-            Update timestamp on file to permit overwrite through Ant
-            copy task
-        -->
-        <touch
-            file="${resultingIndex}"/>
-    </target>
-    <target
-        name="getStaticFiles">
-        <!--get static files required in the buildLabel directory-->
-        <copy
-            todir="${resultDir}">
-            <fileset
-                dir="${templateDir}/staticDropFiles"/>
-        </copy>
-
-        <!--copy buildnotes from plugin directories-->
-        <mkdir
-            dir="${resultDir}/buildnotes"/>
-        <copy
-            todir="${resultDir}/buildnotes"
-            flatten="true">
-            <fileset
-                dir="${buildDirectory}/plugins"
-                includes="**/buildnotes_*.html"/>
-            <fileset
-                dir="${buildDirectory}/features"
-                includes="**/buildnotes_*.html"/>
-        </copy>
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/full/logIndex.php"/>
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/testLogs/logIndex.php"/>
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/testSysErrorLogs/logIndex.php"/>
-    </target>
-    <target
-        name="updateSite">
-
-
-        <!-- get our authored, tokenized site.xml file -->
-        <copy
-            file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/siteWTP.xml"
-            tofile="${buildDirectory}/${buildLabel}/updateSite/site.xml"
-            overwrite="true"
-            failonerror="true"/>
-        <!--
-            get the ${buildDirectory}/finalPluginsVersions.properties,
-            and read as properties
-        -->
-        <!-- substitute property value for tokens -->
-        <replace
-            file="${buildDirectory}/${buildLabel}/updateSite/site.xml"
-            propertyfile="${buildDirectory}/finalFeaturesVersions.properties">
-            <replacefilter
-                token="@org.eclipse.wtp@"
-                property="org.eclipse.wtp"/>
-            <replacefilter
-                token="@org.eclipse.wtp.sdk@"
-                property="org.eclipse.wtp.sdk"/>
-            <replacefilter
-                token="@org.eclipse.jst@"
-                property="org.eclipse.jst"/>
-            <replacefilter
-                token="@org.eclipse.jst.sdk@"
-                property="org.eclipse.jst.sdk"/>
-            <replacefilter
-                token="@org.eclipse.jpt.feature@"
-                property="org.eclipse.jpt.feature"/>
-            <replacefilter
-                token="@org.eclipse.jpt_sdk.feature@"
-                property="org.eclipse.jpt_sdk.feature"/>
-        </replace>
-    </target>
-    <target
-        name="countFiles">
-        <!--
-            files.count is a file that should exist in the drop
-            directory with a count of the zip files in the same
-            directory. It is required to generate a link to the build on
-            the downloads page.
-        -->
-        <countBuildFiles
-            sourceDirectory="${resultDir}"
-            filterString=".zip,.tar.gz"
-            outputFile="${resultDir}/files.count"/>
-    </target>
-
-    <!--Build type descriptors-->
-    <target
-        name="I">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Integration"/>
-    </target>
-    <target
-        name="S">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Stable"/>
-    </target>
-    <target
-        name="N">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Nightly"/>
-    </target>
-    <target
-        name="M">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Maintenance"/>
-    </target>
-    <target
-        name="R">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Release"/>
-    </target>
-    <target
-        name="T">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Test"/>
-    </target>
-    <target
-        name="P">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Patches"/>
-    </target>
-    <target
-        name="checkIfTested">
-        <echo
-            level="debug"
-            message="isBuildTested: ${isBuildTested}"/>
-        <condition
-            property="doTests">
-            <equals
-                arg1="${isBuildTested}"
-                arg2="true"
-                trim="true"
-                casesensitive="false"/>
-        </condition>
-    </target>
-    <target
-        name="checkIfCompileLogs">
-        <condition
-            property="doCompileLogs">
-            <available
-                file="${outputDirectory}"/>
-        </condition>
-    </target>
-    <target
-        name="writeData">
-        <!--  Insert Build Date  -->
-        <replace
-            file="${resultingIndex}"
-            token="@date@"
-            value="${TODAY}"/>
-
-        <!--  Insert Build Name  -->
-        <replace
-            file="${resultingIndex}"
-            token="@build@"
-            value="${buildLabel}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@buildBranch@"
-            value="${buildBranch}"/>
-
-        <!--  Insert PreRequsites  -->
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformFile@"
-            value="${eclipseplatform.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformURL@"
-            value="${eclipseplatform.url}/${eclipseplatform.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformBuildURL@"
-            value="${eclipseplatform.url}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformfilelinux@"
-            value="${eclipseplatform.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformfilewindows@"
-            value="${eclipseplatform.file.win32-win32-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformfilemacos@"
-            value="${eclipseplatform.file.macosx-carbon-ppc}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformBuildHome@"
-            value="${eclipseplatform.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatform.mirror.prefixuri@"
-            value="${eclipseplatform.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatform.fspath.prefix@"
-            value="${eclipseplatform.fspath.prefix}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseFile@"
-            value="${eclipse.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseURL@"
-            value="${eclipse.url}/${eclipse.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseBuildURL@"
-            value="${eclipse.url}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilelinux@"
-            value="${eclipse.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilewindows@"
-            value="${eclipse.file.win32-win32-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilemacos@"
-            value="${eclipse.file.macosx-carbon-ppc}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseBuildHome@"
-            value="${eclipse.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipse.mirror.prefixuri@"
-            value="${eclipse.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipse.fspath.prefix@"
-            value="${eclipse.fspath.prefix}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@testURL@"
-            value="${eclipseTestFramework.url}/${eclipseTestFramework.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@testFile@"
-            value="${eclipseTestFramework.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfName@"
-            value="${emf.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfDescription@"
-            value="${emf.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfFile@"
-            value="${emf.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfURL@"
-            value="${emf.url}/${emf.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfBuildHome@"
-            value="${emf.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emf.mirror.prefixuri@"
-            value="${emf.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsourceURL@"
-            value="${emfsourcedoc.url}/${emfsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsourceFile@"
-            value="${emfsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsourceName@"
-            value="${emfsourcedoc.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsourceDescription@"
-            value="${emfsourcedoc.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsourceBuildHome@"
-            value="${emfsourcedoc.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsource.mirror.prefixuri@"
-            value="${emfsourcedoc.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsourceURL@"
-            value="${emfxsdsourcedoc.url}/${emfsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsourceFile@"
-            value="${emfxsdsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsourceName@"
-            value="${emfxsdsourcedoc.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsourceDescription@"
-            value="${emfxsdsourcedoc.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsourceBuildHome@"
-            value="${emfxsdsourcedoc.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsource.mirror.prefixuri@"
-            value="${emfxsdsourcedoc.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdFile@"
-            value="${emfxsd.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdName@"
-            value="${emfxsd.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdDescription@"
-            value="${emfxsd.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdURL@"
-            value="${emfxsd.url}/${emfxsd.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdBuildHome@"
-            value="${emfxsd.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsd.mirror.prefixuri@"
-            value="${emfxsd.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationFile@"
-            value="${emfvalidation.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationURL@"
-            value="${emfvalidation.url}/${emfvalidation.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationBuildHome@"
-            value="${emfvalidation.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidation.mirror.prefixuri@"
-            value="${emfvalidation.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationName@"
-            value="${emfvalidation.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationDescription@"
-            value="${emfvalidation.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsourceFile@"
-            value="${emfvalidationsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsourceURL@"
-            value="${emfvalidationsourcedoc.url}/${emfvalidationsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsourceBuildHome@"
-            value="${emfvalidationsourcedoc.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsource.mirror.prefixuri@"
-            value="${emfvalidationsourcedoc.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsourceName@"
-            value="${emfvalidationsourcedoc.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsourceDescription@"
-            value="${emfvalidationsourcedoc.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstName@"
-            value="${wst.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstDescription@"
-            value="${wst.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstFile@"
-            value="${wst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstURL@"
-            value="${wst.url}/${wst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstBuildHome@"
-            value="${wst.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wst.mirror.prefixuri@"
-            value="${wst.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstName@"
-            value="${jst.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstDescription@"
-            value="${jst.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstFile@"
-            value="${jst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstURL@"
-            value="${jst.url}/${jst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstBuildHome@"
-            value="${jst.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jst.mirror.prefixuri@"
-            value="${jst.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpName@"
-            value="${wtp.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpDescription@"
-            value="${wtp.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpFile@"
-            value="${wtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpURL@"
-            value="${wtp.url}/${wtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpBuildHome@"
-            value="${wtp.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtp.mirror.prefixuri@"
-            value="${wtp.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefFile@"
-            value="${gef.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefURL@"
-            value="${gef.url}/${gef.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefBuildHome@"
-            value="${gef.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gef.mirror.prefixuri@"
-            value="${gef.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefName@"
-            value="${gef.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefDescription@"
-            value="${gef.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipserelengFile@"
-            value="${eclipsereleng.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipserelengURL@"
-            value="${eclipsereleng.url}/${eclipsereleng.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipFile@"
-            value="${orbitthirdpartyzip.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipURL@"
-            value="${orbitthirdpartyzip.url}/${orbitthirdpartyzip.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipBuildHome@"
-            value="${orbitthirdpartyzip.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzip.mirror.prefixuri@"
-            value="${orbitthirdpartyzip.mirror.prefixuri}"/>
-
-
-        <!-- no longer used. Post 1.5.5 -->
-        <replace
-            file="${resultingIndex}"
-            token="@jemFile@"
-            value="${jem.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jemURL@"
-            value="${jem.url}/${jem.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jemBuildHome@"
-            value="${jem.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jem.mirror.prefixuri@"
-            value="${jem.mirror.prefixuri}"/>
-        <!--
-            these token/s should not exist in maintenance stream, but do
-            no harm done, so in the interests of keeping builder streams
-            in sync, we'll leave them here as place hold
-        -->
-        <replace
-            file="${resultingIndex}"
-            token="@dtpFile@"
-            value="${dtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtpURL@"
-            value="${dtp.url}/${dtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtpBuildHome@"
-            value="${dtp.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtp.mirror.prefixuri@"
-            value="${dtp.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtpName@"
-            value="${dtp.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtpDescription@"
-            value="${dtp.description}"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/access_err.gif b/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/access_err.gif
deleted file mode 100644
index 4f0748a..0000000
--- a/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/access_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/access_warn.gif b/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/access_warn.gif
deleted file mode 100644
index 8386e3e..0000000
--- a/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/access_warn.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/buildNotes.php b/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/buildNotes.php
deleted file mode 100644
index f666887..0000000
--- a/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/buildNotes.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<html>
-<head>
-<?php
-$parts = explode("/", getcwd());
-$parts2 = explode("-", $parts[count($parts) - 1]);
-$buildName = $parts2[1];
-
-echo "<title>Build Notes for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Build Notes</font></b></p>
-
-<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"> Build Notes for <?php echo "$buildName"; ?></font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$hasNotes = false;
-$aDirectory = dir("buildnotes");
-while ($anEntry = $aDirectory->read()) {
-	if ($anEntry != "." && $anEntry != "..") {
-		//print_r($anEntry);
-		//echo "<br />";
-
-		$subject = $anEntry;
-		$pattern = '/^buildnotes_(.*)/i';
-		preg_match($pattern, $subject, $matches);
-		$subject = $matches[1];
-		//print_r($subject);
-		//echo "<br />";
-		$pattern = '/^(.*)\.html$/';
-		preg_match($pattern, $subject, $matches);
-		//print_r($matches);
-		//echo "<br />";
-
-		$component = $matches[1];
-
-		$line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
-		echo "<tr>";
-		echo "$line";
-		echo "</tr>";
-		$hasNotes = true;
-
-	}
-}
-$aDirectory.closedir();
-if (!$hasNotes) {
-	echo "<br>There are no build notes for this build.";
-}
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/compile_err.gif b/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/compile_err.gif
deleted file mode 100644
index c2bfdd6..0000000
--- a/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/compile_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/compile_warn.gif b/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/compile_warn.gif
deleted file mode 100644
index cf4fdf9..0000000
--- a/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/compile_warn.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/consoleLogs.php b/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/consoleLogs.php
deleted file mode 100644
index 2ee3c36..0000000
--- a/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/consoleLogs.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<html>
-<head>
-<?php
-$parts = explode("/", getcwd());
-$parts2 = explode("-", $parts[count($parts) - 1]);
-$buildName = $parts2[1];
-
-echo "<title>Test Console Output for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-<title>Console Logs from Running JUnit Plug-in Tests</title>
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b></p>
-
-<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">Console output from running
-		JUnit plugin tests for <?php echo "$buildName"; ?> </font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$rootDir = "testResults/consolelogs";
-$hasNotes = false;
-$aDirectory = dir($rootDir);
-$index = 0;
-$dirindex = 0;
-while ($anEntry = $aDirectory->read()) {
-	if ($anEntry != "." && $anEntry != "..") {
-		if (is_file("$rootDir/$anEntry")) {
-			$entries[$index] = $anEntry;
-			$index++;
-		} else if (is_dir("$rootDir/$anEntry")) {
-			$direntries[$dirindex] = $anEntry;
-			$dirindex++;
-		}
-	}
-}
-$aDirectory->close();
-
-
-sort($entries);
-sort($direntries);
-
-for ($i = 0; $i < $dirindex; $i++) {
-	$anEntry = $direntries[$i];
-	$line = "<td><a href=\"testResults/consolelogs/$anEntry/logIndex.php\">$anEntry</a></td>";
-	echo "<tr>";
-	echo "$line";
-	echo "</tr>";
-}
-for ($i = 0; $i < $index; $i++) {
-	$anEntry = $entries[$i];
-	$logsize = filesize("testResults/consolelogs/$anEntry");
-
-
-	$level = 0;
-	if ($logsize > 20000) {
-		$level = 2;
-	}
-	else if ($logsize > 2000) {
-		$level = 1;
-	}
-
-	if ($level == 0) {
-		$line = "<td><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-	}
-	else if ($level == 1) {
-		$line = "<td><em><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-	} else if ($level == 2) {
-		$line = "<td><strong><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-	}
-
-
-	echo "<tr>";
-	echo "$line";
-	echo "</tr>";
-	$hasNotes = true;
-}
-
-if (!$hasNotes) {
-	echo "<br>There are no test logs for this build.";
-}
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/junit_err.gif b/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/junit_err.gif
deleted file mode 100644
index 1b7ff9d..0000000
--- a/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/junit_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/logIndex.php b/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/logIndex.php
deleted file mode 100644
index 721ca00..0000000
--- a/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/logIndex.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<html>
-<head>
-<?php
-
-function endsWith( $str, $sub ) {
-
-	return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub );
-}
-
-$parts = explode("/", getcwd());
-$parts2 = explode("-", $parts[count($parts) - 1]);
-$buildName = $parts2[1];
-
-echo "<title>Test Console Output for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-<title>Console Logs from Running JUnit Plug-in Tests</title>
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b></p>
-
-<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">Console output from running
-		JUnit plugin tests for <?php echo "$buildName"; ?> </font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$hasNotes = false;
-$aDirectory = dir(".");
-$index = 0;
-while ($anEntry = $aDirectory->read()) {
-	if ($anEntry != "." && $anEntry != ".." && !endsWith(__FILE__, $anEntry)) {
-		$entries[$index] = $anEntry;
-		$index++;
-	}
-}
-aDirectory.closedir();
-
-
-sort($entries);
-
-for ($i = 0; $i < $index; $i++) {
-	$anEntry = $entries[$i];
-	$logsize = filesize("$anEntry");
-
-
-	$level = 0;
-	if ($logsize > 20000) {
-		$level = 2;
-	}
-	else if ($logsize > 2000) {
-		$level = 1;
-	}
-
-	if ($level == 0) {
-		$line = "<td><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-	}
-	else if ($level == 1) {
-		$line = "<td><em><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-	} else if ($level == 2) {
-		$line = "<td><strong><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-	}
-
-
-	echo "<tr>";
-	echo "$line";
-	echo "</tr>";
-	$hasNotes = true;
-}
-
-if (!$hasNotes) {
-	echo "<br>There are no test logs for this build.";
-}
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/miscUtil.php b/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/miscUtil.php
deleted file mode 100644
index 5001f38..0000000
--- a/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/miscUtil.php
+++ /dev/null
@@ -1,219 +0,0 @@
-<?php
-
-// todo: unsure if can handle filenames that are URLs?
-// handy constant to compute file size in megabytes
-
-function fileSizeInMegs($filename) {
-	$onemeg=1024*1024;
-	$zipfilesize=filesize($filename);
-	$zipfilesize=round($zipfilesize/$onemeg, 0);
-	return $zipfilesize;
-}
-
-function fileSizeForDisplay($filename) {
-	$onekilo=1024;
-	$onemeg=$onekilo * $onekilo;
-	$criteria = 10 * $onemeg;
-	$scaleChar = "M";
-	if (file_exists($filename)) {
-		$zipfilesize=filesize($filename);
-		if ($zipfilesize > $criteria) {
-			$zipfilesize=round($zipfilesize/$onemeg, 0);
-			$scaleChar = "M";
-		}
-		else {
-			$zipfilesize=round($zipfilesize/$onekilo, 0);
-			$scaleChar = "K";
-		}
-	}
-	else {
-		$zipfilesize = 0;
-	}
-	$result =  "(" . $zipfilesize . $scaleChar . ")";
-	return $result;
-}
-
-
-function displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription) {
-	echo "<td align=\"right\" valign=\"top\" width=\"30%\">";
-	echo "<a href=\"$downloadprefix$filename\">" . $fileShortDescription . "</a>";
-	echo "</td><td align=\"right\" valign=\"top\" width=\"3%\">";
-	echo $zipfilesize;
-	echo "</td>";
-	echo "<td align=\"right\" valign=\"top\" width=\"2%\">";
-	echo "[<a href=\"checksum/$filename.md5\">md5</a>]";
-	echo "</td>";
-}
-
-function resourceExist($url, $mirrorPrefixuri, $prereqfilename, $eclipseFSpathPrefix)
-{
-	$result = false;
-
-	$allowURLopen = ini_get('allow_url_fopen');
-
-	if ($allowURLopen && stream_last_modified($url)) {
-		$result = true;
-	}
-	else {
-		// TODO: for now, we'll do a raw check on the whole file name, since enable_url_open
-		// is off. better would be to check if we are on build.eclipse.org or download.eclipse.org?
-		$wholePath = trim($eclipseFSpathPrefix) . "/" . trim($mirrorPrefixuri) . "/" . trim($prereqfilename);
-		if (file_exists($wholePath)) {
-			$result = true;
-		}
-	}
-	return $result;
-}
-
-function stream_last_modified($url)
-{
-	if (function_exists('version_compare') && version_compare(phpversion(), '4.3.0') > 0)
-	{
-		if (!($fp = @fopen($url, 'r')))
-		return NULL;
-
-		$meta = stream_get_meta_data($fp);
-		for ($j = 0; isset($meta['wrapper_data'][$j]); $j++)
-		{
-			if (strstr(strtolower($meta['wrapper_data'][$j]), 'last-modified'))
-			{
-				$modtime = substr($meta['wrapper_data'][$j], 15);
-				break;
-			}
-		}
-		fclose($fp);
-	}
-	else
-	{
-		$parts = parse_url($url);
-		$host  = $parts['host'];
-		$path  = $parts['path'];
-
-		if (!($fp = @fsockopen($host, 80)))
-		return NULL;
-
-		$req = "HEAD $path HTTP/1.0\r\nUser-Agent: PHP/".phpversion()."\r\nHost: $host:80\r\nAccept: */*\r\n\r\n";
-		fputs($fp, $req);
-
-		while (!feof($fp))
-		{
-			$str = fgets($fp, 4096);
-			if (strstr(strtolower($str), 'last-modified'))
-			{
-				$modtime = substr($str, 15);
-				break;
-			}
-		}
-		fclose($fp);
-	}
-	return isset($modtime) ? strtotime($modtime) : time();
-}
-
-function isMirrored($uriToCheck) {
-	global $debugScript;
-	global $debugFunctions;
-	$localuri = $uriToCheck;
-
-	$debugMirrorList = false;
-	if ($debugScript) {
-		echo "uriToCheck: " . $localuri . "<br />";
-	}
-
-	$xmlcount = 0;
-
-	/* This method true and accurate method of parsing mirror results
-	 * may be expensive, and would
-	 * likely cause artificially high counts of "downloads".
-	 * Could maybe use if somehow only checked once ever 5 minutes or something.
-
-
-	 // turn off warnings, as sometimes HTML is returned, which causes lots of warnings
-	 $holdLevel = error_reporting(E_ERROR);
-	 $mirrorsxml=simplexml_load_file(rawurlencode($localuri) . urlencode("&format=xml"));
-	 error_reporting($holdLevel);
-
-
-	 if ($mirrorsxml) {
-	 if ($debugFunctions) {
-	 echo "root node: " . $mirrorsxml->getName() . "<br />";
-	 }
-	 if (strcmp($mirrorsxml->getName(), "mirrors") == 0) {
-	 foreach ($mirrorsxml->children() as $mirror) {
-	 if (strcmp($mirror->getName(),"mirror") == 0) {
-	 $xmlcount=$xmlcount+1;
-	 }
-	 if ($debugMirrorList) {
-	 print_r($mirror);
-	 echo "<br />";
-	 }
-	 }
-	 }
-	 if ($debugFunctions) {
-	 echo "Mirror count: " . $xmlcount . "<br />";
-	 }
-	 }
-	 */
-	/*
-	 * Use simple heuristic based on pattern
-	 * in the URI ... if it contains "/downloads/" then assume it's mirrored
-	 */
-	if (strpos($uriToCheck, "webtools/downloads/") > 0) {
-		$xmlcount = 1;
-	}
-	return ($xmlcount > 0);
-
-}
-
-// TODO: replace with Phoenix variables
-function getPlatform () {
-	global $debugScript;
-	global $debugFunctions;
-	// getBrowser is expensive, so cache the data
-	static $browser;
-	$platform = "unknown";
-
-
-	if(ini_get("browscap")) {
-		if(!isset($browser)){
-			$browser = get_browser(null, true);
-		}
-
-		if ($browser) {
-			$rawPlatform = $browser['platform'];
-			if ($debugFunctions) {
-				echo "browser platfrom: " . $rawPlatform . "<br />" ;
-			}
-
-			if ($debugFunctions) {
-				$browserKeys = array_keys($browser);
-				foreach ($browserKeys as $key) {
-					echo $key . ": " . $browser[$key] . "<br />";
-				}
-			}
-		}
-		if (strpos($rawPlatform, "Win") === 0) {
-			$platform="windows";
-		} else if (strpos($rawPlatform, "Linux") === 0) {
-			$platform="linux";
-		} else if (strpos($rawPlatform, "Mac") === 0) {
-			$platform="mac";
-		}
-	}
-	return $platform;
-}
-
-
-function getPrereqReferenceOrName($eclipseMirrorScript, $mirrorPrefixuri, $prerequrl, $prereqfilename, $eclipseFSpathPrefix) {
-	// todo: we really only need "if exists" so could make a bit more efficient
-	// I tried "file_exists" but is didn't seem to work on my test server
-	// For these pre-reqs, we assume if they exist, they are mirrored. This is true
-	// 99% of the time.
-
-	if (resourceExist($prerequrl, $mirrorPrefixuri, $prereqfilename, $eclipseFSpathPrefix)) {
-		$reflink="<a href=\"" . $eclipseMirrorScript . $mirrorPrefixuri . "/" . $prereqfilename . "\">" . $prereqfilename . "</a>";
-	} else {
-		$reflink=$prereqfilename;
-	}
-	return $reflink;
-}
-?>
diff --git a/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/pending.gif b/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/pending.gif
deleted file mode 100644
index 66db2a6..0000000
--- a/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/pending.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/pending1.gif b/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/pending1.gif
deleted file mode 100644
index 1b2ea6e..0000000
--- a/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/pending1.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/report2.php b/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/report2.php
deleted file mode 100644
index cb68e7b..0000000
--- a/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/report2.php
+++ /dev/null
@@ -1,45 +0,0 @@
-
-<?php
-
-function parse_testResults($filename)
-{
-	$junitFailures = 0;
-	if (is_file($filename)) {
-		$handle = @fopen($filename, "r");
-		if ($handle)
-		{
-			$size = filesize($filename);
-			$content = fread($handle, $size);
-			fclose($handle);
-			$junitStart = strpos($content, "Errors &amp; Failures");
-			$junitEnd = strpos($content, "</table>", $junitStart);
-			$junitInfo = substr($content, $junitStart, $junitEnd - $junitStart);
-			$start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">");
-			while ($start !== false)
-			{
-				$start += 29;
-				$stop = strpos($junitInfo, "</font></b></td>", $start);
-				if ($stop !== false)
-				{
-					$result = substr($junitInfo, $start, $stop - $start);
-					if (is_numeric($result))
-					{
-						$junitFailures += $result;
-					}
-					else if (strcmp($result, "DNF") == 0)
-					{
-						$junitFailures++;
-					}
-				}
-				$start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">", $stop);
-			}
-			$results = array($junitFailures);
-			return $results;
-		}
-	}
-}
-
-
-?>
-
-
diff --git a/releng.wtpbuilder/distribution/servadapt.site/templateFiles/compileResults.php.template b/releng.wtpbuilder/distribution/servadapt.site/templateFiles/compileResults.php.template
deleted file mode 100644
index f785771..0000000
--- a/releng.wtpbuilder/distribution/servadapt.site/templateFiles/compileResults.php.template
+++ /dev/null
@@ -1,76 +0,0 @@
-<html>
-<head>
-
-<?php
-        $parts = explode("/", getcwd());
-        $parts2 = explode("-", $parts[count($parts) - 1]);
-        $buildName = $parts2[1];
-
-        echo "<title>Compile Logs: Code Bundles for $buildName</title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2%;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-}
-</style>
-</head>
-<body>
-
-<?php
-        echo "<h1>Compile Logs: Code Bundles for $buildName</h1>";
-?>
-
-
-<table id=tabledata align = "center" width="75%" border="1">
-  <tr>
-    <td class="bold" align="center">Compile Logs</td>
-    <td class="bold" align="center">Compile Errors</td>
-    <td class="bold" align="center">Compiler Warnings</td>
-    <td class="bold" align="center">Access Violations</td>
-    <td class="bold" align="center">Access Warnings</td>
-  </tr>
-
-  %compilelogs%
-
-</table>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/servadapt.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/servadapt.site/templateFiles/index.html.template.php
deleted file mode 100644
index b6a152a..0000000
--- a/releng.wtpbuilder/distribution/servadapt.site/templateFiles/index.html.template.php
+++ /dev/null
@@ -1,850 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<?php
-
-ini_set("display_errors", "true");
-error_reporting (E_ALL);
-
-
-$buildBranch="@buildBranch@";
-$build="@build@";
-$type="@type@";
-$builddate="@date@";
-
-$eclipseMirrorPrefixuri="@eclipse.mirror.prefixuri@";
-$eclipseFSpathPrefix="@eclipse.fspath.prefix@";
-
-$eclipsefilelinux="@eclipsefilelinux@";
-$eclipsefilewindows="@eclipsefilewindows@";
-$eclipsefilemacosx="@eclipsefilemacos@";
-
-$eclipseURL="@eclipseURL@";
-$eclipseFile="@eclipseFile@";
-$eclipseBuildURL="@eclipseBuildURL@";
-$eclipseBuildHome="@eclipseBuildHome@";
-$eclipseName="@eclipseName@";
-$eclipseDescription="@eclipseDescription@";
-
-$eclipseplatformMirrorPrefixuri="@eclipseplatform.mirror.prefixuri@";
-$eclipseplatformFSpathPrefix="@eclipse.fspath.prefix@";
-
-$eclipseplatformfilelinux="@eclipseplatformfilelinux@";
-$eclipseplatformfilewindows="@eclipseplatformfilewindows@";
-$eclipseplatformfilemacosx="@eclipseplatformfilemacos@";
-
-$eclipseplatformURL="@eclipseplatformURL@";
-$eclipseplatformFile="@eclipseplatformFile@";
-$eclipseplatformBuildURL="@eclipseplatformBuildURL@";
-$eclipseplatformBuildHome="@eclipseplatformBuildHome@";
-$eclipseplatformName="@eclipseplatformName@";
-$eclipseplatformDescription="@eclipseplatformDescription@";
-
-$testURL="@testURL@";
-$testFile="@testFile@";
-
-$wstURL="@wstURL@";
-$wstFile="@wstFile@";
-$wstMirrorPrefixuri="@wst.mirror.prefixuri@";
-$wstBuildHome="@wstBuildHome@";
-$wstName="@wstName@";
-$wstDescription="@wstDescription@";
-
-$jstURL="@jstURL@";
-$jstFile="@jstFile@";
-$jstMirrorPrefixuri="@jst.mirror.prefixuri@";
-$jstBuildHome="@jstBuildHome@";
-$jstName="@jstName@";
-$jstDescription="@jstDescription@";
-
-$wtpURL="@wtpURL@";
-$wtpFile="@wtpFile@";
-$wtpMirrorPrefixuri="@wtp.mirror.prefixuri@";
-$wtpBuildHome="@wtpBuildHome@";
-$wtpName="@wtpName@";
-$wtpDescription="@wtpDescription@";
-
-$gefURL="@gefURL@";
-$gefFile="@gefFile@";
-$gefMirrorPrefixuri="@gef.mirror.prefixuri@";
-$gefBuildHome="@gefBuildHome@";
-$gefName="@getName@";
-$gefDescription="@gefDescription@";
-
-$emfURL="@emfURL@";
-$emfFile="@emfFile@";
-$emfMirrorPrefixuri="@emf.mirror.prefixuri@";
-$emfBuildHome="@emfBuildHome@";
-$emfName="@emfName@";
-$emfDescription="@emfDescription@";
-
-$emfsourceURL="@emfsourceURL@";
-$emfsourceFile="@emfsourceFile@";
-$emfsourceMirrorPrefixuri="@emfsource.mirror.prefixuri@";
-$emfsourceBuildHome="@emfsourceBuildHome@";
-$emfsourceName="@emfsourceName@";
-$emfsourceDescription="@emfsourceDescription@";
-
-
-$emfxsdURL="@emfxsdURL@";
-$emfxsdFile="@emfxsdFile@";
-$emfxsdMirrorPrefixuri="@emfxsd.mirror.prefixuri@";
-$emfxsdBuildHome="@emfxsdBuildHome@";
-$emfxsdName="@emfxsdName@";
-$emfxsdDescription="@emfxsdDescription@";
-
-$emfxsdsourceURL="@emfxsdsourceURL@";
-$emfxsdsourceFile="@emfxsdsourceFile@";
-$emfxsdsourceMirrorPrefixuri="@emfxsdsource.mirror.prefixuri@";
-$emfxsdsourceBuildHome="@emfxsdsourceBuildHome@";
-$emfxsdsourceName="@emfxsdsourceName@";
-$emfxsdsourceDescription="@emfxsdsourceDescription@";
-
-
-$emfvalidationURL="@emfvalidationURL@";
-$emfvalidationFile="@emfvalidationFile@";
-$emfvalidationMirrorPrefixuri="@emfvalidation.mirror.prefixuri@";
-$emfvalidationBuildHome="@emfvalidationBuildHome@";
-$emfvalidationName="@emfvalidationName@";
-$emfvalidationDescription="@emfvalidationDescription@";
-
-$emfvalidationsourceURL="@emfvalidationsourceURL@";
-$emfvalidationsourceFile="@emfvalidationsourceFile@";
-$emfvalidationsourceMirrorPrefixuri="@emfvalidationsource.mirror.prefixuri@";
-$emfvalidationsourceBuildHome="@emfvalidationsourceBuildHome@";
-$emfvalidationsourceName="@emfvalidationsourceName@";
-$emfvalidationsourceDescription="@emfvalidationsourceDescription@";
-
-
-$dtpURL="@dtpURL@";
-$dtpFile="@dtpFile@";
-$dtpMirrorPrefixuri="@dtp.mirror.prefixuri@";
-$dtpBuildHome="@dtpBuildHome@";
-$dtpName="@dtpName@";
-$dtpDescription="@dtpDescription@";
-
-
-$eclipserelengFile="@eclipserelengFile@";
-$eclipserelengURL="@eclipserelengURL@";
-$orbitthirdpartyzipFile="@orbitthirdpartyzipFile@";
-$orbitthirdpartyzipURL="@orbitthirdpartyzipURL@";
-$orbitthirdpartyzipBuildHome="@orbitthirdpartyzipBuildHome@";
-$orbitthirdpartyzipMirrorPrefixuri="@orbitthirdpartyzip.mirror.prefixuri@";
-
-
-$prereq_eclipse="false";
-$prereq_eclipseplatform="false";
-$prereq_emf="false";
-$prereq_emfxsd="false";
-$prereq_emfvalidation="false";
-$prereq_gef="false";
-$prereq_dtp="false";
-$prereq_wst="false";
-$prereq_jst="false";
-$prereq_wtp="false";
-
-
-include("miscUtil.php");
-
-
-
-
-$debugScript = false;
-$debugFunctions = false;
-
-$defaultMirrorScript="";
-$defaultWTPMirrorPrefix="./";
-
-$eclipseMirrorScript="http://www.eclipse.org/downloads/download.php?file=";
-
-// TODO: improve so this hard coding isn't required.
-// This depends on the declare script changing webtools/committers to webtools/downloads
-// And, the logic is such that if it is not mirrored, this URI is not used at all, just
-// a relative reference only
-$eclipseWTPMirrorPrefix="/webtools/committers/drops/$buildBranch/$build/";
-
-
-$mirrorScript=$defaultMirrorScript;
-$downloadprefix=$defaultWTPMirrorPrefix;
-
-
-$keytestMirrorString=$eclipseMirrorScript . "$eclipseWTPMirrorPrefix/wtp-server-adapters-sdk-$build.zip";
-if (isMirrored($keytestMirrorString) ) {
-	$mirrorScript=$eclipseMirrorScript;
-	$downloadprefix="${mirrorScript}${eclipseWTPMirrorPrefix}";
-}
-
-if ($debugScript)  {
-	echo "inferred platform: " . getPlatform();
-}
-
-
-// our summary results handling requires php 5 (for simple xml file loading)
-// so, if not php 5, just don't display any summary results
-// This was found to be required, since some mirror our whole site (e.g. IBM)
-// and not all mirrors use PHP 5
-$displayTestSummary=false;
-if (phpversion() >= 5) {
-
-	$code_totalBundles=0;
-	$code_totalErrors=0;
-	$code_totalWarnings=0;
-	$code_totalforbiddenAccessWarningCount=0;
-	$code_totaldiscouragedAccessWarningCount=0;
-
-	$test_totalBundles=0;
-	$test_totalErrors=0;
-	$test_totalWarnings=0;
-	$test_totalforbiddenAccessWarningCount=0;
-	$test_totaldiscouragedAccessWarningCount=0;
-
-
-	$displayTestSummary=true;
-	// expecting grandTotalErrors and grandTotalTests
-	$filename = "unitTestsSummary.xml";
-	if (file_exists($filename)) {
-		$prefix = "unitTests_";
-		$unitTestsSummary = simplexml_load_file($filename);
-		foreach ($unitTestsSummary->summaryItem as $summaryItem) {
-			$name = $summaryItem->name;
-			$value = $summaryItem->value;
-			$code= "\$" . $prefix . $name . " = " . $value . ";";
-			//echo "<br />code: " . $code;
-			eval($code);
-		}
-	}
-
-	$filename = "compilelogsSummary.xml";
-	if (file_exists($filename)) {
-		$prefix = "code_";
-		$compileSummary = simplexml_load_file($filename);
-		foreach ($compileSummary->summaryItem as $summaryItem) {
-			$name = $summaryItem->name;
-			$value = $summaryItem->value;
-			$code= "\$" . $prefix . $name . " = " . $value . ";";
-			//echo "<br />code: " . $code;
-			eval($code);
-		}
-	}
-
-	$filename = "testcompilelogsSummary.xml";
-	if (file_exists($filename)) {
-		$prefix = "test_";
-		$compileSummary = simplexml_load_file($filename);
-		foreach ($compileSummary->summaryItem as $summaryItem) {
-			$name = $summaryItem->name;
-			$value = $summaryItem->value;
-			$code= "\$" . $prefix . $name . " = " . $value . ";";
-			//echo "<br />code: " . $code;
-			eval($code);
-		}
-	}
-}
-
-$incubating="false";
-
-
-
-if ($incubating) {
-	echo '<title>WTP Incubator Downloads</title>';
-}
-else {
-	echo '<title>WTP Downloads</title>';
-}
-
-
-?>
-
-
-</head>
-
-<body>
-
-
-<?php
-
-// tiny banner to remind when looking at "local" machine results
-$serverName = $_SERVER["SERVER_NAME"];
-
-if (!stristr($serverName, "eclipse.org") && !stristr($serverName,"you.are.at.eclipsecon.org")) {
-	echo '<center>
-          <p>
-          Reminder: this is <font color="#FF0000">' .
-	$serverName .
-        '</font>
-          See also
-          <a href="http://download.eclipse.org/webtools/downloads" target="_top">the live public Eclipse site</a>.
-          </p>
-          <hr />
-          </center>';
-
-}
-?>
-
-<?php if ("true" === $incubating) {
-	echo "<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH=\"100%\">";
-	echo "	<tr>";
-	echo "		<td ALIGN=left><font face=\"'Bitstream Vera',Helvetica,Arial\" size=\"+2\"><b><?php echo \"$type\";?>";
-	echo "        Build: $build</b></font></td>";
-	echo "		<td align=\"right\" rowspan=\"3\"><a";
-	echo "			href=\"http://www.eclipse.org/projects/what-is-incubation.php\"><img";
-	echo "			src=\"http://www.eclipse.org/images/egg-incubation.png\"";
-	echo "			alt=\"Incubation\" align=\"middle\" border=\"0\"></a></td>";
-
-
-	echo "	<tr valign=\"top\">";
-	echo "		<td><font size=\"-1\">" . $builddate . "</font></td>";
-	echo "	</tr>";
-	echo "	<tr valign=\"top\">";
-	echo "		<td>";
-	echo "		<p>The Eclipse Web Tools Platform (WTP) Incubator Project provides";
-	echo "		tools for development that are just getting started, or are";
-	echo "		experimental in some fashion.</p>";
-	echo "		</td>";
-	echo "	</tr>";
-	echo "</table>";
-
-} else {
-
-	echo "<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH=\"100%\">";
-	echo "	<tr>";
-	echo "		<td ALIGN=left><font face=\"'Bitstream Vera',Helvetica,Arial\" size=\"+2\"><b>$type";
-	echo "		Build: " . $build . "</b></font></td>";
-
-	echo "	<tr valign=\"top\">";
-	echo "		<td><font size=\"-1\">" . $builddate . "</font></td>";
-	echo "	</tr>";
-	echo "	<tr valign=\"top\">";
-	echo "		<td>";
-	echo "		<p>Component build from the Eclipse Web Tools Platform (WTP) Project.</p>";
-	echo "		</td>";
-	echo "	</tr>";
-	echo "</table>";
-
-} ?>
-
-<!-- ***********  Prerequisites **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-	<tr>
-		<td align="left" valign="top" bgcolor="#0080C0"><font
-			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Prerequisites
-		and Handy Extras</font></td>
-	</tr>
-	<tr>
-		<td>
-		<p>These are the prerequisites to build or run these packages. All are
-		not necessarily required, but instead some subset. Also listed are
-		some frequently needed links for committer-required packages when
-		creating new development environments, or targets to run against.</p>
-		<p>Note that WTP requires Java 5 or higher (and, for some things,
-		actually requires a JDK rather than only a JRE) even though many other
-		<a href="http://www.eclipse.org/downloads/">Eclipse Projects</a> can
-		run with <a href="http://www.eclipse.org/downloads/moreinfo/jre.php">other
-		JRE levels</a>.</p>
-		<p></p>
-		</td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=1 cellpadding=1 width="90%" align="center">
-
-		<?php
-		if ("true" === $prereq_eclipseplatform) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td width=\"40%\">Eclipse Platform</td>";
-
-
-			//customize page depending on user's browser/platform, if we can detect it
-			$usersPlatform = getPlatform();
-			// assume windows by default, since likely most frequent, even for cases where
-			// platform is "unknown". I've noticed Opera reports 'unknown' :(
-			$recommendedFile=$eclipseplatformfilewindows;
-			if (strcmp($usersPlatform,"linux")== 0) {
-				$recommendedFile=$eclipseplatformfilelinux;
-			} else if (strcmp($usersPlatform,"mac") == 0) {
-				$recommendedFile=$eclipseplatformfilemacosx;
-			}
-
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $eclipseplatformBuildURL . "\">appropriate platform</a>";
-			echo " or <a href=\"" . $eclipseplatformBuildHome . "\">equivalent</a></td>";
-
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_eclipse) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td width=\"40%\">Eclipse SDK (Platform, JDT)</td>";
-
-
-			//customize page depending on user's browser/platform, if we can detect it
-			$usersPlatform = getPlatform();
-			// assume windows by default, since likely most frequent, even for cases where
-			// platform is "unknown". I've noticed Opera reports 'unknown' :(
-			$recommendedFile=$eclipsefilewindows;
-			if (strcmp($usersPlatform,"linux")== 0) {
-				$recommendedFile=$eclipsefilelinux;
-			} else if (strcmp($usersPlatform,"mac") == 0) {
-				$recommendedFile=$eclipsefilemacosx;
-			}
-
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $eclipseBuildURL . "\">appropriate platform</a>";
-			echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_emf) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $emfName . "&nbsp;" . $emfDescription ;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $emfMirrorPrefixuri, $emfURL, $emfFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $emfBuildHome . "\">equivalent</a></td>";
-			echo " </tr>";
-		}
-		?>
-
-
-		<?php
-		if ("true" === $prereq_emfxsd) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $emfxsdName . "&nbsp;" . $emfxsdDescription ;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdMirrorPrefixuri, $emfxsdURL, $emfxsdFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $emfxsdBuildHome . "\">equivalent</a></td>";
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_emfvalidation) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $emfvalidationName  . "&nbsp;" . $emfvalidationDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $emfvalidationMirrorPrefixuri, $emfvalidationURL, $emfvalidationFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $emfvalidationBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_gef) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $gefName  . "&nbsp;" . $gefDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $gefMirrorPrefixuri, $gefURL, $gefFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $gefBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_dtp) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $dtpName . "&nbsp;" . $dtpDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $dtpMirrorPrefixuri, $dtpURL, $dtpFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $dtpBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_wst) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $wstName . "&nbsp;" . $wstDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $wstMirrorPrefixuri, $wstURL, $wstFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $wstBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_jst) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $jstName . "&nbsp;" . $jstDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $jstMirrorPrefixuri, $jstURL, $jstFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $jstBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-		<?php
-		if ("true" === $prereq_wtp) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $wtpName . "&nbsp;" . $wtpDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $wtpMirrorPrefixuri, $wtpURL, $wtpFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $wtpBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-			<tr valign="middle">
-				<td width="10%"></td>
-				<td colspan="2">
-				<hr />
-				</td>
-			</tr>
-
-
-
-			<?php
-			if ("true" === $prereq_emf) {
-				echo "<tr valign=\"top\">";
-				echo "<td width=\"10%\"></td>";
-				echo "<td>";
-				echo $emfsourceName . "&nbsp;" . $emfsourceDescription;
-				echo "</td> ";
-				echo "<td align=\"right\">";
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfsourceMirrorPrefixuri, $emfsourceURL, $emfsourceFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $emfsourceBuildHome . "\">equivalent</a></td>";
-				echo "</tr>";
-			}
-			?>
-			<?php
-			if ("true" === $prereq_emfxsd) {
-				echo "<tr valign=\"top\">";
-				echo "<td width=\"10%\"></td>";
-				echo "<td>";
-				echo $emfxsdsourceName . "&nbsp;" . $emfxsdsourceDescription;
-				echo "</td> ";
-				echo "<td align=\"right\">";
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdsourceMirrorPrefixuri, $emfxsdsourceURL, $emfxsdsourceFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $emfxsdsourceBuildHome . "\">equivalent</a></td>";
-				echo "</tr>";
-			}
-			?>
-
-			<?php
-			if ("true" === $prereq_emfvalidation) {
-				echo "<tr valign=\"top\">";
-				echo "<td width=\"10%\"></td>";
-				echo "<td>";
-				echo $emfvalidationsourceName . "&nbsp;" . $emfvalidationsourceDescription;
-				echo "</td> ";
-				echo "<td align=\"right\">";
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfvalidationsourceMirrorPrefixuri, $emfvalidationsourceURL, $emfvalidationsourceFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $emfvalidationsourceBuildHome . "\">equivalent</a></td>";
-				echo "</tr>";
-			}
-			?>
-
-			<?php
-			if (true) {
-				echo "<tr valign=\"top\">";
-				echo "<td width=\"10%\"></td>";
-				echo "<td>";
-				echo "Eclipse Test Framework (required only for Automated JUnit tests)";
-				echo "</td> ";
-				echo "<td align=\"right\">";
-
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $testURL, $testFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-				echo "</tr>";
-			}
-			?>
-
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>Eclipse releng tool (required only for committers to more easily
-				"release" code to a build)</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipserelengURL, $eclipserelengFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>Third Party code from Orbit. Not required and is currently much
-				more than needed for WTP, but some committers like using to create a
-				PDE target.</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $orbitthirdpartyzipMirrorPrefixuri, $orbitthirdpartyzipURL, $orbitthirdpartyzipFile,$eclipseFSpathPrefix);
-				echo " or <a href=\"" . $orbitthirdpartyzipBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-		</table>
-		</td>
-	</tr>
-</table>
-
-<!-- ***********  WTP **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-	<tr>
-		<td align=left valign=top colspan="5" bgcolor="#0080C0"><font
-			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF"> Web Tools
-		Platform</font></td>
-	</tr>
-
-	<tr>
-		<td align="left" valign="top" colspan="5">
-		<p>The Zip files includes the features and plugins for some Server Adapters. </p>
-		</td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
-
-
-			<tr>
-				<td align="left" valign="top" width="10%"><b>Minimal</b></td>
-				<td align="left" valign="top">
-				<p>Executable code only.</p>
-				</td>
-				<?php
-				$zipfilename="wtp-server-adapters-${build}";
-				$filename=$zipfilename.".zip";
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription="servadapt";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-				?>
-			</tr>
-
-			<tr>
-				<td align="left" valign="top" width="10%"><b>SDK</b></td>
-				<td align="left" valign="top">
-				<p>Executable code and source code.</p>
-				</td>
-				<?php
-				$zipfilename="wtp-server-adapters-sdk-${build}";
-				$filename=$zipfilename.".zip";
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription="servadapt sdk";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-				?>
-			</tr>
-			<tr>
-				<td align="left" valign="top" width="10%"><b>Tests</b></td>
-				<td align="left" valign="top">
-				<p>Unit tests.</p>
-				</td>
-				<?php
-				$zipfilename="wtp-server-adapters-tests-${build}";
-				$filename=$zipfilename.".zip";
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription="servadapt tests";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-				?>
-			</tr>
-		</table>
-		</td>
-	
-	
-	<tr>
-
-</table>
-
-
-
-
-
-
-
-<!-- ***********  Build Status **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-	<tr>
-		<td align=left valign=top bgcolor="#0080C0"><font
-			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Status, tests
-		and other interesting details</font></td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
-
-			<tr>
-				<td><!-- 
-				Its silly to always display 'Build notes', but hard to 
-				compute if required or not. 
-				<a href="buildNotes.php">Build notes</a> <br /> 
-				--> <a href="directory.txt">map files</a> <br />
-				<?php
-
-				if ($displayTestSummary) {
-
-
-					if (isset($unitTests_grandTotalErrors)) {
-						$errorColor="green";
-						if ($unitTests_grandTotalErrors > 0) {
-							$errorColor="red";
-						}
-						echo "<a href=\"testResults.php\">Unit test results</a>&nbsp;";
-						echo "<img src=\"junit_err.gif\"/><font color=\"" . $errorColor . "\">" . $unitTests_grandTotalErrors . "</font>&nbsp;&nbsp;Total: " . $unitTests_grandTotalTests;
-					}
-					else {
-						// we hardly ever "pend" anymore ... abscense usually signifies no tests or a build error.
-						echo "<br /><font color=\"orange\">Unit tests don't exists, are pending, or there's a build error.</font>";
-						//&nbsp;&nbsp;<img src=\"pending.gif\"/>";
-					}
-
-					echo "<br />";
-					echo "<a href=\"compileResults.php\">Compile logs: Code Bundles</a>";
-
-					echo "&nbsp;&nbsp;($code_totalBundles)&nbsp;&nbsp;";
-					echo "<img src=\"compile_err.gif\"/><font color=red>$code_totalErrors</font>&nbsp;";
-					echo "<img src=\"compile_warn.gif\"/><font color=orange>$code_totalWarnings</font>&nbsp;";
-					echo "<img src=\"access_err.gif\"/><font color=red>$code_totalforbiddenAccessWarningCount</font>&nbsp;";
-					echo "<img src=\"access_warn.gif\"/><font color=orange>$code_totaldiscouragedAccessWarningCount</font>&nbsp;";
-
-					echo "<br />";
-					echo "<a href=\"testCompileResults.php\">Compile logs: Test Bundles</a>";
-
-					echo "&nbsp;&nbsp;($test_totalBundles)&nbsp;&nbsp;";
-					echo "<img src=\"compile_err.gif\"/><font color=red>$test_totalErrors</font>&nbsp;";
-					echo "<img src=\"compile_warn.gif\"/><font color=orange>$test_totalWarnings</font>&nbsp;";
-					echo "<img src=\"access_err.gif\"/><font color=red>$test_totalforbiddenAccessWarningCount</font>&nbsp;";
-					echo "<img src=\"access_warn.gif\"/><font color=orange>$test_totaldiscouragedAccessWarningCount</font>&nbsp;";
-				}
-
-				?> <br />
-
-				<?php
-				if (file_exists("versioningReportName.php")) {
-					include "versioningReportName.php";
-					$fname="${versionReportFilename}.html";
-					if (file_exists($fname)) {
-						echo "<br /> <a href='$fname'>Versioning Information</a>";
-					}
-}
-?> <?php
-echo "<br />";
-if (file_exists("./apiresults/api-progress.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-progress.html\">API Progress Report</a>";
-}
-if (file_exists("./apiresults/api-info-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-info-summary.html\">APIs Defined by Each Component</a>";
-}
-if (file_exists("./apiresults/api-ref-compatibility.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-ref-compatibility.html\">Adopter Breakage Report</a>";
-}
-if (file_exists("./apiresults/api-violation-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-violation-summary.html\">API Violations</a>";
-}
-if (file_exists("./apiresults/component-api-violation-all.html"))
-{
-	echo "<br /> <a href=\"apiresults/component-api-violation-all.html\">Non-API dependencies</a>";
-}
-if (file_exists("./apiresults/api-tc-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-tc-summary.html\">API Test Coverage</a>";
-}
-if (file_exists("./apiresults/api-javadoc-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-javadoc-summary.html\">API Javadoc Coverage</a>";
-}
-if (file_exists("./apiresults/api-tc-summary.html"))
-{
-	echo "<br /><br /> <a href=\"apiresults/full_test_coverage/api-tc-summary.html\">Test Coverage for All Classes and Methods</a>";
-}
-?> <?php
-if (file_exists("./perfresults/graph/performance.php"))
-{
-	echo "<br />";
-	echo "<br /> <a href=\"perfresults/graph/performance.php\">Performance Results</a>";
-	echo "<br />";
-}
-?></td>
-			</tr>
-
-
-		</table>
-		</td>
-	</tr>
-</table>
-
-
-
-<!-- footer -->
-<center>
-<hr>
-<p>All downloads are provided under the terms and conditions of the <a
-	href="http://www.eclipse.org/legal/notice.html">Eclipse.org Software
-User Agreement</a> unless otherwise specified.</p>
-
-<p>If you have problems downloading the drops, contact the <font
-	face="'Bitstream Vera',Helvetica,Arial" size="-1"><a
-	href="mailto:webmaster@eclipse.org">webmaster</a></font>.</p>
-
-</center>
-<!-- end footer -->
-
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/servadapt.site/templateFiles/siteEnablingFeatures.xml b/releng.wtpbuilder/distribution/servadapt.site/templateFiles/siteEnablingFeatures.xml
deleted file mode 100644
index cc3ed81..0000000
--- a/releng.wtpbuilder/distribution/servadapt.site/templateFiles/siteEnablingFeatures.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-    <description> The update site contains the enabling features. </description>
-    <category-def
-        name="Enabling Features"
-        label="Enabling Features">
-        <description> This category contains features used by several
-            projects that enable some functionality, but which by
-            themselves are not very interesting. </description>
-    </category-def>
-</site>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/servadapt.site/templateFiles/siteWTP.xml b/releng.wtpbuilder/distribution/servadapt.site/templateFiles/siteWTP.xml
deleted file mode 100644
index f94e83f..0000000
--- a/releng.wtpbuilder/distribution/servadapt.site/templateFiles/siteWTP.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site
-    pack200="true"
-    mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/webtools/testUpdates/site.xml&amp;format=xml"
-    digestURL="http://download.eclipse.org/webtools/testUpdates/">
-    <description
-        url="http://download.eclipse.org/webtools/declaredUpdates/index.html"> The update site contains the features of the of Eclipse Web
-        Tools Project (WTP) </description>
-    <feature
-        url="features/org.eclipse.wst_@org.eclipse.wst@.jar"
-        id="org.eclipse.wst"
-        version="@org.eclipse.wst@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.wst.sdk_@org.eclipse.wst.sdk@.jar"
-        id="org.eclipse.wst.sdk"
-        version="@org.eclipse.wst.sdk@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jst_@org.eclipse.jst@.jar"
-        id="org.eclipse.jst"
-        version="@org.eclipse.jst@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jst.sdk_@org.eclipse.jst.sdk@.jar"
-        id="org.eclipse.jst.sdk"
-        version="@org.eclipse.jst.sdk@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jpt.feature_@org.eclipse.jpt.feature@.jar"
-        id="org.eclipse.jpt.feature"
-        version="@org.eclipse.jpt.feature@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jpt_sdk.feature_@org.eclipse.jpt_sdk.feature@.jar"
-        id="org.eclipse.jpt_sdk.feature"
-        version="@org.eclipse.jpt_sdk.feature@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <category-def
-        name="Web Tools Platform (WTP)"
-        label="Web Tools Platform (WTP)">
-        <description> This category contains the features of the Eclipse
-            Web Tools Project (WTP). </description>
-    </category-def>
-</site>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/servadapt.site/templateFiles/testCompileResults.php.template b/releng.wtpbuilder/distribution/servadapt.site/templateFiles/testCompileResults.php.template
deleted file mode 100644
index 42d6f65..0000000
--- a/releng.wtpbuilder/distribution/servadapt.site/templateFiles/testCompileResults.php.template
+++ /dev/null
@@ -1,76 +0,0 @@
-<html>
-<head>
-
-<?php
-        $parts = explode("/", getcwd());
-        $parts2 = explode("-", $parts[count($parts) - 1]);
-        $buildName = $parts2[1];
-
-        echo "<title>Compile Logs: Test Bundles for $buildName</title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2em;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:Bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-}
-</style>
-</head>
-<body>
-
-<?php
-        echo "<h1>Compile Logs: Test Bundles for $buildName</h1>";
-?>
-
-
-<table id=tabledata align = "center" width="75%" border="1">
-  <tr>
-    <td class="bold" align="center">Compile Logs</td>
-    <td class="bold" align="center">Compile Errors</td>
-    <td class="bold" align="center">Compiler Warnings</td>
-    <td class="bold" align="center">Access Violations</td>
-    <td class="bold" align="center">Access Warnings</td>
-  </tr>
-
-  %compilelogs%
-
-</table>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/servadapt.site/templateFiles/testResults.php.template b/releng.wtpbuilder/distribution/servadapt.site/templateFiles/testResults.php.template
deleted file mode 100644
index ddad0b7..0000000
--- a/releng.wtpbuilder/distribution/servadapt.site/templateFiles/testResults.php.template
+++ /dev/null
@@ -1,119 +0,0 @@
-<html>
-<head>
-
-<?php
-	$parts = explode("/", getcwd());
-	$parts2 = explode("-", $parts[count($parts) - 1]);
-	$buildName = $parts2[1];
-	
-	echo "<title>Test Results for $buildName </title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2em;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:Bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-
-}
-</style>
-
-
-</head>
-<body>
-<p><b><font face="Verdana" size="+3">Test Results</font></b> </p>
-
-<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">
-    Unit Test Results for <?php echo "$buildName"; ?> on Various Platforms and JRE</font></b></td>
-  </tr>
-</table>
-
-<?php
-if (file_exists("testResults"))
-{
-$dir = dir("testResults");
-while ($anEntry = $dir->read())
-{
-  if ($anEntry != "." && $anEntry != ".." && $anEntry != "consolelogs" && $anEntry != "html" && $anEntry != "xml")
-  {
-    $link = "testResults/".$anEntry."/results/index.php";
-    echo "<p><a href=\"$link\">$anEntry</a></p>";
-  }
-}
-}
-?>
-
-<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">Unit 
-      Test Results for <?php echo "$buildName"; ?> </font></b></td>
-  </tr>
-</table>
-
-<table id=tableunittestdata align = "center" width="75%" border="1">
-  <tr> 
-    <td class="bold" align="center" width="70%">Test Suite</td>
-    <td class="bold" align="center" width="10%">Errors &amp; Failures</td>
-    <td class="bold" align="center" width="10%">Total Tests</td>
-    <td class="bold" align="center" width="10%">Total Time (s)</td>
-  </tr>
-  
-  
-  %testresults%
-  
-</table>
-<p></p>
-<br>
-<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"> 
-      Console output logs 
-      <?php echo "$buildName"; ?>
-      </font></b></td>
-  </tr>
-</table>
-<br>
-These <a href="consoleLogs.php">logs</a> contain the console output captured while 
-running the JUnit automated tests. <br>
-<br>
-
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/servadapt.site/transformReportToHTML.xml b/releng.wtpbuilder/distribution/servadapt.site/transformReportToHTML.xml
deleted file mode 100644
index b72f6cd..0000000
--- a/releng.wtpbuilder/distribution/servadapt.site/transformReportToHTML.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-    name="xsl-conversion"
-    default="main"
-    basedir=".">
-    <target
-        name="main"
-        description="example.@dot.xml to produce example.@dot.html">
-        <xslt
-            destdir="${resultDir}/compilelogs"
-            scanincludeddirectories="true"
-            style="compilerXMLOutputToHTML.xsl"
-            force="true">
-            <fileset
-                dir="${resultDir}/compilelogs"
-                includes="**/*.xml"/>
-        </xslt>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/servadapt.tests/build.xml b/releng.wtpbuilder/distribution/servadapt.tests/build.xml
deleted file mode 100644
index a4cc7f6..0000000
--- a/releng.wtpbuilder/distribution/servadapt.tests/build.xml
+++ /dev/null
@@ -1,330 +0,0 @@
-<project
-    name="Build specific targets and properties"
-    default="runTest">
-    <!--
-        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"/>
-    <fail
-        message="testRoot must be set for this task"
-        unless="testRoot"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-
-
-    <!-- 
-        typcially already set, but in case of standalone tests, may not
-        be
-    -->
-    <property
-        name="buildLabel"
-        value="${buildType}-${buildId}-${timestamp}"/>
-
-
-    <!-- 
-	   Steps to do after the build is done. 
-	 -->
-    <target
-        name="test">
-        <dirname
-            file="${ant.file}"
-            property="currentDirectory"/>
-        <ant
-            antfile="${ant.file}"
-            target="runTest"
-            dir="${currentDirectory}"/>
-    </target>
-
-    <!-- 
-	  Steps to do to test the build results
-   -->
-    <target
-        name="runTest">
-        <dirname
-            file="${ant.file}"
-            property="test.component.dir"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-        <property
-            file="${buildDirectory}/label.properties"/>
-        <property
-            file="${wtp.builder.home}/build.properties"/>
-        <fail
-            message="testRoot must be set for this task"
-            unless="testRoot"/>
-        <mkdir
-            dir="${testRoot}"/>
-
-        <!-- if results already exist, delete them -->
-        <delete
-            dir="${testRoot}/results"
-            failOnError="false"/>
-        <mkdir
-            dir="${testRoot}/results"/>
-        <mkdir
-            dir="${testRoot}/results/consolelogs"/>
-        <copy
-            todir="${testRoot}"
-            overwrite="true">
-            <fileset
-                dir="${test.component.dir}/testScripts"/>
-        </copy>
-        <echo
-            message="BASEOS: ${env.BASEOS}   BASEWS: ${env.BASEWS}   BASEARCH: ${env.BASEARCH} "/>
-        <ant
-            antfile="${test.component.dir}/testdependency.xml"
-            target="get">
-            <property
-                name="dependency.properties"
-                value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-            <property
-                name="base.install.dir"
-                value="${testRoot}"/>
-        </ant>
-        <antcall
-            target="unzipTests"/>
-        <antcall
-            target="runTestEclipse">
-            <param
-                name="testTarget"
-                value="all"/>
-        </antcall>
-        <antcall
-            target="postRunTestEclipse">
-            <param
-                name="testTarget"
-                value="all"/>
-        </antcall>
-    </target>
-    <target
-        name="unzipTests">
-        <!--
-            unzip the builds and junit tests we use 'unzip' here, so we
-            can continue on error, if desired. (such as if zip was not
-            created, due to other failures or options).
-        -->
-        <echo
-            message="installing sdk"/>
-        <exec
-            dir="${buildDirectory}/${buildLabel}"
-            executable="unzip"
-            failonerror="true">
-            <arg
-                line="-o -qq  wtp-server-adapters-sdk-${buildLabel}.zip -d ${testRoot}${dropinsFolder}"/>
-        </exec>
-        <echo
-            message="installing tests"/>
-        <exec
-            dir="${buildDirectory}/${buildLabel}"
-            executable="unzip"
-            failonerror="false">
-            <arg
-                line="-o -qq wtp-server-adapters-tests-${buildLabel}.zip -d ${testRoot}${dropinsFolder}"/>
-        </exec>
-    </target>
-    <!--
-        time out may need to be set/adjust for api or performance tests?
-        This testTimeLimit is the whole, overall limit on tests. There's
-        a shorter one for individual suites. some common values, of
-        milliseconds to more recognizable units: 7200000: 2 hours
-        3600000: 1 hour 1800000: 30 minutes 600000: 10 minutes
-    -->
-    <property
-        name="testTimeLimit"
-        value="7200000"/>
-    <property
-        name="testFailOnError"
-        value="false"/>
-    <target
-        name="runTestEclipse"
-        description="Run our JUnit's within an instance of antRunner">
-        <property
-            name="test-vm"
-            value="${env.JAVA_6_HOME}/bin/java"/>
-
-        <property
-            name="vmargs"
-            value="-Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm}  -Dperf.buildId=${buildType}${date}-${time}"/>
-        <!--
-            set path to eclipse folder. If local folder, use '.';
-            otherwise, use c:\path\to\eclipse or /path/to/eclipse/
-        -->
-        <property
-            name="eclipse.home"
-            value="${testRoot}"/>
-        <echo
-            message="Running junits"/>
-        <!--
-            Remember: using -debug for org.eclipse.ant.core.antRunner
-            produces ant debug info to be output ... which is a TON of
-            stuff
-        -->
-        <echo
-            message="eclipse.launcher: ${eclipse.launcher}"/>
-        <java
-            taskname="unit-test-masterprocess"
-            fork="true"
-            resultProperty="wtpmasterjunitresult"
-            failonerror="false"
-            timeout="${testTimeLimit}"
-            dir="${testRoot}/eclipse"
-            jvm="${env.JAVA_6_HOME}/bin/java"
-            classname="org.eclipse.equinox.launcher.Main">
-            <classpath>
-                <fileset
-                    dir="${testRoot}/eclipse/plugins">
-                    <include
-                        name="org.eclipse.equinox.launcher_*.jar"/>
-                </fileset>
-            </classpath>
-            <jvmarg
-                value="-Xmx512m"/>
-            <jvmarg
-                value="-Dosgi.ws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dosgi.os=${env.BASEOS}"/>
-            <jvmarg
-                value="-Dosgi.arch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-Dws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dos=${env.BASEOS}"/>
-            <jvmarg
-                value="-Darch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-Dnoclean=true"/>
-            <jvmarg
-                value="-DbuildBranch=${buildBranch}"/>
-            <jvmarg
-                value="-DbuildType=${buildType}"/>
-            <jvmarg
-                value="-DbuildId=${buildId}"/>
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <jvmarg
-                value="-Dprojectname=${projectname}"/>
-            <arg
-                value="-nosplash"/>
-            <arg
-                value="-consolelog"/>
-            <arg
-                value="-data"/>
-            <arg
-                value="${testRoot}/overallTestWorkspace"/>
-            <arg
-                value="-application"/>
-            <arg
-                value="org.eclipse.ant.core.antRunner"/>
-            <arg
-                value="-file"/>
-            <arg
-                value="${testRoot}/test.xml"/>
-            <arg
-                value="-logger"/>
-            <arg
-                value="org.apache.tools.ant.DefaultLogger"/>
-            <env
-                key="DISPLAY"
-                value="${env.DISPLAY}"/>
-            <redirector
-                output="${testRoot}/results/fullOutput.txt"
-                error="${testRoot}/results/fullErrorLog.txt"/>
-            <sysproperty
-                key="build.home"
-                value="${env.BUILD_HOME}"/>
-            <sysproperty
-                key="buildDirectory"
-                value="${buildDirectory}"/>
-            <sysproperty
-                key="buildLabel"
-                value="${buildLabel}"/>
-            <sysproperty
-                key="baseLocation"
-                value="${baseLocation}"/>
-            <sysproperty
-                key="testRoot"
-                value="${testRoot}"/>
-            <sysproperty
-                key="testDir"
-                value="${testRoot}"/>
-            <sysproperty
-                key="perf.buildId"
-                value="${buildType}${date}-${time}"/>
-            <sysproperty
-                key="eclipseBuilderDirectory"
-                value="${pde.builder.path}"/>
-            <sysproperty
-                key="buildLabel"
-                value="${buildLabel}"/>
-        </java>
-        <echo
-            message="wtpmasterjunitresult ${wtpmasterjunitresult}"/>
-    </target>
-    <target
-        name="postRunTestEclipse">
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/consolelogs/testLogs"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results">
-                <include
-                    name="*output.txt"/>
-            </fileset>
-        </copy>
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/consolelogs/testSysErrorLogs"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results">
-                <include
-                    name="*error.txt"/>
-            </fileset>
-        </copy>
-        <copy
-            file="${testRoot}/results/fullOutput.txt"
-            toDir="${buildDirectory}/${buildLabel}/testResults/consolelogs/full"
-            overwrite="true"
-            failonerror="false">
-        </copy>
-        <copy
-            file="${testRoot}/results/fullErrorLog.txt"
-            toDir="${buildDirectory}/${buildLabel}/testResults/consolelogs/full"
-            overwrite="true"
-            failonerror="false">
-        </copy>
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/xml"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results/xml">
-                <include
-                    name="*.xml"/>
-            </fileset>
-        </copy>
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/html"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results/html">
-                <include
-                    name="*.html"/>
-            </fileset>
-        </copy>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/servadapt.tests/templateFiles/index.php b/releng.wtpbuilder/distribution/servadapt.tests/templateFiles/index.php
deleted file mode 100644
index a42c883..0000000
--- a/releng.wtpbuilder/distribution/servadapt.tests/templateFiles/index.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<html>
-<head>
-
-<?php
-$parts = explode("/", realpath(".."));
-$label = $parts[count($parts) - 1];
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-</head>
-<body>
-<p><b><font face="Verdana" size="+3">Test Results</font></b></p>
-<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">Unit Test Results for <?php echo "$label"; ?>
-		</font></b></td>
-	</tr>
-</table>
-<p></p>
-<table border="0">
-</table>
-
-<table width="77%" border="1">
-	<tr>
-		<td width="81%"><b>Tests Performed</b></td>
-		<td width="19%"><b>Errors &amp; Failures</b></td>
-	</tr>
-
-	<?
-	$dir = dir("html");
-	while ($anEntry = $dir->read())
-	{
-		if ($anEntry != "." && $anEntry != "..")
-		{
-			$link = "html/".$anEntry;
-			$xml = "xml/".substr($anEntry, 0, strlen($anEntry)-4)."xml";
-			$count = 0;
-			$fileHandle = fopen($xml, "r");
-			while (!feof($fileHandle))
-			{
-				$aLine = fgets($fileHandle, 4096); // Length parameter only optional after 4.2.0
-				$count = $count + substr_count($aLine, '<error');
-			}
-			fclose($fileHandle);
-			if ($count > 0)
-			{
-				echo "<tr><td><a href=\"$link\"><b><font color=\"red\">";
-				echo "$anEntry";
-				echo "</font></b></a></td>";
-				echo "<td><b><font color=\"red\">$count</font></b></td></tr>";
-			}
-			else
-			{
-				echo "<tr><td><a href=\"$link\">";
-				echo "$anEntry";
-				echo "</a></td>";
-				echo "<td>$count</td></tr>";
-			}
-		}
-	}
-	?>
-
-</table>
-<p></p>
-<br>
-<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"> Console output logs <?php echo "$label"; ?>
-		</font></b></td>
-	</tr>
-</table>
-<br>
-These
-<a href="consolelogs/wtptestlog.txt">logs</a>
-contain the console output captured while running the JUnit automated
-tests.
-<br>
-<br>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/servadapt.tests/testScripts/JUNIT.XSL b/releng.wtpbuilder/distribution/servadapt.tests/testScripts/JUNIT.XSL
deleted file mode 100644
index 9cdd80e..0000000
--- a/releng.wtpbuilder/distribution/servadapt.tests/testScripts/JUNIT.XSL
+++ /dev/null
@@ -1,703 +0,0 @@
-<xsl:stylesheet
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="1.0">
-    <xsl:output
-        method="html"
-        indent="yes"/>
-    <xsl:decimal-format
-        decimal-separator="."
-        grouping-separator=","/>
-    <xsl:template
-        match="testsuites">
-        <HTML>
-            <HEAD>
-                <style
-                    type="text/css"> body { font:normal 68%
-                    verdana,arial,helvetica; color:#000000; } table tr
-                    td, table tr th { font-size: 68%; } table.details tr
-                    th{ font-weight: bold; text-align:left;
-                    background:#a6caf0; } table.details tr td{
-                    background:#eeeee0; } p { line-height:1.5em;
-                    margin-top:0.5em; margin-bottom:1.0em; } h1 {
-                    margin: 0px 0px 5px; font: 165%
-                    verdana,arial,helvetica } h2 { margin-top: 1em;
-                    margin-bottom: 0.5em; font: bold 125%
-                    verdana,arial,helvetica } h3 { margin-bottom: 0.5em;
-                    font: bold 115% verdana,arial,helvetica } h4 {
-                    margin-bottom: 0.5em; font: bold 100%
-                    verdana,arial,helvetica } h5 { margin-bottom: 0.5em;
-                    font: bold 100% verdana,arial,helvetica } h6 {
-                    margin-bottom: 0.5em; font: bold 100%
-                    verdana,arial,helvetica } .Error { font-weight:bold;
-                    color:red; } .Failure { font-weight:bold;
-                    color:purple; } .Properties { text-align:right; } </style>
-                <script
-                    language="JavaScript">
-                    var TestCases = new Array(); var cur;
-                    <xsl:for-each
-                        select="./testsuite">
-                        <xsl:apply-templates
-                            select="properties"/>
-                    </xsl:for-each>
-                </script>
-                <script
-                    language="JavaScript"><![CDATA[
-        function displayProperties (name) {
-          var win = window.open('','JUnitSystemProperties','scrollbars=1,resizable=1');
-          var doc = win.document.open();
-          doc.write("<html><head><title>Properties of " + name + "</title>");
-          doc.write("<style>")
-          doc.write("body {font:normal 68% verdana,arial,helvetica;	color:#000000; }");
-          doc.write("table tr td, table tr th { font-size: 68%; }");
-          doc.write("table.properties { border-collapse:collapse; border-left:solid 1 #cccccc; border-top:solid 1 #cccccc; padding:5px; }");
-          doc.write("table.properties th { text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#eeeeee; }");
-          doc.write("table.properties td { font:normal; text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#fffffff; }");
-          doc.write("h3 { margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica }");
-          doc.write("</style>");
-          doc.write("</head><body>");
-          doc.write("<h3>Properties of " + name + "</h3>");
-          doc.write("<div align=\"right\"><a href=\"javascript:window.close();\">Close</a></div>");
-          doc.write("<table class='properties'>");
-          doc.write("<tr><th>Name</th><th>Value</th></tr>");
-          for (prop in TestCases[name]) {
-            doc.write("<tr><th>" + prop + "</th><td>" + TestCases[name][prop] + "</td></tr>");
-          }
-          doc.write("</table>");
-          doc.write("</body></html>");
-          doc.close();
-          win.focus();
-        }
-      ]]>
-                </script>
-            </HEAD>
-            <body>
-                <a
-                    name="top"></a>
-                <xsl:call-template
-                    name="pageHeader"/>
-
-                <!-- Summary part -->
-                <xsl:call-template
-                    name="summary"/>
-                <hr
-                    size="1"
-                    width="95%"
-                    align="left"/>
-
-                <!-- Package List part -->
-                <xsl:call-template
-                    name="packagelist"/>
-                <hr
-                    size="1"
-                    width="95%"
-                    align="left"/>
-
-                <!-- For each package create its part -->
-                <xsl:call-template
-                    name="packages"/>
-                <hr
-                    size="1"
-                    width="95%"
-                    align="left"/>
-
-                <!-- For each class create the  part -->
-                <xsl:call-template
-                    name="classes"/>
-            </body>
-        </HTML>
-    </xsl:template>
-    <!--
-        ==================================================================
-    -->
-    <!--
-        Write a list of all packages with an hyperlink to the anchor of
-    -->
-    <!--
-        of the package name.
-    -->
-    <!--
-        ==================================================================
-    -->
-    <xsl:template
-        name="packagelist">
-        <h2>Packages</h2>
-        Note: package statistics are not computed recursively, they only
-        sum up all of its testsuites numbers.
-        <table
-            class="details"
-            border="0"
-            cellpadding="5"
-            cellspacing="2"
-            width="95%">
-            <xsl:call-template
-                name="testsuite.test.header"/>
-            <!-- list all packages recursively -->
-            <xsl:for-each
-                select="./testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
-                <xsl:sort
-                    select="@package"/>
-                <xsl:variable
-                    name="testsuites-in-package"
-                    select="/testsuites/testsuite[./@package = current()/@package]"/>
-                <xsl:variable
-                    name="testCount"
-                    select="sum($testsuites-in-package/@tests)"/>
-                <xsl:variable
-                    name="errorCount"
-                    select="sum($testsuites-in-package/@errors)"/>
-                <xsl:variable
-                    name="failureCount"
-                    select="sum($testsuites-in-package/@failures)"/>
-                <xsl:variable
-                    name="timeCount"
-                    select="sum($testsuites-in-package/@time)"/>
-
-                <!-- write a summary for the package -->
-                <tr
-                    valign="top">
-                    <!-- set a nice color depending if there is an error/failure -->
-                    <xsl:attribute
-                        name="class">
-						<xsl:choose>
-							<xsl:when
-                        test="$failureCount &gt; 0">Failure</xsl:when>
-							<xsl:when
-                        test="$errorCount &gt; 0">Error</xsl:when>
-						</xsl:choose>
-					</xsl:attribute>
-                    <td>
-                        <a
-                            href="#{@package}">
-                            <xsl:value-of
-                                select="@package"/>
-                        </a>
-                    </td>
-                    <td>
-                        <xsl:value-of
-                            select="$testCount"/>
-                    </td>
-                    <td>
-                        <xsl:value-of
-                            select="$errorCount"/>
-                    </td>
-                    <td>
-                        <xsl:value-of
-                            select="$failureCount"/>
-                    </td>
-                    <td>
-                        <xsl:call-template
-                            name="display-time">
-                            <xsl:with-param
-                                name="value"
-                                select="$timeCount"/>
-                        </xsl:call-template>
-                    </td>
-                </tr>
-            </xsl:for-each>
-        </table>
-    </xsl:template>
-    <!--
-        ==================================================================
-    -->
-    <!--
-        Write a package level report
-    -->
-    <!--
-        It creates a table with values from the document:
-    -->
-    <!--
-        Name | Tests | Errors | Failures | Time
-    -->
-    <!--
-        ==================================================================
-    -->
-    <xsl:template
-        name="packages">
-        <!-- create an anchor to this package name -->
-        <xsl:for-each
-            select="/testsuites/testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
-            <xsl:sort
-                select="@package"/>
-            <a
-                name="{@package}"></a>
-            <h3>
-                Package
-                <xsl:value-of
-                    select="@package"/>
-            </h3>
-            <table
-                class="details"
-                border="0"
-                cellpadding="5"
-                cellspacing="2"
-                width="95%">
-                <xsl:call-template
-                    name="testsuite.test.header"/>
-
-                <!-- match the testsuites of this package -->
-                <xsl:apply-templates
-                    select="/testsuites/testsuite[./@package = current()/@package]"
-                    mode="print.test"/>
-            </table>
-            <a
-                href="#top">Back to top</a>
-            <p/>
-            <p/>
-        </xsl:for-each>
-    </xsl:template>
-    <xsl:template
-        name="classes">
-        <xsl:for-each
-            select="testsuite">
-            <xsl:sort
-                select="@name"/>
-            <!-- create an anchor to this class name -->
-            <a
-                name="{@name}"></a>
-            <h3>
-                TestCase
-                <xsl:value-of
-                    select="@name"/>
-            </h3>
-            <table
-                class="details"
-                border="0"
-                cellpadding="5"
-                cellspacing="2"
-                width="95%">
-                <xsl:call-template
-                    name="testcase.test.header"/>
-                <!--
-                    test can even not be started at all (failure to load
-                    the class) so report the error directly
-                -->
-                <xsl:if
-                    test="./error">
-                    <tr
-                        class="Error">
-                        <td
-                            colspan="4">
-                            <xsl:apply-templates
-                                select="./error"/>
-                        </td>
-                    </tr>
-                </xsl:if>
-                <xsl:apply-templates
-                    select="./testcase"
-                    mode="print.test"/>
-            </table>
-            <div
-                class="Properties">
-                <a>
-                    <xsl:attribute
-                        name="href">javascript:displayProperties('<xsl:value-of
-                        select="@package"/>.<xsl:value-of
-                        select="@name"/>');</xsl:attribute>
-                    Properties &gt;&gt;
-                </a>
-            </div>
-            <p/>
-            <a
-                href="#top">Back to top</a>
-        </xsl:for-each>
-    </xsl:template>
-    <xsl:template
-        name="summary">
-        <h2>Summary</h2>
-        <xsl:variable
-            name="testCount"
-            select="sum(testsuite/@tests)"/>
-        <xsl:variable
-            name="errorCount"
-            select="sum(testsuite/@errors)"/>
-        <xsl:variable
-            name="failureCount"
-            select="sum(testsuite/@failures)"/>
-        <xsl:variable
-            name="timeCount"
-            select="sum(testsuite/@time)"/>
-        <xsl:variable
-            name="successRate"
-            select="($testCount - $failureCount - $errorCount) div $testCount"/>
-        <table
-            class="details"
-            border="0"
-            cellpadding="5"
-            cellspacing="2"
-            width="95%">
-            <tr
-                valign="top">
-                <th>Tests</th>
-                <th>Failures</th>
-                <th>Errors</th>
-                <th>Success rate</th>
-                <th>Time</th>
-            </tr>
-            <tr
-                valign="top">
-                <xsl:attribute
-                    name="class">
-				<xsl:choose>
-					<xsl:when
-                    test="$failureCount &gt; 0">Failure</xsl:when>
-					<xsl:when
-                    test="$errorCount &gt; 0">Error</xsl:when>
-				</xsl:choose>
-			</xsl:attribute>
-                <td>
-                    <xsl:value-of
-                        select="$testCount"/>
-                </td>
-                <td>
-                    <xsl:value-of
-                        select="$failureCount"/>
-                </td>
-                <td>
-                    <xsl:value-of
-                        select="$errorCount"/>
-                </td>
-                <td>
-                    <xsl:call-template
-                        name="display-percent">
-                        <xsl:with-param
-                            name="value"
-                            select="$successRate"/>
-                    </xsl:call-template>
-                </td>
-                <td>
-                    <xsl:call-template
-                        name="display-time">
-                        <xsl:with-param
-                            name="value"
-                            select="$timeCount"/>
-                    </xsl:call-template>
-                </td>
-            </tr>
-        </table>
-        <table
-            border="0"
-            width="95%">
-            <tr>
-                <td
-                    style="text-align: justify;">
-                    Note:
-                    <i>failures</i>
-                    are anticipated and checked for with assertions
-                    while
-                    <i>errors</i>
-                    are unanticipated.
-                </td>
-            </tr>
-        </table>
-    </xsl:template>
-    <!--
-        Write properties into a JavaScript data structure. This is based
-        on the original idea by Erik Hatcher (erik@hatcher.net)
-    -->
-    <xsl:template
-        match="properties">
-        cur = TestCases['
-        <xsl:value-of
-            select="../@package"/>
-        .
-        <xsl:value-of
-            select="../@name"/>
-        '] = new Array();
-        <xsl:for-each
-            select="property">
-            <xsl:sort
-                select="@name"/>
-            cur['
-            <xsl:value-of
-                select="@name"/>
-            '] = '
-            <xsl:call-template
-                name="JS-escape">
-                <xsl:with-param
-                    name="string"
-                    select="@value"/>
-            </xsl:call-template>
-            ';
-        </xsl:for-each>
-    </xsl:template>
-
-    <!-- Page HEADER -->
-    <xsl:template
-        name="pageHeader">
-        <h1>Unit Test Results</h1>
-        <table
-            width="100%">
-            <tr>
-                <td
-                    align="left"></td>
-                <td
-                    align="right">
-                    Designed for use with
-                    <a
-                        href='http://www.junit.org'>JUnit</a>
-                    and
-                    <a
-                        href='http://jakarta.apache.org/ant'>Ant</a>
-                    .
-                </td>
-            </tr>
-        </table>
-        <hr
-            size="1"/>
-    </xsl:template>
-    <xsl:template
-        match="testsuite"
-        mode="header">
-        <tr
-            valign="top">
-            <th
-                width="80%">Name</th>
-            <th>Tests</th>
-            <th>Errors</th>
-            <th>Failures</th>
-            <th
-                nowrap="nowrap">Time(s)</th>
-        </tr>
-    </xsl:template>
-
-    <!-- class header -->
-    <xsl:template
-        name="testsuite.test.header">
-        <tr
-            valign="top">
-            <th
-                width="80%">Name</th>
-            <th>Tests</th>
-            <th>Errors</th>
-            <th>Failures</th>
-            <th
-                nowrap="nowrap">Time(s)</th>
-        </tr>
-    </xsl:template>
-
-    <!-- method header -->
-    <xsl:template
-        name="testcase.test.header">
-        <tr
-            valign="top">
-            <th>Name</th>
-            <th>Status</th>
-            <th
-                width="80%">Type</th>
-            <th
-                nowrap="nowrap">Time(s)</th>
-        </tr>
-    </xsl:template>
-
-
-    <!-- class information -->
-    <xsl:template
-        match="testsuite"
-        mode="print.test">
-        <tr
-            valign="top">
-            <!-- set a nice color depending if there is an error/failure -->
-            <xsl:attribute
-                name="class">
-			<xsl:choose>
-				<xsl:when
-                test="@failures[.&gt; 0]">Failure</xsl:when>
-				<xsl:when
-                test="@errors[.&gt; 0]">Error</xsl:when>
-			</xsl:choose>
-		</xsl:attribute>
-
-            <!-- print testsuite information -->
-            <td>
-                <a
-                    href="#{@name}">
-                    <xsl:value-of
-                        select="@name"/>
-                </a>
-            </td>
-            <td>
-                <xsl:value-of
-                    select="@tests"/>
-            </td>
-            <td>
-                <xsl:value-of
-                    select="@errors"/>
-            </td>
-            <td>
-                <xsl:value-of
-                    select="@failures"/>
-            </td>
-            <td>
-                <xsl:call-template
-                    name="display-time">
-                    <xsl:with-param
-                        name="value"
-                        select="@time"/>
-                </xsl:call-template>
-            </td>
-        </tr>
-    </xsl:template>
-    <xsl:template
-        match="testcase"
-        mode="print.test">
-        <tr
-            valign="top">
-            <xsl:attribute
-                name="class">
-			<xsl:choose>
-				<xsl:when
-                test="failure | error">Error</xsl:when>
-			</xsl:choose>
-		</xsl:attribute>
-            <td>
-                <xsl:value-of
-                    select="@name"/>
-            </td>
-            <xsl:choose>
-                <xsl:when
-                    test="failure">
-                    <td>Failure</td>
-                    <td>
-                        <xsl:apply-templates
-                            select="failure"/>
-                    </td>
-                </xsl:when>
-                <xsl:when
-                    test="error">
-                    <td>Error</td>
-                    <td>
-                        <xsl:apply-templates
-                            select="error"/>
-                    </td>
-                </xsl:when>
-                <xsl:otherwise>
-                    <td>Success</td>
-                    <td></td>
-                </xsl:otherwise>
-            </xsl:choose>
-            <td>
-                <xsl:call-template
-                    name="display-time">
-                    <xsl:with-param
-                        name="value"
-                        select="@time"/>
-                </xsl:call-template>
-            </td>
-        </tr>
-    </xsl:template>
-    <xsl:template
-        match="failure">
-        <xsl:call-template
-            name="display-failures"/>
-    </xsl:template>
-    <xsl:template
-        match="error">
-        <xsl:call-template
-            name="display-failures"/>
-    </xsl:template>
-
-    <!-- Style for the error and failure in the tescase template -->
-    <xsl:template
-        name="display-failures">
-        <xsl:choose>
-            <xsl:when
-                test="not(@message)">
-                N/A
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of
-                    select="@message"/>
-            </xsl:otherwise>
-        </xsl:choose>
-        <!-- display the stacktrace -->
-        <code>
-            <p/>
-            <xsl:call-template
-                name="br-replace">
-                <xsl:with-param
-                    name="word"
-                    select="."/>
-            </xsl:call-template>
-        </code>
-        <!--
-            the later is better but might be problematic for non-21"
-            monitors...
-        -->
-        <!--pre><xsl:value-of select="."/></pre-->
-    </xsl:template>
-    <xsl:template
-        name="JS-escape">
-        <xsl:param
-            name="string"/>
-        <xsl:choose>
-            <!--
-                something isn't right here, basically all single quotes
-                need to be replaced with backslash-single-quote
-                <xsl:when test="contains($string,'&apos;')">
-                <xsl:value-of
-                select="substring-before($string,'&apos;')"/> \&apos;
-                <xsl:call-template name="JS-escape"> <xsl:with-param
-                name="string"
-                select="substring-after($string,'&apos;')"/>
-                </xsl:call-template> </xsl:when>
-            -->
-            <xsl:when
-                test="contains($string,'\')">
-                <xsl:value-of
-                    select="substring-before($string,'\')"/>
-                \\
-                <xsl:call-template
-                    name="JS-escape">
-                    <xsl:with-param
-                        name="string"
-                        select="substring-after($string,'\')"/>
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of
-                    select="$string"/>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-    <!--
-        template that will convert a carriage return into a br tag
-        @param word the text from which to convert CR to BR tag
-    -->
-    <xsl:template
-        name="br-replace">
-        <xsl:param
-            name="word"/>
-        <xsl:choose>
-            <xsl:when
-                test="contains($word,'&#xA;')">
-                <xsl:value-of
-                    select="substring-before($word,'&#xA;')"/>
-                <br/>
-                <xsl:call-template
-                    name="br-replace">
-                    <xsl:with-param
-                        name="word"
-                        select="substring-after($word,'&#xA;')"/>
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of
-                    select="$word"/>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-    <xsl:template
-        name="display-time">
-        <xsl:param
-            name="value"/>
-        <xsl:value-of
-            select="format-number($value,'0.000')"/>
-    </xsl:template>
-    <xsl:template
-        name="display-percent">
-        <xsl:param
-            name="value"/>
-        <xsl:value-of
-            select="format-number($value,'0.00%')"/>
-    </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/servadapt.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/servadapt.tests/testScripts/test.xml
deleted file mode 100644
index 96c6ddc..0000000
--- a/releng.wtpbuilder/distribution/servadapt.tests/testScripts/test.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<project
-    name="Automated Eclipse Testing"
-    default="all"
-    basedir=".">
-    <property
-        environment="env"/>
-
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-    <echo
-        level="info"
-        message="starting Automated Eclipse Testing"/>
-    <echo
-        level="debug"
-        message="basedir: ${basedir}"/>
-    <echo
-        level="debug"
-        message="testRoot: ${testRoot}"/>
-    <fail
-        message="testRoot must be set"
-        unless="testRoot"/>
-
-    <!--properties file containing the build information-->
-    <property
-        file="${buildDirectory}/label.properties"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-    <!--default directory where test-eclipse will be installed-->
-    <property
-        name="install"
-        value="${testRoot}"/>
-    <!--
-        name that can be added to report name to identify which platform
-        tests results come from
-    -->
-    <property
-        name="platform"
-        value=""/>
-
-    <!-- The root of the eclipse installation -->
-    <property
-        name="eclipse-home"
-        value="${testRoot}${dropinsFolder}/eclipse/"/>
-    <!--
-        The directory that will contain the xml and html results from
-        the tests that are run
-    -->
-    <property
-        name="results"
-        value="${testRoot}/results"/>
-    <property
-        name="library-file"
-        value="${testRoot}/wtp-junit-tests.xml"/>
-    <target
-        name="init">
-    </target>
-    <target
-        name="all"
-        depends="init">
-        <echo
-            level="info"
-            message="Starting Unit Tests"/>
-        <!--
-            unlike other ant tasks, subant defaults to false for
-            inheritall!
-        -->
-        <subant
-            target=""
-            inheritall="true">
-            <fileset
-                dir="${eclipse-home}/plugins/">
-                <exclude
-                    name="**/*performance*/test.xml"/>
-                <include
-                    name="**/test.xml"/>
-            </fileset>
-        </subant>
-        <echo
-            level="info"
-            message="Ended Unit Tests"/>
-        <antcall
-            target="genHtml"/>
-    </target>
-    <target
-        name="genHtml"
-        description="Generates HTML results with provided JUNIT.XSL provided"
-        unless="genHtml.disable">
-        <xslt
-            style="JUNIT.XSL"
-            basedir="${results}/xml"
-            destdir="${results}/html"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/servadapt.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/servadapt.tests/testScripts/wtp-junit-tests.xml
deleted file mode 100644
index 62f4501..0000000
--- a/releng.wtpbuilder/distribution/servadapt.tests/testScripts/wtp-junit-tests.xml
+++ /dev/null
@@ -1,317 +0,0 @@
-<?xml version="1.0"?>
-<project
-    name="JUnit tests"
-    basedir=".">
-    <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-    <target
-        name="init">
-        <property
-            name="junit-report-output"
-            value="${testRoot}/results"/>
-        <mkdir
-            dir="${junit-report-output}/raw"/>
-        <!--
-            if not otherwise set, be sure extraVMargs is at least some
-            string, even if unused string. 
-            
-            Remember, though, extraVMArgs can contain more than one extra arg, 
-            so much be passed to VM as a "line", not "value". 
-        -->
-        <property
-            name="extraVMargs"
-            value="-DextraVMargsunused=notused"/>
-
-        <!-- if not otherwise set, use a unique workspace name -->
-        <property
-            name="data-dir"
-            value="${testRoot}/junitworkspaces/workspace-${classname}"/>
-        <property
-            name="testRoot"
-            value="${testRoot}"/>
-        <!--
-            Some common values, of milliseconds to more recognizable
-            units: 14400000: 4 hours 7200000: 2 hours 3600000: 1 hour
-            1800000: 30 minutes 600000: 10 minutes
-        -->
-        <property
-            name="timeout"
-            value="1800000"/>
-        <property
-            name="junit-report-output"
-            value="${junit-report-output}"/>
-        <property
-            name="formatter"
-            value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter"/>
-        <property
-            name="test-output"
-            value="${junit-report-output}/raw/${classname}.xml"/>
-        <property
-            name="jvm"
-            value="${env.JAVA_6_HOME}/bin/java"/>
-        <dirname
-            file="${ant.file}"
-            property="currentDir"/>
-        <echo
-            level="debug"
-            message="data-dir: ${data-dir}"/>
-        <echo
-            level="debug"
-            message="plugin-name: ${plugin-name}"/>
-        <echo
-            level="debug"
-            message="classname: ${classname}"/>
-        <echo
-            level="info"
-            message="extraVMargs: ${extraVMargs}"/>
-        <echo
-            level="debug"
-            message="timeout: ${timeout}"/>
-        <echo
-            level="debug"
-            message="testRoot: ${testRoot}"/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="debug"
-            message="eclipse-home: ${eclipse-home}"/>
-        <echo
-            level="debug"
-            message="junit-report-output: ${junit-report-output}"/>
-        <echo
-            level="debug"
-            message="test-output: ${test-output}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="buildLabel: ${buildLabel}"/>
-        <echo
-            level="debug"
-            message="jvm: ${jvm}"/>
-    </target>
-    <target
-        name="core-test"
-        depends="init">
-        <echo
-            level="info"
-            message="test-type: core-test"/>
-        <ant
-            antfile="${ant.file}"
-            dir="${currentDir}"
-            target="eclipse-test">
-            <property
-                name="application"
-                value="org.eclipse.test.coretestapplication"/>
-        </ant>
-    </target>
-    <target
-        name="ui-test"
-        depends="init">
-        <echo
-            level="info"
-            message="test-type: ui-test"/>
-        <ant
-            antfile="${ant.file}"
-            dir="${currentDir}"
-            target="eclipse-test">
-            <property
-                name="application"
-                value="org.eclipse.test.uitestapplication"/>
-        </ant>
-    </target>
-    <target
-        name="eclipse-test"
-        description="Runs the specified classname as a plug-in test.">
-        <echo
-            level="info"
-            message="Running ${classname}"/>
-        <echo
-            level="debug"
-            message="Result file: ${junit-report-output}/${classname}.xml."/>
-        <echo
-            level="debug"
-            message="DISPLAY: ${env.DISPLAY}"/>
-        <mkdir
-            dir="${buildDirectory}/${buildLabel}/httplogstest"/>
-        <echo
-            message="http log messages to: ${buildDirectory}/${buildLabel}/httplogstest"/>
-    	
-       <condition
-           property="xulRunnerParam"
-           value="org.eclipse.swt.browser.XULRunnerPath"
-           else="XULRunnerPathNotSpecified">
-           <isset
-               property="env.WTP_XULRUNNER"/>
-       </condition>
-        <echo
-            message="xulRunnerParam: ${xulRunnerParam}"/>
-        <echo
-            message="WTP_XULRUNNER: ${env.WTP_XULRUNNER}"/>
-        <!--
-            If there is not exactly one launcher in the stack, we'd best
-            fail fast, since we are not expecting that, and may indicate
-            an installation that would produce unpredictable results
-        -->
-        <!--
-            requires ant 1.7, and at this point, we're running 1.6 from
-            eclipse ... <condition property="expectedNumberOfLaunchers">
-            <resourcecount when="equal" count="1" > <fileset
-            dir="${testRoot}/eclipse/plugins"> <include
-            name="org.eclipse.equinox.launcher_*.jar" /> </fileset>
-            </resourcecount> </condition> <fail message="Did not find
-            expected number of launcher jars. Check installation."
-            unless="expectedNumberOfLaunchers" />
-        -->
-        <java
-            taskname="suiteUnitTest"
-            fork="true"
-            resultProperty="suitejunitresult"
-            failonerror="false"
-            timeout="${timeout}"
-            dir="${testRoot}/eclipse"
-            jvm="${jvm}"
-            classname="org.eclipse.equinox.launcher.Main">
-            <classpath>
-                <fileset
-                    dir="${testRoot}/eclipse/plugins">
-                    <include
-                        name="org.eclipse.equinox.launcher_*.jar"/>
-                </fileset>
-            </classpath>
-            <jvmarg
-                value="-Xmx512m"/>
-            <jvmarg
-                value="-Dosgi.ws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dosgi.os=${env.BASEOS}"/>
-            <jvmarg
-                value="-Dosgi.arch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-DbuildLabel=${buildLabel}"/>
-            <jvmarg
-                value="-DbuildDirectory=${buildDirectory}"/>
-            <jvmarg
-                value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
-            <jvmarg
-                value="-DurlLogLocation=${buildDirectory}/${buildLabel}/httplogstest/outgoinghttplog-${plugin-name}.log"/>
-            <jvmarg
-                value="-Dwtp.autotest.noninteractive=true"/>
-            <jvmarg
-                line="${extraVMargs}"/>
-            <jvmarg
-                value="-Declipse.consolelog=true"/>
-            <jvmarg
-                value="-Dosgi.debug"/>
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <jvmarg
-                value="-Dprojectname=${projectname}"/>
-        	
-              <jvmarg
-                  value="-D${xulRunnerParam}=${env.WTP_XULRUNNER}"/> 	
-        	
-        	
-            <arg
-                value="-nosplash"/>
-            <arg
-                value="-data"/>
-            <arg
-                value="${data-dir}"/>
-            <arg
-                value="-application"/>
-            <arg
-                value="${application}"/>
-            <arg
-                value="formatter=${formatter},${test-output}"/>
-            <arg
-                value="-testPluginName"/>
-            <arg
-                value="${plugin-name}"/>
-            <arg
-                value="-className"/>
-            <arg
-                value="${classname}"/>
-            <env
-                key="DISPLAY"
-                value="${env.DISPLAY}"/>
-            <redirector
-                output="${junit-report-output}/${classname}.output.txt"
-                error="${junit-report-output}/${classname}.error.txt"/>
-        </java>
-        <echo
-            level="info"
-            message="suitejunitresult: ${suitejunitresult}"/>
-        <antcall
-            target="summarizeFailure"/>
-        <antcall
-            target="collect-results"/>
-    </target>
-    <target
-        name="collect-results">
-        <dirname
-            property="output-dir"
-            file="${test-output}"/>
-        <basename
-            property="output-file-name"
-            file="${test-output}"/>
-        <mkdir
-            dir="${junit-report-output}/xml"/>
-        <junitreport
-            todir="${junit-report-output}/xml"
-            tofile="${classname}.xml">
-            <fileset
-                dir="${output-dir}">
-                <include
-                    name="${output-file-name}"/>
-            </fileset>
-        </junitreport>
-        <mkdir
-            dir="${junit-report-output}/html"/>
-        <xslt
-            style="${testRoot}/JUNIT.XSL"
-            basedir="${junit-report-output}"
-            includes="${classname}.xml"
-            destdir="${junit-report-output}/html"/>
-    </target>
-    <target
-        name="collect">
-        <!--
-            deprecated, each test.xml uses it, and we should remove,
-            eventually
-        -->
-        <echo
-            message="Deprecated. There is no need to call the collect task. It no longer does anything. Please remove from your test.xml file"/>
-    </target>
-    <target
-        name="summarizeFailure"
-        depends="checkFailure"
-        if="doFailure">
-        <echo
-            append="true"
-            file="${buildDirectory}/junitFailureList.log">${plugin-name}${line.separator}</echo>
-    </target>
-    <target
-        name="checkFailure">
-        <condition
-            property="doFailure">
-            <not>
-                <equals
-                    arg1="${suitejunitresult}"
-                    arg2="0"
-                    trim="true"/>
-            </not>
-        </condition>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/servadapt.tests/testdependency.xml b/releng.wtpbuilder/distribution/servadapt.tests/testdependency.xml
deleted file mode 100644
index dcc7eb2..0000000
--- a/releng.wtpbuilder/distribution/servadapt.tests/testdependency.xml
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-    <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <fail
-        message="Required property file does not exist: ${keyCfgFile}">
-        <condition>
-            <not>
-                <available
-                    file="${keyCfgFile}"/>
-            </not>
-        </condition>
-    </fail>
-    <property
-        file="${keyCfgFile}"/>
-    <condition
-        property="getprereq.eclipse">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.eclipseplatform">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.emf">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.emfxsd">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.emfvalidation">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.gef">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.dtp">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.wst">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.jst">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.wtp">
-        <istrue
-            value="false"/>
-    </condition>
-    <target
-        name="get">
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined, which we do later with
-            statements such if="${groupId}.url"
-        -->
-        <property
-            file="${dependency.properties}"/>
-        <antcall
-            target="prereq.emf"/>
-        <antcall
-            target="prereq.emfxsd"/>
-        <antcall
-            target="prereq.emfvalidation"/>
-        <antcall
-            target="prereq.gef"/>
-        <antcall
-            target="prereq.dtp"/>
-        <antcall
-            target="prereq.wst"/>
-        <antcall
-            target="prereq.jst"/>
-        <antcall
-            target="prereq.wtp"/>
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="eclipseTestFramework"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.eclipse"
-        if="getprereq.eclipse">
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.eclipseplatform"
-        if="getprereq.eclipseplatform">
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="eclipseplatform"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emf"
-        if="getprereq.emf">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfxsd"
-        if="getprereq.emfxsd">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfvalidation"
-        if="getprereq.emfvalidation">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="emfvalidation"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.gef"
-        if="getprereq.gef">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.dtp"
-        if="getprereq.dtp">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="dtp"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wst"
-        if="getprereq.wst">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="wst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.jst"
-        if="getprereq.jst">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="jst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wtp"
-        if="getprereq.wtp">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="wtp"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstallBase"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-    <target
-        name="getAndInstallDropins"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}${dropinsFolder}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/vex.build/build.xml b/releng.wtpbuilder/distribution/vex.build/build.xml
deleted file mode 100644
index a2fa022..0000000
--- a/releng.wtpbuilder/distribution/vex.build/build.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<project
-    default="build"
-    basedir=".">
-    <fail
-        unless="wtp.builder.home"/>
-    <property
-        file="${wtp.builder.home}/build.properties"/>
-    <target
-        name="build"
-        depends="getBaseBuilder">
-        <dirname
-            file="${ant.file}"
-            property="distribution.wtp.build.dir"/>
-        <property
-            name="buildTargets"
-            value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
-        <!--
-            for this distribution, dependencies come from project's
-            releng map project
-        -->
-        <property
-            name="dependency.properties"
-            value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-
-        <!-- calling label.xml to createg label.properties file -->
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-        <echo
-            level="info"
-            message="invoking buildTargets: ${buildTargets} to build for each component"/>
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="vex"/>
-        </ant>
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="vex_sdk"/>
-        </ant>
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="vex_tests"/>
-            <property
-                name="eclipseBuildFailOnError"
-                value="false"/>
-        </ant>
-
-        <!-- package -->
-        <antcall
-            target="package"/>
-    </target>
-
-    <!-- invoking runbuild.xml targetting getBaseBuilder -->
-    <target
-        name="getBaseBuilder"
-        if="eclipse.builder.fetch">
-        <dirname
-            file="${ant.file}"
-            property="wtbuilder.dir"/>
-        <property
-            name="buildTargets"
-            value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
-        <echo
-            level="info"
-            message="invoking buildTargets: ${buildTargets} -> getBaseBuilder"/>
-        <ant
-            antfile="${buildTargets}"
-            target="getBaseBuilder"/>
-    </target>
-    <target
-        name="package">
-        <!--
-            post, post packaging, for WTP ... "manually" assemble the
-            desired zips
-        -->
-        <!-- nothing to assemble right now -->
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/vex.site/build.xml b/releng.wtpbuilder/distribution/vex.site/build.xml
deleted file mode 100644
index 39fc90e..0000000
--- a/releng.wtpbuilder/distribution/vex.site/build.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-<project
-    name="Build specific targets and properties"
-    default="build"
-    basedir=".">
-    <!--
-        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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- = = = end standard properties pattern = = = -->
-    <echo
-        message="ant.file: ${ant.file}"/>
-    <target
-        name="build">
-    	<mkdir dir="${buildDirectory}/${buildLabel} "/>
-        <java
-            jar="${eclipse.launcher}"
-            fork="true"
-            failonerror="true">
-            <jvmarg
-                value="-Dosgi.ws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dosgi.os=${env.BASEOS}"/>
-            <jvmarg
-                value="-Dosgi.arch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-Dbuild.donottagmaps=${build.donottagmaps}"/>
-            <jvmarg
-                value="-DbuildBranch=${buildBranch}"/>
-            <jvmarg
-                value="-DbuildType=${buildType}"/>
-            <jvmarg
-                value="-DbuildId=${buildId}"/>
-            <jvmarg
-                value="-DmapVersionTag=${mapVersionTag}"/>
-            <jvmarg
-                value="-Dbuild.distribution=${build.distribution}"/>
-            <jvmarg
-                value="-DbuildDirectory=${buildDirectory}"/>
-            <jvmarg
-                value="-Dwtp.builder.home=${wtp.builder.home}"/>
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <jvmarg
-                value="-Dprojectname=${projectname}"/>
-            <jvmarg
-                value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
-            <jvmarg
-                value="-DurlLogLocation=${buildDirectory}/${buildLabel}/outgoinghttplogfromsitebuild.log"/>
-            <arg
-                value="-data"/>
-            <arg
-                value="${basedir}/workspace"/>
-            <arg
-                value="-application"/>
-            <arg
-                value="org.eclipse.ant.core.antRunner"/>
-            <arg
-                value="-buildfile"/>
-            <arg
-                value="${ant.file}"/>
-            <arg
-                value="publish"/>
-        </java>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Steps to do to publish the build results -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="publish">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-        <property
-            file="${buildDirectory}/label.properties"/>
-        <property
-            name="publish.xml"
-            value="${component.dir}/publish.xml"/>
-        <property
-            name="indexFileName"
-            value="index.php"/>
-        <property
-            name="result"
-            value="${buildDirectory}/${buildLabel}"/>
-        <property
-            name="indexTemplateFilename"
-            value="index.html.template.php"/>
-        <copy
-            file="${wtp.builder.home}/distribution/wtp.site/templateFiles/${indexTemplateFilename}"
-            tofile="${buildDirectory}/${indexFileName}"/>
-        <condition
-            property="isBuildTested"
-            value="true">
-            <available
-                file="${buildDirectory}/${buildLabel}/testResults/html"/>
-        </condition>
-        <ant
-            antfile="${publish.xml}"
-            dir="${component.dir}">
-            <property
-                name="dropTokenList"
-                value="%wtpruntime%,%wtpsdk%,%wtptest%,%wst%,%wst-sdk%,%wst-tests%,%jst-tests%,%wst-perf-tests%,%jst-perf-tests%,%jpt-runtime%,%jpt-sdk%,%jpt-tests%"/>
-            <property
-                name="webtoolsDownloadURL"
-                value="http://www.eclipse.org/downloads/download.php?file=/webtools/committers/drops"/>
-            <property
-                name="buildBranch"
-                value="${buildBranch}"/>
-            <property
-                name="isBuildTested"
-                value="${isBuildTested}"/>
-            <property
-                name="indexTemplateFilename"
-                value="${indexTemplateFilename}"/>
-        </ant>
-
-        <!--  Get the build map over for the results to point to. -->
-        <copy
-            file="${buildDirectory}/directory.txt"
-            tofile="${result}/directory.txt"/>
-
-        <!-- Copy info for build identification -->
-        <copy
-            file="${buildDirectory}/buildmachineinfo.properties"
-            tofile="${result}/buildmachineinfo.properties"/>
-
-        <!-- http access logs -->
-        <copy
-            todir="${result}/"
-            failonerror="false">
-            <fileset
-                dir="${buildDirectory}"
-                includes="*.log"/>
-        </copy>
-
-        <!-- ant build log, from control directory -->
-        <copy
-            todir="${result}/"
-            failonerror="false">
-            <fileset
-                dir="${env.ANT_WORKING}/${projectname}"
-                includes="antBuilderOutput.log"/>
-        </copy>
-
-
-
-        <!-- final count files -->
-        <countBuildFiles
-            sourceDirectory="${buildDirectory}/${buildLabel}"
-            filterString=".zip,.tar.gz"
-            outputFile="${buildDirectory}/${buildLabel}/files.count"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/vex.site/compilerXMLOutputToHTML.xsl b/releng.wtpbuilder/distribution/vex.site/compilerXMLOutputToHTML.xsl
deleted file mode 100644
index ffc7905..0000000
--- a/releng.wtpbuilder/distribution/vex.site/compilerXMLOutputToHTML.xsl
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet
-    version="1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-    <xsl:output
-        method="html"
-        indent="yes"/>
-    <xsl:template
-        match="/">
-        <html>
-            <body>
-                <xsl:apply-templates
-                    select="compiler"/>
-            </body>
-        </html>
-    </xsl:template>
-    <xsl:template
-        match="compiler">
-        <h2>Compiler Report</h2>
-        <p>
-            Compiler:
-            <xsl:value-of
-                select="@name"/>
-            <xsl:text>   </xsl:text>
-            Version:
-            <xsl:value-of
-                select="@version"/>
-        </p>
-        <xsl:apply-templates
-            select="stats"/>
-        <xsl:apply-templates
-            select="sources"/>
-    </xsl:template>
-    <xsl:template
-        name="stats"
-        match="stats">
-        <p>
-            Number of source files:
-            <xsl:value-of
-                select="count(..//source)"/>
-            Number of classfiles:
-            <xsl:value-of
-                select="number_of_classfiles/@value"/>
-        </p>
-        <p>
-            Problems:
-            <xsl:value-of
-                select="problem_summary/@problems"/>
-            (Errors:
-            <xsl:value-of
-                select="problem_summary/@errors"/>
-            Warnings:
-            <xsl:value-of
-                select="problem_summary/@warnings"/>
-            )
-        </p>
-    </xsl:template>
-    <xsl:template
-        name="sources"
-        match="sources">
-        <xsl:if
-            test="count(source) > 0">
-            <dl>
-                <xsl:for-each
-                    select="source">
-                    <xsl:variable
-                        name="package"
-                        select="normalize-space(@package)">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="path"
-                        select="normalize-space(@path)">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="classname"
-                        select="substring-after($path, $package)">
-                    </xsl:variable>
-                    <xsl:if
-                        test="count(problems) > 0">
-                        <dt
-                            style="font-weight: bold; color: black">
-                            Source File:
-                            <xsl:value-of
-                                select="$package"/>
-                            <xsl:value-of
-                                select="$classname"/>
-                        </dt>
-                        <xsl:apply-templates
-                            select="problems">
-                            <xsl:with-param
-                                name="classname">
-                                <xsl:value-of
-                                    select="$classname"/>
-                            </xsl:with-param>
-                        </xsl:apply-templates>
-                    </xsl:if>
-                </xsl:for-each>
-            </dl>
-        </xsl:if>
-    </xsl:template>
-    <xsl:template
-        match="problems">
-        <xsl:param
-            name="classname"/>
-        <xsl:for-each
-            select="problem">
-            <dd
-                style="font-weight: normal; color: black">
-                <xsl:value-of
-                    select="position()"/>
-                <xsl:text>.  </xsl:text>
-                <xsl:value-of
-                    select="@severity"/>
-                <xsl:text>:  </xsl:text>
-                <xsl:value-of
-                    select="@id"/>
-                <xsl:variable
-                    name="lineNumber"
-                    select="@line">
-                </xsl:variable>
-                <xsl:for-each
-                    select="message">
-                    <p
-                        style="margin-left: +.5in; font-size: -1; margin-top: 0;margin-bottom:0;">
-                        <small>
-                            <xsl:value-of
-                                select="@value"/>
-                        </small>
-                    </p>
-                </xsl:for-each>
-                <xsl:for-each
-                    select="source_context">
-                    <xsl:variable
-                        name="pre"
-                        select="substring(@value,0,(@sourceStart + 1))">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="main"
-                        select="substring(@value,(@sourceStart + 1),(((@sourceEnd + 1) - (@sourceStart + 1)) + 1))">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="end"
-                        select="substring(@value,(@sourceEnd + 2))">
-                    </xsl:variable>
-                    <p
-                        style="margin-left: +.5in; font-size: -2; margin-top: 0;margin-bottom:0;">
-                        <xsl:value-of
-                            select="substring($classname,2)"/>
-                        :
-                    </p>
-                    <p
-                        style="margin-left: +.5in; font-size: -2;font-family: monospace; margin-top: 0;margin-bottom:0;">
-                        <xsl:value-of
-                            select="$lineNumber"/>
-                        :
-                        <xsl:value-of
-                            select="$pre"/>
-                        <b>
-                            <u>
-                                <xsl:value-of
-                                    select="$main"/>
-                            </u>
-                        </b>
-                        <xsl:value-of
-                            select="$end"/>
-                    </p>
-                </xsl:for-each>
-            </dd>
-        </xsl:for-each>
-    </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/vex.site/publish.xml b/releng.wtpbuilder/distribution/vex.site/publish.xml
deleted file mode 100644
index 71afb65..0000000
--- a/releng.wtpbuilder/distribution/vex.site/publish.xml
+++ /dev/null
@@ -1,821 +0,0 @@
-<project
-    name="Publish Build"
-    default="default"
-    basedir=".">
-    <!--
-        Properties that must be passed to this script: buildDirectory:
-        Path to perform the build in. (A working directory) buildType:
-        Type of build (nightly, integration etc.) buildId: Build name
-        buildLabel: <buildType>-<buildName>-<timestamp>
-    -->
-    <property
-        environment="env"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be provided to publish"/>
-    <fail
-        unless="buildLabel"
-        message="buildLabel must be provided to publish"/>
-    <fail
-        unless="wtp.builder.home"
-        message="wtp.builder.home must be provided to publish"/>
-    <fail
-        unless="build.distribution"
-        message="build.distribution must be provided to publish"/>
-    <property
-        name="resultDir"
-        value="${buildDirectory}/${buildLabel}"/>
-    <!--name of generated index page-->
-    <property
-        name="indexFileName"
-        value="index.php"/>
-    <property
-        name="templateDir"
-        value="${wtp.builder.home}/distribution/${build.distribution}.site"/>
-    <property
-        name="resultingIndex"
-        value="${resultDir}/${indexFileName}"/>
-    <echo
-        level="debug"
-        message="resultDir: ${resultDir}"/>
-    <echo
-        level="debug"
-        message="templateDir: ${templateDir}"/>
-    <echo
-        level="debug"
-        message="resultingIndex: ${resultingIndex}"/>
-    <target
-        name="default">
-        <copy
-            overwrite="true"
-            file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/${indexTemplateFilename}"
-            tofile="${resultingIndex}"/>
-        <antcall
-            target="countFiles"/>
-        <antcall
-            target="generateCompileIndex"/>
-        <antcall
-            target="generateJUnitTestsIndex"/>
-        <antcall
-            target="getStaticFiles"/>
-    </target>
-    <target
-        name="generateCompileIndex">
-        <!--
-            <taskdef name="indexResults"
-            classname="org.eclipse.wtp.releng.tools.ResultsSummaryGenerator"
-            />
-        -->
-        <!--
-            isBuildTested: true|false should JUnit plugin test results
-            be used to generate index page dropTokenList: comma
-            separated list of strings which should be replaced by the
-            fileName attribute settings in the testManifest.xml.
-            xmlDirectoryName: path to directory containing JUnit plugin
-            test results in xml format (see doc is org.eclipse.test).
-            dropDirectoryName: path to directory containing the result
-            of the build. testResultsTemplateFileName: path to template
-            file used to generate page with links to JUnit test results
-            testResultsHtmlFileName: name of file which will be
-            generated with links to JUnit test results dropHtmlFileName:
-            name of generated index page hrefTestResultsTargetPath:
-            relative path from index page to directory containing JUnit
-            html test results hrefCompileLogsTargetPath: relative path
-            from index page directory containing compilelogs
-            testManifestFileName: name of xml file containing
-            descriptions of zip types and log files
-        -->
-        <property
-            file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-
-        <!-- create tables of test plugin compiles first -->
-        <antcall
-            target="generateTestCompileOutput">
-            <param
-                name="outputDirectory"
-                value="${resultDir}/testcompilelogs"/>
-        </antcall>
-
-        <!-- create table of code plugins compiles -->
-        <antcall
-            target="generateCompileOutput">
-            <param
-                name="outputDirectory"
-                value="${resultDir}/compilelogs"/>
-        </antcall>
-        <tstamp>
-            <format
-                property="TODAY"
-                pattern="MMMM d, yyyy"/>
-        </tstamp>
-
-        <!--  Insert Build Type descriptor  -->
-        <antcall
-            target="${buildType}"/>
-        <antcall
-            target="writeData"/>
-        <!--
-            Update timestamp on file to permit overwrite through Ant
-            copy task
-        -->
-        <touch
-            file="${resultingIndex}"/>
-    </target>
-    <target
-        name="generateTestCompileOutput"
-        depends="checkIfCompileLogs"
-        if="doCompileLogs">
-        <summarizeResults
-            isBuildTested="false"
-            includeAll="true"
-            dropTokenList="${dropTokenList}"
-            xmlDirectoryName=""
-            dropDirectoryName="${resultDir}"
-            testResultsTemplateFileName="${templateDir}/templateFiles/testCompileResults.php.template"
-            testResultsHtmlFileName="testCompileResults.php"
-            hrefTestResultsTargetPath=""
-            hrefCompileLogsTargetPath="testcompilelogs"
-            compileLogsDirectoryName="${outputDirectory}"/>
-        <antcall
-            target="compilerXMLToHTML"/>
-    </target>
-    <target
-        name="generateCompileOutput"
-        depends="checkIfCompileLogs"
-        if="doCompileLogs">
-        <summarizeResults
-            isBuildTested="false"
-            includeAll="true"
-            dropTokenList="${dropTokenList}"
-            xmlDirectoryName=""
-            dropDirectoryName="${resultDir}"
-            testResultsTemplateFileName="${templateDir}/templateFiles/compileResults.php.template"
-            testResultsHtmlFileName="compileResults.php"
-            hrefTestResultsTargetPath="testResults/html"
-            hrefCompileLogsTargetPath="compilelogs"
-            compileLogsDirectoryName="${outputDirectory}"/>
-        <antcall
-            target="compilerXMLToHTML"/>
-    </target>
-    <target
-        name="compilerXMLToHTML">
-        <xslt
-            basedir="${outputDirectory}"
-            destdir="${outputDirectory}"
-            includes="**/*.xml"
-            scanincludeddirectories="true"
-            style="compilerXMLOutputToHTML.xsl"
-            force="true"/>
-    </target>
-    <target
-        name="generateJUnitTestsIndex"
-        depends="checkIfTested"
-        if="doTests">
-        <!--
-            isBuildTested: true|false should JUnit plugin test results
-            be used to generate index page dropTokenList: comma
-            separated list of strings which should be replaced by the
-            fileName attribute settings in the testManifest.xml.
-            xmlDirectoryName: path to directory containing JUnit plugin
-            test results in xml format (see doc is org.eclipse.test).
-            dropDirectoryName: path to directory containing the result
-            of the build. testResultsTemplateFileName: path to template
-            file used to generate page with links to JUnit test results
-            testResultsHtmlFileName: name of file which will be
-            generated with links to JUnit test results dropHtmlFileName:
-            name of generated index page hrefTestResultsTargetPath:
-            relative path from index page to directory containing JUnit
-            html test results hrefCompileLogsTargetPath: relative path
-            from index page directory containing compilelogs
-            testManifestFileName: name of xml file containing
-            descriptions of zip types and log files
-        -->
-        <property
-            file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-
-        <!-- create table of test plugin compiles first -->
-        <!-- set isBuildTested to true for the "compile only" results -->
-        <summarizeResults
-            isBuildTested="true"
-            dropTokenList="${dropTokenList}"
-            dropDirectoryName="${resultDir}"
-            xmlDirectoryName="${resultDir}/testResults/xml"
-            testResultsTemplateFileName="${templateDir}/templateFiles/testResults.php.template"
-            testResultsHtmlFileName="testResults.php"
-            hrefTestResultsTargetPath="testResults/html"
-            compileLogsDirectoryName=""/>
-        <tstamp>
-            <format
-                property="TODAY"
-                pattern="MMMM d, yyyy"/>
-        </tstamp>
-
-        <!--  Insert Build Type descriptor  -->
-        <antcall
-            target="${buildType}"/>
-        <antcall
-            target="writeData"/>
-        <!--
-            Update timestamp on file to permit overwrite through Ant
-            copy task
-        -->
-        <touch
-            file="${resultingIndex}"/>
-    </target>
-    <target
-        name="getStaticFiles">
-        <!--get static files required in the buildLabel directory-->
-        <copy
-            todir="${resultDir}">
-            <fileset
-                dir="${templateDir}/staticDropFiles"/>
-        </copy>
-
-        <!--copy buildnotes from plugin directories-->
-        <mkdir
-            dir="${resultDir}/buildnotes"/>
-        <copy
-            todir="${resultDir}/buildnotes"
-            flatten="true">
-            <fileset
-                dir="${buildDirectory}/plugins"
-                includes="**/buildnotes_*.html"/>
-            <fileset
-                dir="${buildDirectory}/features"
-                includes="**/buildnotes_*.html"/>
-        </copy>
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/full/logIndex.php"/>
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/testLogs/logIndex.php"/>
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/testSysErrorLogs/logIndex.php"/>
-    </target>
-    <target
-        name="updateSite">
-
-
-        <!-- get our authored, tokenized site.xml file -->
-        <copy
-            file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/siteWTP.xml"
-            tofile="${buildDirectory}/${buildLabel}/updateSite/site.xml"
-            overwrite="true"
-            failonerror="true"/>
-        <!--
-            get the ${buildDirectory}/finalPluginsVersions.properties,
-            and read as properties
-        -->
-        <!-- substitute property value for tokens -->
-        <replace
-            file="${buildDirectory}/${buildLabel}/updateSite/site.xml"
-            propertyfile="${buildDirectory}/finalFeaturesVersions.properties">
-            <replacefilter
-                token="@org.eclipse.wtp@"
-                property="org.eclipse.wtp"/>
-            <replacefilter
-                token="@org.eclipse.wtp.sdk@"
-                property="org.eclipse.wtp.sdk"/>
-            <replacefilter
-                token="@org.eclipse.jst@"
-                property="org.eclipse.jst"/>
-            <replacefilter
-                token="@org.eclipse.jst.sdk@"
-                property="org.eclipse.jst.sdk"/>
-            <replacefilter
-                token="@org.eclipse.jpt.feature@"
-                property="org.eclipse.jpt.feature"/>
-            <replacefilter
-                token="@org.eclipse.jpt_sdk.feature@"
-                property="org.eclipse.jpt_sdk.feature"/>
-        </replace>
-    </target>
-    <target
-        name="countFiles">
-        <!--
-            files.count is a file that should exist in the drop
-            directory with a count of the zip files in the same
-            directory. It is required to generate a link to the build on
-            the downloads page.
-        -->
-        <countBuildFiles
-            sourceDirectory="${resultDir}"
-            filterString=".zip,.tar.gz"
-            outputFile="${resultDir}/files.count"/>
-    </target>
-
-    <!--Build type descriptors-->
-    <target
-        name="I">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Integration"/>
-    </target>
-    <target
-        name="S">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Stable"/>
-    </target>
-    <target
-        name="N">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Nightly"/>
-    </target>
-    <target
-        name="M">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Maintenance"/>
-    </target>
-    <target
-        name="R">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Release"/>
-    </target>
-    <target
-        name="T">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Test"/>
-    </target>
-    <target
-        name="P">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Patches"/>
-    </target>
-    <target
-        name="checkIfTested">
-        <echo
-            level="debug"
-            message="isBuildTested: ${isBuildTested}"/>
-        <condition
-            property="doTests">
-            <equals
-                arg1="${isBuildTested}"
-                arg2="true"
-                trim="true"
-                casesensitive="false"/>
-        </condition>
-    </target>
-    <target
-        name="checkIfCompileLogs">
-        <condition
-            property="doCompileLogs">
-            <available
-                file="${outputDirectory}"/>
-        </condition>
-    </target>
-    <target
-        name="writeData">
-        <!--  Insert Build Date  -->
-        <replace
-            file="${resultingIndex}"
-            token="@date@"
-            value="${TODAY}"/>
-
-        <!--  Insert Build Name  -->
-        <replace
-            file="${resultingIndex}"
-            token="@build@"
-            value="${buildLabel}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@buildBranch@"
-            value="${buildBranch}"/>
-
-        <!--  Insert PreRequsites  -->
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformFile@"
-            value="${eclipseplatform.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformURL@"
-            value="${eclipseplatform.url}/${eclipseplatform.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformBuildURL@"
-            value="${eclipseplatform.url}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformfilelinux@"
-            value="${eclipseplatform.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformfilewindows@"
-            value="${eclipseplatform.file.win32-win32-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformfilemacos@"
-            value="${eclipseplatform.file.macosx-carbon-ppc}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformBuildHome@"
-            value="${eclipseplatform.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatform.mirror.prefixuri@"
-            value="${eclipseplatform.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatform.fspath.prefix@"
-            value="${eclipseplatform.fspath.prefix}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseFile@"
-            value="${eclipse.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseURL@"
-            value="${eclipse.url}/${eclipse.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseBuildURL@"
-            value="${eclipse.url}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilelinux@"
-            value="${eclipse.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilewindows@"
-            value="${eclipse.file.win32-win32-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilemacos@"
-            value="${eclipse.file.macosx-carbon-ppc}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseBuildHome@"
-            value="${eclipse.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipse.mirror.prefixuri@"
-            value="${eclipse.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipse.fspath.prefix@"
-            value="${eclipse.fspath.prefix}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@testURL@"
-            value="${eclipseTestFramework.url}/${eclipseTestFramework.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@testFile@"
-            value="${eclipseTestFramework.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfName@"
-            value="${emf.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfDescription@"
-            value="${emf.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfFile@"
-            value="${emf.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfURL@"
-            value="${emf.url}/${emf.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfBuildHome@"
-            value="${emf.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emf.mirror.prefixuri@"
-            value="${emf.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsourceURL@"
-            value="${emfsourcedoc.url}/${emfsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsourceFile@"
-            value="${emfsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsourceName@"
-            value="${emfsourcedoc.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsourceDescription@"
-            value="${emfsourcedoc.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsourceBuildHome@"
-            value="${emfsourcedoc.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsource.mirror.prefixuri@"
-            value="${emfsourcedoc.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsourceURL@"
-            value="${emfxsdsourcedoc.url}/${emfsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsourceFile@"
-            value="${emfxsdsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsourceName@"
-            value="${emfxsdsourcedoc.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsourceDescription@"
-            value="${emfxsdsourcedoc.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsourceBuildHome@"
-            value="${emfxsdsourcedoc.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsource.mirror.prefixuri@"
-            value="${emfxsdsourcedoc.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdFile@"
-            value="${emfxsd.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdName@"
-            value="${emfxsd.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdDescription@"
-            value="${emfxsd.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdURL@"
-            value="${emfxsd.url}/${emfxsd.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdBuildHome@"
-            value="${emfxsd.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsd.mirror.prefixuri@"
-            value="${emfxsd.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationFile@"
-            value="${emfvalidation.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationURL@"
-            value="${emfvalidation.url}/${emfvalidation.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationBuildHome@"
-            value="${emfvalidation.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidation.mirror.prefixuri@"
-            value="${emfvalidation.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationName@"
-            value="${emfvalidation.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationDescription@"
-            value="${emfvalidation.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsourceFile@"
-            value="${emfvalidationsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsourceURL@"
-            value="${emfvalidationsourcedoc.url}/${emfvalidationsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsourceBuildHome@"
-            value="${emfvalidationsourcedoc.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsource.mirror.prefixuri@"
-            value="${emfvalidationsourcedoc.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsourceName@"
-            value="${emfvalidationsourcedoc.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsourceDescription@"
-            value="${emfvalidationsourcedoc.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstName@"
-            value="${wst.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstDescription@"
-            value="${wst.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstFile@"
-            value="${wst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstURL@"
-            value="${wst.url}/${wst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstBuildHome@"
-            value="${wst.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wst.mirror.prefixuri@"
-            value="${wst.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstName@"
-            value="${jst.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstDescription@"
-            value="${jst.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstFile@"
-            value="${jst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstURL@"
-            value="${jst.url}/${jst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstBuildHome@"
-            value="${jst.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jst.mirror.prefixuri@"
-            value="${jst.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpName@"
-            value="${wtp.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpDescription@"
-            value="${wtp.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpFile@"
-            value="${wtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpURL@"
-            value="${wtp.url}/${wtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpBuildHome@"
-            value="${wtp.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtp.mirror.prefixuri@"
-            value="${wtp.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefFile@"
-            value="${gef.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefURL@"
-            value="${gef.url}/${gef.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefBuildHome@"
-            value="${gef.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gef.mirror.prefixuri@"
-            value="${gef.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefName@"
-            value="${gef.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefDescription@"
-            value="${gef.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipserelengFile@"
-            value="${eclipsereleng.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipserelengURL@"
-            value="${eclipsereleng.url}/${eclipsereleng.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipFile@"
-            value="${orbitthirdpartyzip.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipURL@"
-            value="${orbitthirdpartyzip.url}/${orbitthirdpartyzip.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipBuildHome@"
-            value="${orbitthirdpartyzip.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzip.mirror.prefixuri@"
-            value="${orbitthirdpartyzip.mirror.prefixuri}"/>
-
-
-        <!-- no longer used. Post 1.5.5 -->
-        <replace
-            file="${resultingIndex}"
-            token="@jemFile@"
-            value="${jem.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jemURL@"
-            value="${jem.url}/${jem.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jemBuildHome@"
-            value="${jem.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jem.mirror.prefixuri@"
-            value="${jem.mirror.prefixuri}"/>
-        <!--
-            these token/s should not exist in maintenance stream, but do
-            no harm done, so in the interests of keeping builder streams
-            in sync, we'll leave them here as place hold
-        -->
-        <replace
-            file="${resultingIndex}"
-            token="@dtpFile@"
-            value="${dtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtpURL@"
-            value="${dtp.url}/${dtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtpBuildHome@"
-            value="${dtp.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtp.mirror.prefixuri@"
-            value="${dtp.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtpName@"
-            value="${dtp.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtpDescription@"
-            value="${dtp.description}"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/vex.site/staticDropFiles/access_err.gif b/releng.wtpbuilder/distribution/vex.site/staticDropFiles/access_err.gif
deleted file mode 100644
index 4f0748a..0000000
--- a/releng.wtpbuilder/distribution/vex.site/staticDropFiles/access_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/vex.site/staticDropFiles/access_warn.gif b/releng.wtpbuilder/distribution/vex.site/staticDropFiles/access_warn.gif
deleted file mode 100644
index 8386e3e..0000000
--- a/releng.wtpbuilder/distribution/vex.site/staticDropFiles/access_warn.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/vex.site/staticDropFiles/buildNotes.php b/releng.wtpbuilder/distribution/vex.site/staticDropFiles/buildNotes.php
deleted file mode 100644
index f666887..0000000
--- a/releng.wtpbuilder/distribution/vex.site/staticDropFiles/buildNotes.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<html>
-<head>
-<?php
-$parts = explode("/", getcwd());
-$parts2 = explode("-", $parts[count($parts) - 1]);
-$buildName = $parts2[1];
-
-echo "<title>Build Notes for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Build Notes</font></b></p>
-
-<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"> Build Notes for <?php echo "$buildName"; ?></font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$hasNotes = false;
-$aDirectory = dir("buildnotes");
-while ($anEntry = $aDirectory->read()) {
-	if ($anEntry != "." && $anEntry != "..") {
-		//print_r($anEntry);
-		//echo "<br />";
-
-		$subject = $anEntry;
-		$pattern = '/^buildnotes_(.*)/i';
-		preg_match($pattern, $subject, $matches);
-		$subject = $matches[1];
-		//print_r($subject);
-		//echo "<br />";
-		$pattern = '/^(.*)\.html$/';
-		preg_match($pattern, $subject, $matches);
-		//print_r($matches);
-		//echo "<br />";
-
-		$component = $matches[1];
-
-		$line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
-		echo "<tr>";
-		echo "$line";
-		echo "</tr>";
-		$hasNotes = true;
-
-	}
-}
-$aDirectory.closedir();
-if (!$hasNotes) {
-	echo "<br>There are no build notes for this build.";
-}
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/vex.site/staticDropFiles/compile_err.gif b/releng.wtpbuilder/distribution/vex.site/staticDropFiles/compile_err.gif
deleted file mode 100644
index c2bfdd6..0000000
--- a/releng.wtpbuilder/distribution/vex.site/staticDropFiles/compile_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/vex.site/staticDropFiles/compile_warn.gif b/releng.wtpbuilder/distribution/vex.site/staticDropFiles/compile_warn.gif
deleted file mode 100644
index cf4fdf9..0000000
--- a/releng.wtpbuilder/distribution/vex.site/staticDropFiles/compile_warn.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/vex.site/staticDropFiles/consoleLogs.php b/releng.wtpbuilder/distribution/vex.site/staticDropFiles/consoleLogs.php
deleted file mode 100644
index 2ee3c36..0000000
--- a/releng.wtpbuilder/distribution/vex.site/staticDropFiles/consoleLogs.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<html>
-<head>
-<?php
-$parts = explode("/", getcwd());
-$parts2 = explode("-", $parts[count($parts) - 1]);
-$buildName = $parts2[1];
-
-echo "<title>Test Console Output for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-<title>Console Logs from Running JUnit Plug-in Tests</title>
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b></p>
-
-<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">Console output from running
-		JUnit plugin tests for <?php echo "$buildName"; ?> </font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$rootDir = "testResults/consolelogs";
-$hasNotes = false;
-$aDirectory = dir($rootDir);
-$index = 0;
-$dirindex = 0;
-while ($anEntry = $aDirectory->read()) {
-	if ($anEntry != "." && $anEntry != "..") {
-		if (is_file("$rootDir/$anEntry")) {
-			$entries[$index] = $anEntry;
-			$index++;
-		} else if (is_dir("$rootDir/$anEntry")) {
-			$direntries[$dirindex] = $anEntry;
-			$dirindex++;
-		}
-	}
-}
-$aDirectory->close();
-
-
-sort($entries);
-sort($direntries);
-
-for ($i = 0; $i < $dirindex; $i++) {
-	$anEntry = $direntries[$i];
-	$line = "<td><a href=\"testResults/consolelogs/$anEntry/logIndex.php\">$anEntry</a></td>";
-	echo "<tr>";
-	echo "$line";
-	echo "</tr>";
-}
-for ($i = 0; $i < $index; $i++) {
-	$anEntry = $entries[$i];
-	$logsize = filesize("testResults/consolelogs/$anEntry");
-
-
-	$level = 0;
-	if ($logsize > 20000) {
-		$level = 2;
-	}
-	else if ($logsize > 2000) {
-		$level = 1;
-	}
-
-	if ($level == 0) {
-		$line = "<td><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-	}
-	else if ($level == 1) {
-		$line = "<td><em><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-	} else if ($level == 2) {
-		$line = "<td><strong><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-	}
-
-
-	echo "<tr>";
-	echo "$line";
-	echo "</tr>";
-	$hasNotes = true;
-}
-
-if (!$hasNotes) {
-	echo "<br>There are no test logs for this build.";
-}
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/vex.site/staticDropFiles/junit_err.gif b/releng.wtpbuilder/distribution/vex.site/staticDropFiles/junit_err.gif
deleted file mode 100644
index 1b7ff9d..0000000
--- a/releng.wtpbuilder/distribution/vex.site/staticDropFiles/junit_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/vex.site/staticDropFiles/logIndex.php b/releng.wtpbuilder/distribution/vex.site/staticDropFiles/logIndex.php
deleted file mode 100644
index 721ca00..0000000
--- a/releng.wtpbuilder/distribution/vex.site/staticDropFiles/logIndex.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<html>
-<head>
-<?php
-
-function endsWith( $str, $sub ) {
-
-	return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub );
-}
-
-$parts = explode("/", getcwd());
-$parts2 = explode("-", $parts[count($parts) - 1]);
-$buildName = $parts2[1];
-
-echo "<title>Test Console Output for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-<title>Console Logs from Running JUnit Plug-in Tests</title>
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b></p>
-
-<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">Console output from running
-		JUnit plugin tests for <?php echo "$buildName"; ?> </font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$hasNotes = false;
-$aDirectory = dir(".");
-$index = 0;
-while ($anEntry = $aDirectory->read()) {
-	if ($anEntry != "." && $anEntry != ".." && !endsWith(__FILE__, $anEntry)) {
-		$entries[$index] = $anEntry;
-		$index++;
-	}
-}
-aDirectory.closedir();
-
-
-sort($entries);
-
-for ($i = 0; $i < $index; $i++) {
-	$anEntry = $entries[$i];
-	$logsize = filesize("$anEntry");
-
-
-	$level = 0;
-	if ($logsize > 20000) {
-		$level = 2;
-	}
-	else if ($logsize > 2000) {
-		$level = 1;
-	}
-
-	if ($level == 0) {
-		$line = "<td><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-	}
-	else if ($level == 1) {
-		$line = "<td><em><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-	} else if ($level == 2) {
-		$line = "<td><strong><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-	}
-
-
-	echo "<tr>";
-	echo "$line";
-	echo "</tr>";
-	$hasNotes = true;
-}
-
-if (!$hasNotes) {
-	echo "<br>There are no test logs for this build.";
-}
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/vex.site/staticDropFiles/miscUtil.php b/releng.wtpbuilder/distribution/vex.site/staticDropFiles/miscUtil.php
deleted file mode 100644
index 5001f38..0000000
--- a/releng.wtpbuilder/distribution/vex.site/staticDropFiles/miscUtil.php
+++ /dev/null
@@ -1,219 +0,0 @@
-<?php
-
-// todo: unsure if can handle filenames that are URLs?
-// handy constant to compute file size in megabytes
-
-function fileSizeInMegs($filename) {
-	$onemeg=1024*1024;
-	$zipfilesize=filesize($filename);
-	$zipfilesize=round($zipfilesize/$onemeg, 0);
-	return $zipfilesize;
-}
-
-function fileSizeForDisplay($filename) {
-	$onekilo=1024;
-	$onemeg=$onekilo * $onekilo;
-	$criteria = 10 * $onemeg;
-	$scaleChar = "M";
-	if (file_exists($filename)) {
-		$zipfilesize=filesize($filename);
-		if ($zipfilesize > $criteria) {
-			$zipfilesize=round($zipfilesize/$onemeg, 0);
-			$scaleChar = "M";
-		}
-		else {
-			$zipfilesize=round($zipfilesize/$onekilo, 0);
-			$scaleChar = "K";
-		}
-	}
-	else {
-		$zipfilesize = 0;
-	}
-	$result =  "(" . $zipfilesize . $scaleChar . ")";
-	return $result;
-}
-
-
-function displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription) {
-	echo "<td align=\"right\" valign=\"top\" width=\"30%\">";
-	echo "<a href=\"$downloadprefix$filename\">" . $fileShortDescription . "</a>";
-	echo "</td><td align=\"right\" valign=\"top\" width=\"3%\">";
-	echo $zipfilesize;
-	echo "</td>";
-	echo "<td align=\"right\" valign=\"top\" width=\"2%\">";
-	echo "[<a href=\"checksum/$filename.md5\">md5</a>]";
-	echo "</td>";
-}
-
-function resourceExist($url, $mirrorPrefixuri, $prereqfilename, $eclipseFSpathPrefix)
-{
-	$result = false;
-
-	$allowURLopen = ini_get('allow_url_fopen');
-
-	if ($allowURLopen && stream_last_modified($url)) {
-		$result = true;
-	}
-	else {
-		// TODO: for now, we'll do a raw check on the whole file name, since enable_url_open
-		// is off. better would be to check if we are on build.eclipse.org or download.eclipse.org?
-		$wholePath = trim($eclipseFSpathPrefix) . "/" . trim($mirrorPrefixuri) . "/" . trim($prereqfilename);
-		if (file_exists($wholePath)) {
-			$result = true;
-		}
-	}
-	return $result;
-}
-
-function stream_last_modified($url)
-{
-	if (function_exists('version_compare') && version_compare(phpversion(), '4.3.0') > 0)
-	{
-		if (!($fp = @fopen($url, 'r')))
-		return NULL;
-
-		$meta = stream_get_meta_data($fp);
-		for ($j = 0; isset($meta['wrapper_data'][$j]); $j++)
-		{
-			if (strstr(strtolower($meta['wrapper_data'][$j]), 'last-modified'))
-			{
-				$modtime = substr($meta['wrapper_data'][$j], 15);
-				break;
-			}
-		}
-		fclose($fp);
-	}
-	else
-	{
-		$parts = parse_url($url);
-		$host  = $parts['host'];
-		$path  = $parts['path'];
-
-		if (!($fp = @fsockopen($host, 80)))
-		return NULL;
-
-		$req = "HEAD $path HTTP/1.0\r\nUser-Agent: PHP/".phpversion()."\r\nHost: $host:80\r\nAccept: */*\r\n\r\n";
-		fputs($fp, $req);
-
-		while (!feof($fp))
-		{
-			$str = fgets($fp, 4096);
-			if (strstr(strtolower($str), 'last-modified'))
-			{
-				$modtime = substr($str, 15);
-				break;
-			}
-		}
-		fclose($fp);
-	}
-	return isset($modtime) ? strtotime($modtime) : time();
-}
-
-function isMirrored($uriToCheck) {
-	global $debugScript;
-	global $debugFunctions;
-	$localuri = $uriToCheck;
-
-	$debugMirrorList = false;
-	if ($debugScript) {
-		echo "uriToCheck: " . $localuri . "<br />";
-	}
-
-	$xmlcount = 0;
-
-	/* This method true and accurate method of parsing mirror results
-	 * may be expensive, and would
-	 * likely cause artificially high counts of "downloads".
-	 * Could maybe use if somehow only checked once ever 5 minutes or something.
-
-
-	 // turn off warnings, as sometimes HTML is returned, which causes lots of warnings
-	 $holdLevel = error_reporting(E_ERROR);
-	 $mirrorsxml=simplexml_load_file(rawurlencode($localuri) . urlencode("&format=xml"));
-	 error_reporting($holdLevel);
-
-
-	 if ($mirrorsxml) {
-	 if ($debugFunctions) {
-	 echo "root node: " . $mirrorsxml->getName() . "<br />";
-	 }
-	 if (strcmp($mirrorsxml->getName(), "mirrors") == 0) {
-	 foreach ($mirrorsxml->children() as $mirror) {
-	 if (strcmp($mirror->getName(),"mirror") == 0) {
-	 $xmlcount=$xmlcount+1;
-	 }
-	 if ($debugMirrorList) {
-	 print_r($mirror);
-	 echo "<br />";
-	 }
-	 }
-	 }
-	 if ($debugFunctions) {
-	 echo "Mirror count: " . $xmlcount . "<br />";
-	 }
-	 }
-	 */
-	/*
-	 * Use simple heuristic based on pattern
-	 * in the URI ... if it contains "/downloads/" then assume it's mirrored
-	 */
-	if (strpos($uriToCheck, "webtools/downloads/") > 0) {
-		$xmlcount = 1;
-	}
-	return ($xmlcount > 0);
-
-}
-
-// TODO: replace with Phoenix variables
-function getPlatform () {
-	global $debugScript;
-	global $debugFunctions;
-	// getBrowser is expensive, so cache the data
-	static $browser;
-	$platform = "unknown";
-
-
-	if(ini_get("browscap")) {
-		if(!isset($browser)){
-			$browser = get_browser(null, true);
-		}
-
-		if ($browser) {
-			$rawPlatform = $browser['platform'];
-			if ($debugFunctions) {
-				echo "browser platfrom: " . $rawPlatform . "<br />" ;
-			}
-
-			if ($debugFunctions) {
-				$browserKeys = array_keys($browser);
-				foreach ($browserKeys as $key) {
-					echo $key . ": " . $browser[$key] . "<br />";
-				}
-			}
-		}
-		if (strpos($rawPlatform, "Win") === 0) {
-			$platform="windows";
-		} else if (strpos($rawPlatform, "Linux") === 0) {
-			$platform="linux";
-		} else if (strpos($rawPlatform, "Mac") === 0) {
-			$platform="mac";
-		}
-	}
-	return $platform;
-}
-
-
-function getPrereqReferenceOrName($eclipseMirrorScript, $mirrorPrefixuri, $prerequrl, $prereqfilename, $eclipseFSpathPrefix) {
-	// todo: we really only need "if exists" so could make a bit more efficient
-	// I tried "file_exists" but is didn't seem to work on my test server
-	// For these pre-reqs, we assume if they exist, they are mirrored. This is true
-	// 99% of the time.
-
-	if (resourceExist($prerequrl, $mirrorPrefixuri, $prereqfilename, $eclipseFSpathPrefix)) {
-		$reflink="<a href=\"" . $eclipseMirrorScript . $mirrorPrefixuri . "/" . $prereqfilename . "\">" . $prereqfilename . "</a>";
-	} else {
-		$reflink=$prereqfilename;
-	}
-	return $reflink;
-}
-?>
diff --git a/releng.wtpbuilder/distribution/vex.site/staticDropFiles/pending.gif b/releng.wtpbuilder/distribution/vex.site/staticDropFiles/pending.gif
deleted file mode 100644
index 66db2a6..0000000
--- a/releng.wtpbuilder/distribution/vex.site/staticDropFiles/pending.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/vex.site/staticDropFiles/pending1.gif b/releng.wtpbuilder/distribution/vex.site/staticDropFiles/pending1.gif
deleted file mode 100644
index 1b2ea6e..0000000
--- a/releng.wtpbuilder/distribution/vex.site/staticDropFiles/pending1.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/vex.site/staticDropFiles/report2.php b/releng.wtpbuilder/distribution/vex.site/staticDropFiles/report2.php
deleted file mode 100644
index cb68e7b..0000000
--- a/releng.wtpbuilder/distribution/vex.site/staticDropFiles/report2.php
+++ /dev/null
@@ -1,45 +0,0 @@
-
-<?php
-
-function parse_testResults($filename)
-{
-	$junitFailures = 0;
-	if (is_file($filename)) {
-		$handle = @fopen($filename, "r");
-		if ($handle)
-		{
-			$size = filesize($filename);
-			$content = fread($handle, $size);
-			fclose($handle);
-			$junitStart = strpos($content, "Errors &amp; Failures");
-			$junitEnd = strpos($content, "</table>", $junitStart);
-			$junitInfo = substr($content, $junitStart, $junitEnd - $junitStart);
-			$start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">");
-			while ($start !== false)
-			{
-				$start += 29;
-				$stop = strpos($junitInfo, "</font></b></td>", $start);
-				if ($stop !== false)
-				{
-					$result = substr($junitInfo, $start, $stop - $start);
-					if (is_numeric($result))
-					{
-						$junitFailures += $result;
-					}
-					else if (strcmp($result, "DNF") == 0)
-					{
-						$junitFailures++;
-					}
-				}
-				$start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">", $stop);
-			}
-			$results = array($junitFailures);
-			return $results;
-		}
-	}
-}
-
-
-?>
-
-
diff --git a/releng.wtpbuilder/distribution/vex.site/templateFiles/compileResults.php.template b/releng.wtpbuilder/distribution/vex.site/templateFiles/compileResults.php.template
deleted file mode 100644
index f785771..0000000
--- a/releng.wtpbuilder/distribution/vex.site/templateFiles/compileResults.php.template
+++ /dev/null
@@ -1,76 +0,0 @@
-<html>
-<head>
-
-<?php
-        $parts = explode("/", getcwd());
-        $parts2 = explode("-", $parts[count($parts) - 1]);
-        $buildName = $parts2[1];
-
-        echo "<title>Compile Logs: Code Bundles for $buildName</title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2%;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-}
-</style>
-</head>
-<body>
-
-<?php
-        echo "<h1>Compile Logs: Code Bundles for $buildName</h1>";
-?>
-
-
-<table id=tabledata align = "center" width="75%" border="1">
-  <tr>
-    <td class="bold" align="center">Compile Logs</td>
-    <td class="bold" align="center">Compile Errors</td>
-    <td class="bold" align="center">Compiler Warnings</td>
-    <td class="bold" align="center">Access Violations</td>
-    <td class="bold" align="center">Access Warnings</td>
-  </tr>
-
-  %compilelogs%
-
-</table>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/vex.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/vex.site/templateFiles/index.html.template.php
deleted file mode 100644
index bf628ac..0000000
--- a/releng.wtpbuilder/distribution/vex.site/templateFiles/index.html.template.php
+++ /dev/null
@@ -1,850 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<?php
-
-ini_set("display_errors", "true");
-error_reporting (E_ALL);
-
-
-$buildBranch="@buildBranch@";
-$build="@build@";
-$type="@type@";
-$builddate="@date@";
-
-$eclipseMirrorPrefixuri="@eclipse.mirror.prefixuri@";
-$eclipseFSpathPrefix="@eclipse.fspath.prefix@";
-
-$eclipsefilelinux="@eclipsefilelinux@";
-$eclipsefilewindows="@eclipsefilewindows@";
-$eclipsefilemacosx="@eclipsefilemacos@";
-
-$eclipseURL="@eclipseURL@";
-$eclipseFile="@eclipseFile@";
-$eclipseBuildURL="@eclipseBuildURL@";
-$eclipseBuildHome="@eclipseBuildHome@";
-$eclipseName="@eclipseName@";
-$eclipseDescription="@eclipseDescription@";
-
-$eclipseplatformMirrorPrefixuri="@eclipseplatform.mirror.prefixuri@";
-$eclipseplatformFSpathPrefix="@eclipse.fspath.prefix@";
-
-$eclipseplatformfilelinux="@eclipseplatformfilelinux@";
-$eclipseplatformfilewindows="@eclipseplatformfilewindows@";
-$eclipseplatformfilemacosx="@eclipseplatformfilemacos@";
-
-$eclipseplatformURL="@eclipseplatformURL@";
-$eclipseplatformFile="@eclipseplatformFile@";
-$eclipseplatformBuildURL="@eclipseplatformBuildURL@";
-$eclipseplatformBuildHome="@eclipseplatformBuildHome@";
-$eclipseplatformName="@eclipseplatformName@";
-$eclipseplatformDescription="@eclipseplatformDescription@";
-
-$testURL="@testURL@";
-$testFile="@testFile@";
-
-$wstURL="@wstURL@";
-$wstFile="@wstFile@";
-$wstMirrorPrefixuri="@wst.mirror.prefixuri@";
-$wstBuildHome="@wstBuildHome@";
-$wstName="@wstName@";
-$wstDescription="@wstDescription@";
-
-$jstURL="@jstURL@";
-$jstFile="@jstFile@";
-$jstMirrorPrefixuri="@jst.mirror.prefixuri@";
-$jstBuildHome="@jstBuildHome@";
-$jstName="@jstName@";
-$jstDescription="@jstDescription@";
-
-$wtpURL="@wtpURL@";
-$wtpFile="@wtpFile@";
-$wtpMirrorPrefixuri="@wtp.mirror.prefixuri@";
-$wtpBuildHome="@wtpBuildHome@";
-$wtpName="@wtpName@";
-$wtpDescription="@wtpDescription@";
-
-$gefURL="@gefURL@";
-$gefFile="@gefFile@";
-$gefMirrorPrefixuri="@gef.mirror.prefixuri@";
-$gefBuildHome="@gefBuildHome@";
-$gefName="@getName@";
-$gefDescription="@gefDescription@";
-
-$emfURL="@emfURL@";
-$emfFile="@emfFile@";
-$emfMirrorPrefixuri="@emf.mirror.prefixuri@";
-$emfBuildHome="@emfBuildHome@";
-$emfName="@emfName@";
-$emfDescription="@emfDescription@";
-
-$emfsourceURL="@emfsourceURL@";
-$emfsourceFile="@emfsourceFile@";
-$emfsourceMirrorPrefixuri="@emfsource.mirror.prefixuri@";
-$emfsourceBuildHome="@emfsourceBuildHome@";
-$emfsourceName="@emfsourceName@";
-$emfsourceDescription="@emfsourceDescription@";
-
-
-$emfxsdURL="@emfxsdURL@";
-$emfxsdFile="@emfxsdFile@";
-$emfxsdMirrorPrefixuri="@emfxsd.mirror.prefixuri@";
-$emfxsdBuildHome="@emfxsdBuildHome@";
-$emfxsdName="@emfxsdName@";
-$emfxsdDescription="@emfxsdDescription@";
-
-$emfxsdsourceURL="@emfxsdsourceURL@";
-$emfxsdsourceFile="@emfxsdsourceFile@";
-$emfxsdsourceMirrorPrefixuri="@emfxsdsource.mirror.prefixuri@";
-$emfxsdsourceBuildHome="@emfxsdsourceBuildHome@";
-$emfxsdsourceName="@emfxsdsourceName@";
-$emfxsdsourceDescription="@emfxsdsourceDescription@";
-
-
-$emfvalidationURL="@emfvalidationURL@";
-$emfvalidationFile="@emfvalidationFile@";
-$emfvalidationMirrorPrefixuri="@emfvalidation.mirror.prefixuri@";
-$emfvalidationBuildHome="@emfvalidationBuildHome@";
-$emfvalidationName="@emfvalidationName@";
-$emfvalidationDescription="@emfvalidationDescription@";
-
-$emfvalidationsourceURL="@emfvalidationsourceURL@";
-$emfvalidationsourceFile="@emfvalidationsourceFile@";
-$emfvalidationsourceMirrorPrefixuri="@emfvalidationsource.mirror.prefixuri@";
-$emfvalidationsourceBuildHome="@emfvalidationsourceBuildHome@";
-$emfvalidationsourceName="@emfvalidationsourceName@";
-$emfvalidationsourceDescription="@emfvalidationsourceDescription@";
-
-
-$dtpURL="@dtpURL@";
-$dtpFile="@dtpFile@";
-$dtpMirrorPrefixuri="@dtp.mirror.prefixuri@";
-$dtpBuildHome="@dtpBuildHome@";
-$dtpName="@dtpName@";
-$dtpDescription="@dtpDescription@";
-
-
-$eclipserelengFile="@eclipserelengFile@";
-$eclipserelengURL="@eclipserelengURL@";
-$orbitthirdpartyzipFile="@orbitthirdpartyzipFile@";
-$orbitthirdpartyzipURL="@orbitthirdpartyzipURL@";
-$orbitthirdpartyzipBuildHome="@orbitthirdpartyzipBuildHome@";
-$orbitthirdpartyzipMirrorPrefixuri="@orbitthirdpartyzip.mirror.prefixuri@";
-
-
-$prereq_eclipse="true";
-$prereq_eclipseplatform="false";
-$prereq_emf="true";
-$prereq_emfxsd="true";
-$prereq_emfvalidation="false";
-$prereq_gef="true";
-$prereq_dtp="false";
-$prereq_wst="true";
-$prereq_jst="false";
-$prereq_wtp="false";
-
-
-include("miscUtil.php");
-
-
-
-
-$debugScript = false;
-$debugFunctions = false;
-
-$defaultMirrorScript="";
-$defaultWTPMirrorPrefix="./";
-
-$eclipseMirrorScript="http://www.eclipse.org/downloads/download.php?file=";
-
-// TODO: improve so this hard coding isn't required.
-// This depends on the declare script changing webtools/committers to webtools/downloads
-// And, the logic is such that if it is not mirrored, this URI is not used at all, just
-// a relative reference only
-$eclipseWTPMirrorPrefix="/webtools/committers/drops/$buildBranch/$build/";
-
-
-$mirrorScript=$defaultMirrorScript;
-$downloadprefix=$defaultWTPMirrorPrefix;
-
-
-$keytestMirrorString=$eclipseMirrorScript . "$eclipseWTPMirrorPrefix/wtp-incubator-xml.vex-sdk-$build.zip";
-if (isMirrored($keytestMirrorString) ) {
-	$mirrorScript=$eclipseMirrorScript;
-	$downloadprefix="${mirrorScript}${eclipseWTPMirrorPrefix}";
-}
-
-if ($debugScript)  {
-	echo "inferred platform: " . getPlatform();
-}
-
-
-// our summary results handling requires php 5 (for simple xml file loading)
-// so, if not php 5, just don't display any summary results
-// This was found to be required, since some mirror our whole site (e.g. IBM)
-// and not all mirrors use PHP 5
-$displayTestSummary=false;
-if (phpversion() >= 5) {
-
-	$code_totalBundles=0;
-	$code_totalErrors=0;
-	$code_totalWarnings=0;
-	$code_totalforbiddenAccessWarningCount=0;
-	$code_totaldiscouragedAccessWarningCount=0;
-
-	$test_totalBundles=0;
-	$test_totalErrors=0;
-	$test_totalWarnings=0;
-	$test_totalforbiddenAccessWarningCount=0;
-	$test_totaldiscouragedAccessWarningCount=0;
-
-
-	$displayTestSummary=true;
-	// expecting grandTotalErrors and grandTotalTests
-	$filename = "unitTestsSummary.xml";
-	if (file_exists($filename)) {
-		$prefix = "unitTests_";
-		$unitTestsSummary = simplexml_load_file($filename);
-		foreach ($unitTestsSummary->summaryItem as $summaryItem) {
-			$name = $summaryItem->name;
-			$value = $summaryItem->value;
-			$code= "\$" . $prefix . $name . " = " . $value . ";";
-			//echo "<br />code: " . $code;
-			eval($code);
-		}
-	}
-
-	$filename = "compilelogsSummary.xml";
-	if (file_exists($filename)) {
-		$prefix = "code_";
-		$compileSummary = simplexml_load_file($filename);
-		foreach ($compileSummary->summaryItem as $summaryItem) {
-			$name = $summaryItem->name;
-			$value = $summaryItem->value;
-			$code= "\$" . $prefix . $name . " = " . $value . ";";
-			//echo "<br />code: " . $code;
-			eval($code);
-		}
-	}
-
-	$filename = "testcompilelogsSummary.xml";
-	if (file_exists($filename)) {
-		$prefix = "test_";
-		$compileSummary = simplexml_load_file($filename);
-		foreach ($compileSummary->summaryItem as $summaryItem) {
-			$name = $summaryItem->name;
-			$value = $summaryItem->value;
-			$code= "\$" . $prefix . $name . " = " . $value . ";";
-			//echo "<br />code: " . $code;
-			eval($code);
-		}
-	}
-}
-
-$incubating="true";
-
-
-
-if ($incubating) {
-	echo '<title>WTP Incubator Downloads</title>';
-}
-else {
-	echo '<title>WTP Downloads</title>';
-}
-
-
-?>
-
-
-</head>
-
-<body>
-
-
-<?php
-
-// tiny banner to remind when looking at "local" machine results
-$serverName = $_SERVER["SERVER_NAME"];
-
-if (!stristr($serverName, "eclipse.org") && !stristr($serverName,"you.are.at.eclipsecon.org")) {
-	echo '<center>
-          <p>
-          Reminder: this is <font color="#FF0000">' .
-	$serverName .
-        '</font>
-          See also
-          <a href="http://download.eclipse.org/webtools/downloads" target="_top">the live public Eclipse site</a>.
-          </p>
-          <hr />
-          </center>';
-
-}
-?>
-
-<?php if ("true" === $incubating) {
-	echo "<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH=\"100%\">";
-	echo "	<tr>";
-	echo "		<td ALIGN=left><font face=\"'Bitstream Vera',Helvetica,Arial\" size=\"+2\"><b><?php echo \"$type\";?>";
-	echo "        Build: $build</b></font></td>";
-	echo "		<td align=\"right\" rowspan=\"3\"><a";
-	echo "			href=\"http://www.eclipse.org/projects/what-is-incubation.php\"><img";
-	echo "			src=\"http://www.eclipse.org/images/egg-incubation.png\"";
-	echo "			alt=\"Incubation\" align=\"middle\" border=\"0\"></a></td>";
-
-
-	echo "	<tr valign=\"top\">";
-	echo "		<td><font size=\"-1\">" . $builddate . "</font></td>";
-	echo "	</tr>";
-	echo "	<tr valign=\"top\">";
-	echo "		<td>";
-	echo "		<p>The Eclipse Web Tools Platform (WTP) Incubator Project provides";
-	echo "		tools for development that are just getting started, or are";
-	echo "		experimental in some fashion.</p>";
-	echo "		</td>";
-	echo "	</tr>";
-	echo "</table>";
-
-} else {
-
-	echo "<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH=\"100%\">";
-	echo "	<tr>";
-	echo "		<td ALIGN=left><font face=\"'Bitstream Vera',Helvetica,Arial\" size=\"+2\"><b>$type";
-	echo "		Build: " . $build . "</b></font></td>";
-
-	echo "	<tr valign=\"top\">";
-	echo "		<td><font size=\"-1\">" . $builddate . "</font></td>";
-	echo "	</tr>";
-	echo "	<tr valign=\"top\">";
-	echo "		<td>";
-	echo "		<p>Component build from the Eclipse Web Tools Platform (WTP) Project.</p>";
-	echo "		</td>";
-	echo "	</tr>";
-	echo "</table>";
-
-} ?>
-
-<!-- ***********  Prerequisites **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-	<tr>
-		<td align="left" valign="top" bgcolor="#0080C0"><font
-			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Prerequisites
-		and Handy Extras</font></td>
-	</tr>
-	<tr>
-		<td>
-		<p>These are the prerequisites to build or run these packages. All are
-		not necessarily required, but instead some subset. Also listed are
-		some frequently needed links for committer-required packages when
-		creating new development environments, or targets to run against.</p>
-		<p>Note that WTP requires Java 5 or higher (and, for some things,
-		actually requires a JDK rather than only a JRE) even though many other
-		<a href="http://www.eclipse.org/downloads/">Eclipse Projects</a> can
-		run with <a href="http://www.eclipse.org/downloads/moreinfo/jre.php">other
-		JRE levels</a>.</p>
-		<p></p>
-		</td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=1 cellpadding=1 width="90%" align="center">
-
-		<?php
-		if ("true" === $prereq_eclipseplatform) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td width=\"40%\">Eclipse Platform</td>";
-
-
-			//customize page depending on user's browser/platform, if we can detect it
-			$usersPlatform = getPlatform();
-			// assume windows by default, since likely most frequent, even for cases where
-			// platform is "unknown". I've noticed Opera reports 'unknown' :(
-			$recommendedFile=$eclipseplatformfilewindows;
-			if (strcmp($usersPlatform,"linux")== 0) {
-				$recommendedFile=$eclipseplatformfilelinux;
-			} else if (strcmp($usersPlatform,"mac") == 0) {
-				$recommendedFile=$eclipseplatformfilemacosx;
-			}
-
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $eclipseplatformBuildURL . "\">appropriate platform</a>";
-			echo " or <a href=\"" . $eclipseplatformBuildHome . "\">equivalent</a></td>";
-
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_eclipse) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td width=\"40%\">Eclipse SDK (Platform, JDT)</td>";
-
-
-			//customize page depending on user's browser/platform, if we can detect it
-			$usersPlatform = getPlatform();
-			// assume windows by default, since likely most frequent, even for cases where
-			// platform is "unknown". I've noticed Opera reports 'unknown' :(
-			$recommendedFile=$eclipsefilewindows;
-			if (strcmp($usersPlatform,"linux")== 0) {
-				$recommendedFile=$eclipsefilelinux;
-			} else if (strcmp($usersPlatform,"mac") == 0) {
-				$recommendedFile=$eclipsefilemacosx;
-			}
-
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $eclipseBuildURL . "\">appropriate platform</a>";
-			echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_emf) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $emfName . "&nbsp;" . $emfDescription ;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $emfMirrorPrefixuri, $emfURL, $emfFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $emfBuildHome . "\">equivalent</a></td>";
-			echo " </tr>";
-		}
-		?>
-
-
-		<?php
-		if ("true" === $prereq_emfxsd) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $emfxsdName . "&nbsp;" . $emfxsdDescription ;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdMirrorPrefixuri, $emfxsdURL, $emfxsdFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $emfxsdBuildHome . "\">equivalent</a></td>";
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_emfvalidation) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $emfvalidationName  . "&nbsp;" . $emfvalidationDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $emfvalidationMirrorPrefixuri, $emfvalidationURL, $emfvalidationFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $emfvalidationBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_gef) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $gefName  . "&nbsp;" . $gefDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $gefMirrorPrefixuri, $gefURL, $gefFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $gefBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_dtp) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $dtpName . "&nbsp;" . $dtpDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $dtpMirrorPrefixuri, $dtpURL, $dtpFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $dtpBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_wst) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $wstName . "&nbsp;" . $wstDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $wstMirrorPrefixuri, $wstURL, $wstFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $wstBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_jst) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $jstName . "&nbsp;" . $jstDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $jstMirrorPrefixuri, $jstURL, $jstFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $jstBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-		<?php
-		if ("true" === $prereq_wtp) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $wtpName . "&nbsp;" . $wtpDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $wtpMirrorPrefixuri, $wtpURL, $wtpFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $wtpBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-			<tr valign="middle">
-				<td width="10%"></td>
-				<td colspan="2">
-				<hr />
-				</td>
-			</tr>
-
-
-
-			<?php
-			if ("true" === $prereq_emf) {
-				echo "<tr valign=\"top\">";
-				echo "<td width=\"10%\"></td>";
-				echo "<td>";
-				echo $emfsourceName . "&nbsp;" . $emfsourceDescription;
-				echo "</td> ";
-				echo "<td align=\"right\">";
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfsourceMirrorPrefixuri, $emfsourceURL, $emfsourceFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $emfsourceBuildHome . "\">equivalent</a></td>";
-				echo "</tr>";
-			}
-			?>
-			<?php
-			if ("true" === $prereq_emfxsd) {
-				echo "<tr valign=\"top\">";
-				echo "<td width=\"10%\"></td>";
-				echo "<td>";
-				echo $emfxsdsourceName . "&nbsp;" . $emfxsdsourceDescription;
-				echo "</td> ";
-				echo "<td align=\"right\">";
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdsourceMirrorPrefixuri, $emfxsdsourceURL, $emfxsdsourceFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $emfxsdsourceBuildHome . "\">equivalent</a></td>";
-				echo "</tr>";
-			}
-			?>
-
-			<?php
-			if ("true" === $prereq_emfvalidation) {
-				echo "<tr valign=\"top\">";
-				echo "<td width=\"10%\"></td>";
-				echo "<td>";
-				echo $emfvalidationsourceName . "&nbsp;" . $emfvalidationsourceDescription;
-				echo "</td> ";
-				echo "<td align=\"right\">";
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfvalidationsourceMirrorPrefixuri, $emfvalidationsourceURL, $emfvalidationsourceFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $emfvalidationsourceBuildHome . "\">equivalent</a></td>";
-				echo "</tr>";
-			}
-			?>
-
-			<?php
-			if (true) {
-				echo "<tr valign=\"top\">";
-				echo "<td width=\"10%\"></td>";
-				echo "<td>";
-				echo "Eclipse Test Framework (required only for Automated JUnit tests)";
-				echo "</td> ";
-				echo "<td align=\"right\">";
-
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $testURL, $testFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-				echo "</tr>";
-			}
-			?>
-
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>Eclipse releng tool (required only for committers to more easily
-				"release" code to a build)</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipserelengURL, $eclipserelengFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>Third Party code from Orbit. Not required and is currently much
-				more than needed for WTP, but some committers like using to create a
-				PDE target.</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $orbitthirdpartyzipMirrorPrefixuri, $orbitthirdpartyzipURL, $orbitthirdpartyzipFile,$eclipseFSpathPrefix);
-				echo " or <a href=\"" . $orbitthirdpartyzipBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-		</table>
-		</td>
-	</tr>
-</table>
-
-<!-- ***********  WTP **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-	<tr>
-		<td align=left valign=top colspan="5" bgcolor="#0080C0"><font
-			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF"> Web Tools
-		Platform</font></td>
-	</tr>
-
-	<tr>
-		<td align="left" valign="top" colspan="5">
-		<p>The Zip files includes the features and plugins for the WTP Incubator VEX Component.</p>
-		</td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
-
-
-			<tr>
-				<td align="left" valign="top" width="10%"><b>Minimal</b></td>
-				<td align="left" valign="top">
-				<p>Executable code only.</p>
-				</td>
-				<?php
-				$zipfilename="wtp-incubator-xml.vex-${build}";
-				$filename=$zipfilename.".zip";
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription="vex";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-				?>
-			</tr>
-
-			<tr>
-				<td align="left" valign="top" width="10%"><b>SDK</b></td>
-				<td align="left" valign="top">
-				<p>Executable code and source code.</p>
-				</td>
-				<?php
-				$zipfilename="wtp-incubator-xml.vex-sdk-${build}";
-				$filename=$zipfilename.".zip";
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription="vex sdk";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-				?>
-			</tr>
-			<tr>
-				<td align="left" valign="top" width="10%"><b>Tests</b></td>
-				<td align="left" valign="top">
-				<p>Unit tests.</p>
-				</td>
-				<?php
-				$zipfilename="wtp-incubator-xml.vex-tests-${build}";
-				$filename=$zipfilename.".zip";
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription="vex tests";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-				?>
-			</tr>
-		</table>
-		</td>
-	
-	
-	<tr>
-
-</table>
-
-
-
-
-
-
-
-<!-- ***********  Build Status **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-	<tr>
-		<td align=left valign=top bgcolor="#0080C0"><font
-			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Status, tests
-		and other interesting details</font></td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
-
-			<tr>
-				<td><!-- 
-				Its silly to always display 'Build notes', but hard to 
-				compute if required or not. 
-				<a href="buildNotes.php">Build notes</a> <br /> 
-				--> <a href="directory.txt">map files</a> <br />
-				<?php
-
-				if ($displayTestSummary) {
-
-
-					if (isset($unitTests_grandTotalErrors)) {
-						$errorColor="green";
-						if ($unitTests_grandTotalErrors > 0) {
-							$errorColor="red";
-						}
-						echo "<a href=\"testResults.php\">Unit test results</a>&nbsp;";
-						echo "<img src=\"junit_err.gif\"/><font color=\"" . $errorColor . "\">" . $unitTests_grandTotalErrors . "</font>&nbsp;&nbsp;Total: " . $unitTests_grandTotalTests;
-					}
-					else {
-						// we hardly ever "pend" anymore ... abscense usually signifies no tests or a build error.
-						echo "<br /><font color=\"orange\">Unit tests don't exists, are pending, or there's a build error.</font>";
-						//&nbsp;&nbsp;<img src=\"pending.gif\"/>";
-					}
-
-					echo "<br />";
-					echo "<a href=\"compileResults.php\">Compile logs: Code Bundles</a>";
-
-					echo "&nbsp;&nbsp;($code_totalBundles)&nbsp;&nbsp;";
-					echo "<img src=\"compile_err.gif\"/><font color=red>$code_totalErrors</font>&nbsp;";
-					echo "<img src=\"compile_warn.gif\"/><font color=orange>$code_totalWarnings</font>&nbsp;";
-					echo "<img src=\"access_err.gif\"/><font color=red>$code_totalforbiddenAccessWarningCount</font>&nbsp;";
-					echo "<img src=\"access_warn.gif\"/><font color=orange>$code_totaldiscouragedAccessWarningCount</font>&nbsp;";
-
-					echo "<br />";
-					echo "<a href=\"testCompileResults.php\">Compile logs: Test Bundles</a>";
-
-					echo "&nbsp;&nbsp;($test_totalBundles)&nbsp;&nbsp;";
-					echo "<img src=\"compile_err.gif\"/><font color=red>$test_totalErrors</font>&nbsp;";
-					echo "<img src=\"compile_warn.gif\"/><font color=orange>$test_totalWarnings</font>&nbsp;";
-					echo "<img src=\"access_err.gif\"/><font color=red>$test_totalforbiddenAccessWarningCount</font>&nbsp;";
-					echo "<img src=\"access_warn.gif\"/><font color=orange>$test_totaldiscouragedAccessWarningCount</font>&nbsp;";
-				}
-
-				?> <br />
-
-				<?php
-				if (file_exists("versioningReportName.php")) {
-					include "versioningReportName.php";
-					$fname="${versionReportFilename}.html";
-					if (file_exists($fname)) {
-						echo "<br /> <a href='$fname'>Versioning Information</a>";
-					}
-}
-?> <?php
-echo "<br />";
-if (file_exists("./apiresults/api-progress.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-progress.html\">API Progress Report</a>";
-}
-if (file_exists("./apiresults/api-info-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-info-summary.html\">APIs Defined by Each Component</a>";
-}
-if (file_exists("./apiresults/api-ref-compatibility.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-ref-compatibility.html\">Adopter Breakage Report</a>";
-}
-if (file_exists("./apiresults/api-violation-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-violation-summary.html\">API Violations</a>";
-}
-if (file_exists("./apiresults/component-api-violation-all.html"))
-{
-	echo "<br /> <a href=\"apiresults/component-api-violation-all.html\">Non-API dependencies</a>";
-}
-if (file_exists("./apiresults/api-tc-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-tc-summary.html\">API Test Coverage</a>";
-}
-if (file_exists("./apiresults/api-javadoc-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-javadoc-summary.html\">API Javadoc Coverage</a>";
-}
-if (file_exists("./apiresults/api-tc-summary.html"))
-{
-	echo "<br /><br /> <a href=\"apiresults/full_test_coverage/api-tc-summary.html\">Test Coverage for All Classes and Methods</a>";
-}
-?> <?php
-if (file_exists("./perfresults/graph/performance.php"))
-{
-	echo "<br />";
-	echo "<br /> <a href=\"perfresults/graph/performance.php\">Performance Results</a>";
-	echo "<br />";
-}
-?></td>
-			</tr>
-
-
-		</table>
-		</td>
-	</tr>
-</table>
-
-
-
-<!-- footer -->
-<center>
-<hr>
-<p>All downloads are provided under the terms and conditions of the <a
-	href="http://www.eclipse.org/legal/notice.html">Eclipse.org Software
-User Agreement</a> unless otherwise specified.</p>
-
-<p>If you have problems downloading the drops, contact the <font
-	face="'Bitstream Vera',Helvetica,Arial" size="-1"><a
-	href="mailto:webmaster@eclipse.org">webmaster</a></font>.</p>
-
-</center>
-<!-- end footer -->
-
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/vex.site/templateFiles/siteEnablingFeatures.xml b/releng.wtpbuilder/distribution/vex.site/templateFiles/siteEnablingFeatures.xml
deleted file mode 100644
index cc3ed81..0000000
--- a/releng.wtpbuilder/distribution/vex.site/templateFiles/siteEnablingFeatures.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-    <description> The update site contains the enabling features. </description>
-    <category-def
-        name="Enabling Features"
-        label="Enabling Features">
-        <description> This category contains features used by several
-            projects that enable some functionality, but which by
-            themselves are not very interesting. </description>
-    </category-def>
-</site>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/vex.site/templateFiles/siteWTP.xml b/releng.wtpbuilder/distribution/vex.site/templateFiles/siteWTP.xml
deleted file mode 100644
index f94e83f..0000000
--- a/releng.wtpbuilder/distribution/vex.site/templateFiles/siteWTP.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site
-    pack200="true"
-    mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/webtools/testUpdates/site.xml&amp;format=xml"
-    digestURL="http://download.eclipse.org/webtools/testUpdates/">
-    <description
-        url="http://download.eclipse.org/webtools/declaredUpdates/index.html"> The update site contains the features of the of Eclipse Web
-        Tools Project (WTP) </description>
-    <feature
-        url="features/org.eclipse.wst_@org.eclipse.wst@.jar"
-        id="org.eclipse.wst"
-        version="@org.eclipse.wst@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.wst.sdk_@org.eclipse.wst.sdk@.jar"
-        id="org.eclipse.wst.sdk"
-        version="@org.eclipse.wst.sdk@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jst_@org.eclipse.jst@.jar"
-        id="org.eclipse.jst"
-        version="@org.eclipse.jst@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jst.sdk_@org.eclipse.jst.sdk@.jar"
-        id="org.eclipse.jst.sdk"
-        version="@org.eclipse.jst.sdk@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jpt.feature_@org.eclipse.jpt.feature@.jar"
-        id="org.eclipse.jpt.feature"
-        version="@org.eclipse.jpt.feature@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jpt_sdk.feature_@org.eclipse.jpt_sdk.feature@.jar"
-        id="org.eclipse.jpt_sdk.feature"
-        version="@org.eclipse.jpt_sdk.feature@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <category-def
-        name="Web Tools Platform (WTP)"
-        label="Web Tools Platform (WTP)">
-        <description> This category contains the features of the Eclipse
-            Web Tools Project (WTP). </description>
-    </category-def>
-</site>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/vex.site/templateFiles/testCompileResults.php.template b/releng.wtpbuilder/distribution/vex.site/templateFiles/testCompileResults.php.template
deleted file mode 100644
index 42d6f65..0000000
--- a/releng.wtpbuilder/distribution/vex.site/templateFiles/testCompileResults.php.template
+++ /dev/null
@@ -1,76 +0,0 @@
-<html>
-<head>
-
-<?php
-        $parts = explode("/", getcwd());
-        $parts2 = explode("-", $parts[count($parts) - 1]);
-        $buildName = $parts2[1];
-
-        echo "<title>Compile Logs: Test Bundles for $buildName</title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2em;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:Bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-}
-</style>
-</head>
-<body>
-
-<?php
-        echo "<h1>Compile Logs: Test Bundles for $buildName</h1>";
-?>
-
-
-<table id=tabledata align = "center" width="75%" border="1">
-  <tr>
-    <td class="bold" align="center">Compile Logs</td>
-    <td class="bold" align="center">Compile Errors</td>
-    <td class="bold" align="center">Compiler Warnings</td>
-    <td class="bold" align="center">Access Violations</td>
-    <td class="bold" align="center">Access Warnings</td>
-  </tr>
-
-  %compilelogs%
-
-</table>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/vex.site/templateFiles/testResults.php.template b/releng.wtpbuilder/distribution/vex.site/templateFiles/testResults.php.template
deleted file mode 100644
index ddad0b7..0000000
--- a/releng.wtpbuilder/distribution/vex.site/templateFiles/testResults.php.template
+++ /dev/null
@@ -1,119 +0,0 @@
-<html>
-<head>
-
-<?php
-	$parts = explode("/", getcwd());
-	$parts2 = explode("-", $parts[count($parts) - 1]);
-	$buildName = $parts2[1];
-	
-	echo "<title>Test Results for $buildName </title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2em;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:Bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-
-}
-</style>
-
-
-</head>
-<body>
-<p><b><font face="Verdana" size="+3">Test Results</font></b> </p>
-
-<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">
-    Unit Test Results for <?php echo "$buildName"; ?> on Various Platforms and JRE</font></b></td>
-  </tr>
-</table>
-
-<?php
-if (file_exists("testResults"))
-{
-$dir = dir("testResults");
-while ($anEntry = $dir->read())
-{
-  if ($anEntry != "." && $anEntry != ".." && $anEntry != "consolelogs" && $anEntry != "html" && $anEntry != "xml")
-  {
-    $link = "testResults/".$anEntry."/results/index.php";
-    echo "<p><a href=\"$link\">$anEntry</a></p>";
-  }
-}
-}
-?>
-
-<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">Unit 
-      Test Results for <?php echo "$buildName"; ?> </font></b></td>
-  </tr>
-</table>
-
-<table id=tableunittestdata align = "center" width="75%" border="1">
-  <tr> 
-    <td class="bold" align="center" width="70%">Test Suite</td>
-    <td class="bold" align="center" width="10%">Errors &amp; Failures</td>
-    <td class="bold" align="center" width="10%">Total Tests</td>
-    <td class="bold" align="center" width="10%">Total Time (s)</td>
-  </tr>
-  
-  
-  %testresults%
-  
-</table>
-<p></p>
-<br>
-<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"> 
-      Console output logs 
-      <?php echo "$buildName"; ?>
-      </font></b></td>
-  </tr>
-</table>
-<br>
-These <a href="consoleLogs.php">logs</a> contain the console output captured while 
-running the JUnit automated tests. <br>
-<br>
-
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/vex.site/transformReportToHTML.xml b/releng.wtpbuilder/distribution/vex.site/transformReportToHTML.xml
deleted file mode 100644
index b72f6cd..0000000
--- a/releng.wtpbuilder/distribution/vex.site/transformReportToHTML.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-    name="xsl-conversion"
-    default="main"
-    basedir=".">
-    <target
-        name="main"
-        description="example.@dot.xml to produce example.@dot.html">
-        <xslt
-            destdir="${resultDir}/compilelogs"
-            scanincludeddirectories="true"
-            style="compilerXMLOutputToHTML.xsl"
-            force="true">
-            <fileset
-                dir="${resultDir}/compilelogs"
-                includes="**/*.xml"/>
-        </xslt>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/vex.tests/build.xml b/releng.wtpbuilder/distribution/vex.tests/build.xml
deleted file mode 100644
index b606f8b..0000000
--- a/releng.wtpbuilder/distribution/vex.tests/build.xml
+++ /dev/null
@@ -1,330 +0,0 @@
-<project
-    name="Build specific targets and properties"
-    default="runTest">
-    <!--
-        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"/>
-    <fail
-        message="testRoot must be set for this task"
-        unless="testRoot"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-
-
-    <!-- 
-        typcially already set, but in case of standalone tests, may not
-        be
-    -->
-    <property
-        name="buildLabel"
-        value="${buildType}-${buildId}-${timestamp}"/>
-
-
-    <!-- 
-	   Steps to do after the build is done. 
-	 -->
-    <target
-        name="test">
-        <dirname
-            file="${ant.file}"
-            property="currentDirectory"/>
-        <ant
-            antfile="${ant.file}"
-            target="runTest"
-            dir="${currentDirectory}"/>
-    </target>
-
-    <!-- 
-	  Steps to do to test the build results
-   -->
-    <target
-        name="runTest">
-        <dirname
-            file="${ant.file}"
-            property="test.component.dir"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-        <property
-            file="${buildDirectory}/label.properties"/>
-        <property
-            file="${wtp.builder.home}/build.properties"/>
-        <fail
-            message="testRoot must be set for this task"
-            unless="testRoot"/>
-        <mkdir
-            dir="${testRoot}"/>
-
-        <!-- if results already exist, delete them -->
-        <delete
-            dir="${testRoot}/results"
-            failOnError="false"/>
-        <mkdir
-            dir="${testRoot}/results"/>
-        <mkdir
-            dir="${testRoot}/results/consolelogs"/>
-        <copy
-            todir="${testRoot}"
-            overwrite="true">
-            <fileset
-                dir="${test.component.dir}/testScripts"/>
-        </copy>
-        <echo
-            message="BASEOS: ${env.BASEOS}   BASEWS: ${env.BASEWS}   BASEARCH: ${env.BASEARCH} "/>
-        <ant
-            antfile="${test.component.dir}/testdependency.xml"
-            target="get">
-            <property
-                name="dependency.properties"
-                value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-            <property
-                name="base.install.dir"
-                value="${testRoot}"/>
-        </ant>
-        <antcall
-            target="unzipTests"/>
-        <antcall
-            target="runTestEclipse">
-            <param
-                name="testTarget"
-                value="all"/>
-        </antcall>
-        <antcall
-            target="postRunTestEclipse">
-            <param
-                name="testTarget"
-                value="all"/>
-        </antcall>
-    </target>
-    <target
-        name="unzipTests">
-        <!--
-            unzip the builds and junit tests we use 'unzip' here, so we
-            can continue on error, if desired. (such as if zip was not
-            created, due to other failures or options).
-        -->
-        <echo
-            message="installing sdk"/>
-        <exec
-            dir="${buildDirectory}/${buildLabel}"
-            executable="unzip"
-            failonerror="true">
-            <arg
-                line="-o -qq  wtp-incubator-xml.vex-sdk-${buildLabel}.zip -d ${testRoot}${dropinsFolder}"/>
-        </exec>
-        <echo
-            message="installing tests"/>
-        <exec
-            dir="${buildDirectory}/${buildLabel}"
-            executable="unzip"
-            failonerror="false">
-            <arg
-                line="-o -qq wtp-incubator-xml.vex-tests-${buildLabel}.zip -d ${testRoot}${dropinsFolder}"/>
-        </exec>
-    </target>
-    <!--
-        time out may need to be set/adjust for api or performance tests?
-        This testTimeLimit is the whole, overall limit on tests. There's
-        a shorter one for individual suites. some common values, of
-        milliseconds to more recognizable units: 7200000: 2 hours
-        3600000: 1 hour 1800000: 30 minutes 600000: 10 minutes
-    -->
-    <property
-        name="testTimeLimit"
-        value="7200000"/>
-    <property
-        name="testFailOnError"
-        value="false"/>
-    <target
-        name="runTestEclipse"
-        description="Run our JUnit's within an instance of antRunner">
-        <property
-            name="test-vm"
-            value="${env.JAVA_6_HOME}/bin/java"/>
-
-        <property
-            name="vmargs"
-            value="-Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm}  -Dperf.buildId=${buildType}${date}-${time}"/>
-        <!--
-            set path to eclipse folder. If local folder, use '.';
-            otherwise, use c:\path\to\eclipse or /path/to/eclipse/
-        -->
-        <property
-            name="eclipse.home"
-            value="${testRoot}"/>
-        <echo
-            message="Running junits"/>
-        <!--
-            Remember: using -debug for org.eclipse.ant.core.antRunner
-            produces ant debug info to be output ... which is a TON of
-            stuff
-        -->
-        <echo
-            message="eclipse.launcher: ${eclipse.launcher}"/>
-        <java
-            taskname="unit-test-masterprocess"
-            fork="true"
-            resultProperty="wtpmasterjunitresult"
-            failonerror="false"
-            timeout="${testTimeLimit}"
-            dir="${testRoot}/eclipse"
-            jvm="${env.JAVA_6_HOME}/bin/java"
-            classname="org.eclipse.equinox.launcher.Main">
-            <classpath>
-                <fileset
-                    dir="${testRoot}/eclipse/plugins">
-                    <include
-                        name="org.eclipse.equinox.launcher_*.jar"/>
-                </fileset>
-            </classpath>
-            <jvmarg
-                value="-Xmx512m"/>
-            <jvmarg
-                value="-Dosgi.ws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dosgi.os=${env.BASEOS}"/>
-            <jvmarg
-                value="-Dosgi.arch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-Dws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dos=${env.BASEOS}"/>
-            <jvmarg
-                value="-Darch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-Dnoclean=true"/>
-            <jvmarg
-                value="-DbuildBranch=${buildBranch}"/>
-            <jvmarg
-                value="-DbuildType=${buildType}"/>
-            <jvmarg
-                value="-DbuildId=${buildId}"/>
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <jvmarg
-                value="-Dprojectname=${projectname}"/>
-            <arg
-                value="-nosplash"/>
-            <arg
-                value="-consolelog"/>
-            <arg
-                value="-data"/>
-            <arg
-                value="${testRoot}/overallTestWorkspace"/>
-            <arg
-                value="-application"/>
-            <arg
-                value="org.eclipse.ant.core.antRunner"/>
-            <arg
-                value="-file"/>
-            <arg
-                value="${testRoot}/test.xml"/>
-            <arg
-                value="-logger"/>
-            <arg
-                value="org.apache.tools.ant.DefaultLogger"/>
-            <env
-                key="DISPLAY"
-                value="${env.DISPLAY}"/>
-            <redirector
-                output="${testRoot}/results/fullOutput.txt"
-                error="${testRoot}/results/fullErrorLog.txt"/>
-            <sysproperty
-                key="build.home"
-                value="${env.BUILD_HOME}"/>
-            <sysproperty
-                key="buildDirectory"
-                value="${buildDirectory}"/>
-            <sysproperty
-                key="buildLabel"
-                value="${buildLabel}"/>
-            <sysproperty
-                key="baseLocation"
-                value="${baseLocation}"/>
-            <sysproperty
-                key="testRoot"
-                value="${testRoot}"/>
-            <sysproperty
-                key="testDir"
-                value="${testRoot}"/>
-            <sysproperty
-                key="perf.buildId"
-                value="${buildType}${date}-${time}"/>
-            <sysproperty
-                key="eclipseBuilderDirectory"
-                value="${pde.builder.path}"/>
-            <sysproperty
-                key="buildLabel"
-                value="${buildLabel}"/>
-        </java>
-        <echo
-            message="wtpmasterjunitresult ${wtpmasterjunitresult}"/>
-    </target>
-    <target
-        name="postRunTestEclipse">
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/consolelogs/testLogs"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results">
-                <include
-                    name="*output.txt"/>
-            </fileset>
-        </copy>
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/consolelogs/testSysErrorLogs"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results">
-                <include
-                    name="*error.txt"/>
-            </fileset>
-        </copy>
-        <copy
-            file="${testRoot}/results/fullOutput.txt"
-            toDir="${buildDirectory}/${buildLabel}/testResults/consolelogs/full"
-            overwrite="true"
-            failonerror="false">
-        </copy>
-        <copy
-            file="${testRoot}/results/fullErrorLog.txt"
-            toDir="${buildDirectory}/${buildLabel}/testResults/consolelogs/full"
-            overwrite="true"
-            failonerror="false">
-        </copy>
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/xml"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results/xml">
-                <include
-                    name="*.xml"/>
-            </fileset>
-        </copy>
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/html"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results/html">
-                <include
-                    name="*.html"/>
-            </fileset>
-        </copy>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/vex.tests/templateFiles/index.php b/releng.wtpbuilder/distribution/vex.tests/templateFiles/index.php
deleted file mode 100644
index a42c883..0000000
--- a/releng.wtpbuilder/distribution/vex.tests/templateFiles/index.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<html>
-<head>
-
-<?php
-$parts = explode("/", realpath(".."));
-$label = $parts[count($parts) - 1];
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-</head>
-<body>
-<p><b><font face="Verdana" size="+3">Test Results</font></b></p>
-<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">Unit Test Results for <?php echo "$label"; ?>
-		</font></b></td>
-	</tr>
-</table>
-<p></p>
-<table border="0">
-</table>
-
-<table width="77%" border="1">
-	<tr>
-		<td width="81%"><b>Tests Performed</b></td>
-		<td width="19%"><b>Errors &amp; Failures</b></td>
-	</tr>
-
-	<?
-	$dir = dir("html");
-	while ($anEntry = $dir->read())
-	{
-		if ($anEntry != "." && $anEntry != "..")
-		{
-			$link = "html/".$anEntry;
-			$xml = "xml/".substr($anEntry, 0, strlen($anEntry)-4)."xml";
-			$count = 0;
-			$fileHandle = fopen($xml, "r");
-			while (!feof($fileHandle))
-			{
-				$aLine = fgets($fileHandle, 4096); // Length parameter only optional after 4.2.0
-				$count = $count + substr_count($aLine, '<error');
-			}
-			fclose($fileHandle);
-			if ($count > 0)
-			{
-				echo "<tr><td><a href=\"$link\"><b><font color=\"red\">";
-				echo "$anEntry";
-				echo "</font></b></a></td>";
-				echo "<td><b><font color=\"red\">$count</font></b></td></tr>";
-			}
-			else
-			{
-				echo "<tr><td><a href=\"$link\">";
-				echo "$anEntry";
-				echo "</a></td>";
-				echo "<td>$count</td></tr>";
-			}
-		}
-	}
-	?>
-
-</table>
-<p></p>
-<br>
-<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"> Console output logs <?php echo "$label"; ?>
-		</font></b></td>
-	</tr>
-</table>
-<br>
-These
-<a href="consolelogs/wtptestlog.txt">logs</a>
-contain the console output captured while running the JUnit automated
-tests.
-<br>
-<br>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/vex.tests/testScripts/JUNIT.XSL b/releng.wtpbuilder/distribution/vex.tests/testScripts/JUNIT.XSL
deleted file mode 100644
index 9cdd80e..0000000
--- a/releng.wtpbuilder/distribution/vex.tests/testScripts/JUNIT.XSL
+++ /dev/null
@@ -1,703 +0,0 @@
-<xsl:stylesheet
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="1.0">
-    <xsl:output
-        method="html"
-        indent="yes"/>
-    <xsl:decimal-format
-        decimal-separator="."
-        grouping-separator=","/>
-    <xsl:template
-        match="testsuites">
-        <HTML>
-            <HEAD>
-                <style
-                    type="text/css"> body { font:normal 68%
-                    verdana,arial,helvetica; color:#000000; } table tr
-                    td, table tr th { font-size: 68%; } table.details tr
-                    th{ font-weight: bold; text-align:left;
-                    background:#a6caf0; } table.details tr td{
-                    background:#eeeee0; } p { line-height:1.5em;
-                    margin-top:0.5em; margin-bottom:1.0em; } h1 {
-                    margin: 0px 0px 5px; font: 165%
-                    verdana,arial,helvetica } h2 { margin-top: 1em;
-                    margin-bottom: 0.5em; font: bold 125%
-                    verdana,arial,helvetica } h3 { margin-bottom: 0.5em;
-                    font: bold 115% verdana,arial,helvetica } h4 {
-                    margin-bottom: 0.5em; font: bold 100%
-                    verdana,arial,helvetica } h5 { margin-bottom: 0.5em;
-                    font: bold 100% verdana,arial,helvetica } h6 {
-                    margin-bottom: 0.5em; font: bold 100%
-                    verdana,arial,helvetica } .Error { font-weight:bold;
-                    color:red; } .Failure { font-weight:bold;
-                    color:purple; } .Properties { text-align:right; } </style>
-                <script
-                    language="JavaScript">
-                    var TestCases = new Array(); var cur;
-                    <xsl:for-each
-                        select="./testsuite">
-                        <xsl:apply-templates
-                            select="properties"/>
-                    </xsl:for-each>
-                </script>
-                <script
-                    language="JavaScript"><![CDATA[
-        function displayProperties (name) {
-          var win = window.open('','JUnitSystemProperties','scrollbars=1,resizable=1');
-          var doc = win.document.open();
-          doc.write("<html><head><title>Properties of " + name + "</title>");
-          doc.write("<style>")
-          doc.write("body {font:normal 68% verdana,arial,helvetica;	color:#000000; }");
-          doc.write("table tr td, table tr th { font-size: 68%; }");
-          doc.write("table.properties { border-collapse:collapse; border-left:solid 1 #cccccc; border-top:solid 1 #cccccc; padding:5px; }");
-          doc.write("table.properties th { text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#eeeeee; }");
-          doc.write("table.properties td { font:normal; text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#fffffff; }");
-          doc.write("h3 { margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica }");
-          doc.write("</style>");
-          doc.write("</head><body>");
-          doc.write("<h3>Properties of " + name + "</h3>");
-          doc.write("<div align=\"right\"><a href=\"javascript:window.close();\">Close</a></div>");
-          doc.write("<table class='properties'>");
-          doc.write("<tr><th>Name</th><th>Value</th></tr>");
-          for (prop in TestCases[name]) {
-            doc.write("<tr><th>" + prop + "</th><td>" + TestCases[name][prop] + "</td></tr>");
-          }
-          doc.write("</table>");
-          doc.write("</body></html>");
-          doc.close();
-          win.focus();
-        }
-      ]]>
-                </script>
-            </HEAD>
-            <body>
-                <a
-                    name="top"></a>
-                <xsl:call-template
-                    name="pageHeader"/>
-
-                <!-- Summary part -->
-                <xsl:call-template
-                    name="summary"/>
-                <hr
-                    size="1"
-                    width="95%"
-                    align="left"/>
-
-                <!-- Package List part -->
-                <xsl:call-template
-                    name="packagelist"/>
-                <hr
-                    size="1"
-                    width="95%"
-                    align="left"/>
-
-                <!-- For each package create its part -->
-                <xsl:call-template
-                    name="packages"/>
-                <hr
-                    size="1"
-                    width="95%"
-                    align="left"/>
-
-                <!-- For each class create the  part -->
-                <xsl:call-template
-                    name="classes"/>
-            </body>
-        </HTML>
-    </xsl:template>
-    <!--
-        ==================================================================
-    -->
-    <!--
-        Write a list of all packages with an hyperlink to the anchor of
-    -->
-    <!--
-        of the package name.
-    -->
-    <!--
-        ==================================================================
-    -->
-    <xsl:template
-        name="packagelist">
-        <h2>Packages</h2>
-        Note: package statistics are not computed recursively, they only
-        sum up all of its testsuites numbers.
-        <table
-            class="details"
-            border="0"
-            cellpadding="5"
-            cellspacing="2"
-            width="95%">
-            <xsl:call-template
-                name="testsuite.test.header"/>
-            <!-- list all packages recursively -->
-            <xsl:for-each
-                select="./testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
-                <xsl:sort
-                    select="@package"/>
-                <xsl:variable
-                    name="testsuites-in-package"
-                    select="/testsuites/testsuite[./@package = current()/@package]"/>
-                <xsl:variable
-                    name="testCount"
-                    select="sum($testsuites-in-package/@tests)"/>
-                <xsl:variable
-                    name="errorCount"
-                    select="sum($testsuites-in-package/@errors)"/>
-                <xsl:variable
-                    name="failureCount"
-                    select="sum($testsuites-in-package/@failures)"/>
-                <xsl:variable
-                    name="timeCount"
-                    select="sum($testsuites-in-package/@time)"/>
-
-                <!-- write a summary for the package -->
-                <tr
-                    valign="top">
-                    <!-- set a nice color depending if there is an error/failure -->
-                    <xsl:attribute
-                        name="class">
-						<xsl:choose>
-							<xsl:when
-                        test="$failureCount &gt; 0">Failure</xsl:when>
-							<xsl:when
-                        test="$errorCount &gt; 0">Error</xsl:when>
-						</xsl:choose>
-					</xsl:attribute>
-                    <td>
-                        <a
-                            href="#{@package}">
-                            <xsl:value-of
-                                select="@package"/>
-                        </a>
-                    </td>
-                    <td>
-                        <xsl:value-of
-                            select="$testCount"/>
-                    </td>
-                    <td>
-                        <xsl:value-of
-                            select="$errorCount"/>
-                    </td>
-                    <td>
-                        <xsl:value-of
-                            select="$failureCount"/>
-                    </td>
-                    <td>
-                        <xsl:call-template
-                            name="display-time">
-                            <xsl:with-param
-                                name="value"
-                                select="$timeCount"/>
-                        </xsl:call-template>
-                    </td>
-                </tr>
-            </xsl:for-each>
-        </table>
-    </xsl:template>
-    <!--
-        ==================================================================
-    -->
-    <!--
-        Write a package level report
-    -->
-    <!--
-        It creates a table with values from the document:
-    -->
-    <!--
-        Name | Tests | Errors | Failures | Time
-    -->
-    <!--
-        ==================================================================
-    -->
-    <xsl:template
-        name="packages">
-        <!-- create an anchor to this package name -->
-        <xsl:for-each
-            select="/testsuites/testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
-            <xsl:sort
-                select="@package"/>
-            <a
-                name="{@package}"></a>
-            <h3>
-                Package
-                <xsl:value-of
-                    select="@package"/>
-            </h3>
-            <table
-                class="details"
-                border="0"
-                cellpadding="5"
-                cellspacing="2"
-                width="95%">
-                <xsl:call-template
-                    name="testsuite.test.header"/>
-
-                <!-- match the testsuites of this package -->
-                <xsl:apply-templates
-                    select="/testsuites/testsuite[./@package = current()/@package]"
-                    mode="print.test"/>
-            </table>
-            <a
-                href="#top">Back to top</a>
-            <p/>
-            <p/>
-        </xsl:for-each>
-    </xsl:template>
-    <xsl:template
-        name="classes">
-        <xsl:for-each
-            select="testsuite">
-            <xsl:sort
-                select="@name"/>
-            <!-- create an anchor to this class name -->
-            <a
-                name="{@name}"></a>
-            <h3>
-                TestCase
-                <xsl:value-of
-                    select="@name"/>
-            </h3>
-            <table
-                class="details"
-                border="0"
-                cellpadding="5"
-                cellspacing="2"
-                width="95%">
-                <xsl:call-template
-                    name="testcase.test.header"/>
-                <!--
-                    test can even not be started at all (failure to load
-                    the class) so report the error directly
-                -->
-                <xsl:if
-                    test="./error">
-                    <tr
-                        class="Error">
-                        <td
-                            colspan="4">
-                            <xsl:apply-templates
-                                select="./error"/>
-                        </td>
-                    </tr>
-                </xsl:if>
-                <xsl:apply-templates
-                    select="./testcase"
-                    mode="print.test"/>
-            </table>
-            <div
-                class="Properties">
-                <a>
-                    <xsl:attribute
-                        name="href">javascript:displayProperties('<xsl:value-of
-                        select="@package"/>.<xsl:value-of
-                        select="@name"/>');</xsl:attribute>
-                    Properties &gt;&gt;
-                </a>
-            </div>
-            <p/>
-            <a
-                href="#top">Back to top</a>
-        </xsl:for-each>
-    </xsl:template>
-    <xsl:template
-        name="summary">
-        <h2>Summary</h2>
-        <xsl:variable
-            name="testCount"
-            select="sum(testsuite/@tests)"/>
-        <xsl:variable
-            name="errorCount"
-            select="sum(testsuite/@errors)"/>
-        <xsl:variable
-            name="failureCount"
-            select="sum(testsuite/@failures)"/>
-        <xsl:variable
-            name="timeCount"
-            select="sum(testsuite/@time)"/>
-        <xsl:variable
-            name="successRate"
-            select="($testCount - $failureCount - $errorCount) div $testCount"/>
-        <table
-            class="details"
-            border="0"
-            cellpadding="5"
-            cellspacing="2"
-            width="95%">
-            <tr
-                valign="top">
-                <th>Tests</th>
-                <th>Failures</th>
-                <th>Errors</th>
-                <th>Success rate</th>
-                <th>Time</th>
-            </tr>
-            <tr
-                valign="top">
-                <xsl:attribute
-                    name="class">
-				<xsl:choose>
-					<xsl:when
-                    test="$failureCount &gt; 0">Failure</xsl:when>
-					<xsl:when
-                    test="$errorCount &gt; 0">Error</xsl:when>
-				</xsl:choose>
-			</xsl:attribute>
-                <td>
-                    <xsl:value-of
-                        select="$testCount"/>
-                </td>
-                <td>
-                    <xsl:value-of
-                        select="$failureCount"/>
-                </td>
-                <td>
-                    <xsl:value-of
-                        select="$errorCount"/>
-                </td>
-                <td>
-                    <xsl:call-template
-                        name="display-percent">
-                        <xsl:with-param
-                            name="value"
-                            select="$successRate"/>
-                    </xsl:call-template>
-                </td>
-                <td>
-                    <xsl:call-template
-                        name="display-time">
-                        <xsl:with-param
-                            name="value"
-                            select="$timeCount"/>
-                    </xsl:call-template>
-                </td>
-            </tr>
-        </table>
-        <table
-            border="0"
-            width="95%">
-            <tr>
-                <td
-                    style="text-align: justify;">
-                    Note:
-                    <i>failures</i>
-                    are anticipated and checked for with assertions
-                    while
-                    <i>errors</i>
-                    are unanticipated.
-                </td>
-            </tr>
-        </table>
-    </xsl:template>
-    <!--
-        Write properties into a JavaScript data structure. This is based
-        on the original idea by Erik Hatcher (erik@hatcher.net)
-    -->
-    <xsl:template
-        match="properties">
-        cur = TestCases['
-        <xsl:value-of
-            select="../@package"/>
-        .
-        <xsl:value-of
-            select="../@name"/>
-        '] = new Array();
-        <xsl:for-each
-            select="property">
-            <xsl:sort
-                select="@name"/>
-            cur['
-            <xsl:value-of
-                select="@name"/>
-            '] = '
-            <xsl:call-template
-                name="JS-escape">
-                <xsl:with-param
-                    name="string"
-                    select="@value"/>
-            </xsl:call-template>
-            ';
-        </xsl:for-each>
-    </xsl:template>
-
-    <!-- Page HEADER -->
-    <xsl:template
-        name="pageHeader">
-        <h1>Unit Test Results</h1>
-        <table
-            width="100%">
-            <tr>
-                <td
-                    align="left"></td>
-                <td
-                    align="right">
-                    Designed for use with
-                    <a
-                        href='http://www.junit.org'>JUnit</a>
-                    and
-                    <a
-                        href='http://jakarta.apache.org/ant'>Ant</a>
-                    .
-                </td>
-            </tr>
-        </table>
-        <hr
-            size="1"/>
-    </xsl:template>
-    <xsl:template
-        match="testsuite"
-        mode="header">
-        <tr
-            valign="top">
-            <th
-                width="80%">Name</th>
-            <th>Tests</th>
-            <th>Errors</th>
-            <th>Failures</th>
-            <th
-                nowrap="nowrap">Time(s)</th>
-        </tr>
-    </xsl:template>
-
-    <!-- class header -->
-    <xsl:template
-        name="testsuite.test.header">
-        <tr
-            valign="top">
-            <th
-                width="80%">Name</th>
-            <th>Tests</th>
-            <th>Errors</th>
-            <th>Failures</th>
-            <th
-                nowrap="nowrap">Time(s)</th>
-        </tr>
-    </xsl:template>
-
-    <!-- method header -->
-    <xsl:template
-        name="testcase.test.header">
-        <tr
-            valign="top">
-            <th>Name</th>
-            <th>Status</th>
-            <th
-                width="80%">Type</th>
-            <th
-                nowrap="nowrap">Time(s)</th>
-        </tr>
-    </xsl:template>
-
-
-    <!-- class information -->
-    <xsl:template
-        match="testsuite"
-        mode="print.test">
-        <tr
-            valign="top">
-            <!-- set a nice color depending if there is an error/failure -->
-            <xsl:attribute
-                name="class">
-			<xsl:choose>
-				<xsl:when
-                test="@failures[.&gt; 0]">Failure</xsl:when>
-				<xsl:when
-                test="@errors[.&gt; 0]">Error</xsl:when>
-			</xsl:choose>
-		</xsl:attribute>
-
-            <!-- print testsuite information -->
-            <td>
-                <a
-                    href="#{@name}">
-                    <xsl:value-of
-                        select="@name"/>
-                </a>
-            </td>
-            <td>
-                <xsl:value-of
-                    select="@tests"/>
-            </td>
-            <td>
-                <xsl:value-of
-                    select="@errors"/>
-            </td>
-            <td>
-                <xsl:value-of
-                    select="@failures"/>
-            </td>
-            <td>
-                <xsl:call-template
-                    name="display-time">
-                    <xsl:with-param
-                        name="value"
-                        select="@time"/>
-                </xsl:call-template>
-            </td>
-        </tr>
-    </xsl:template>
-    <xsl:template
-        match="testcase"
-        mode="print.test">
-        <tr
-            valign="top">
-            <xsl:attribute
-                name="class">
-			<xsl:choose>
-				<xsl:when
-                test="failure | error">Error</xsl:when>
-			</xsl:choose>
-		</xsl:attribute>
-            <td>
-                <xsl:value-of
-                    select="@name"/>
-            </td>
-            <xsl:choose>
-                <xsl:when
-                    test="failure">
-                    <td>Failure</td>
-                    <td>
-                        <xsl:apply-templates
-                            select="failure"/>
-                    </td>
-                </xsl:when>
-                <xsl:when
-                    test="error">
-                    <td>Error</td>
-                    <td>
-                        <xsl:apply-templates
-                            select="error"/>
-                    </td>
-                </xsl:when>
-                <xsl:otherwise>
-                    <td>Success</td>
-                    <td></td>
-                </xsl:otherwise>
-            </xsl:choose>
-            <td>
-                <xsl:call-template
-                    name="display-time">
-                    <xsl:with-param
-                        name="value"
-                        select="@time"/>
-                </xsl:call-template>
-            </td>
-        </tr>
-    </xsl:template>
-    <xsl:template
-        match="failure">
-        <xsl:call-template
-            name="display-failures"/>
-    </xsl:template>
-    <xsl:template
-        match="error">
-        <xsl:call-template
-            name="display-failures"/>
-    </xsl:template>
-
-    <!-- Style for the error and failure in the tescase template -->
-    <xsl:template
-        name="display-failures">
-        <xsl:choose>
-            <xsl:when
-                test="not(@message)">
-                N/A
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of
-                    select="@message"/>
-            </xsl:otherwise>
-        </xsl:choose>
-        <!-- display the stacktrace -->
-        <code>
-            <p/>
-            <xsl:call-template
-                name="br-replace">
-                <xsl:with-param
-                    name="word"
-                    select="."/>
-            </xsl:call-template>
-        </code>
-        <!--
-            the later is better but might be problematic for non-21"
-            monitors...
-        -->
-        <!--pre><xsl:value-of select="."/></pre-->
-    </xsl:template>
-    <xsl:template
-        name="JS-escape">
-        <xsl:param
-            name="string"/>
-        <xsl:choose>
-            <!--
-                something isn't right here, basically all single quotes
-                need to be replaced with backslash-single-quote
-                <xsl:when test="contains($string,'&apos;')">
-                <xsl:value-of
-                select="substring-before($string,'&apos;')"/> \&apos;
-                <xsl:call-template name="JS-escape"> <xsl:with-param
-                name="string"
-                select="substring-after($string,'&apos;')"/>
-                </xsl:call-template> </xsl:when>
-            -->
-            <xsl:when
-                test="contains($string,'\')">
-                <xsl:value-of
-                    select="substring-before($string,'\')"/>
-                \\
-                <xsl:call-template
-                    name="JS-escape">
-                    <xsl:with-param
-                        name="string"
-                        select="substring-after($string,'\')"/>
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of
-                    select="$string"/>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-    <!--
-        template that will convert a carriage return into a br tag
-        @param word the text from which to convert CR to BR tag
-    -->
-    <xsl:template
-        name="br-replace">
-        <xsl:param
-            name="word"/>
-        <xsl:choose>
-            <xsl:when
-                test="contains($word,'&#xA;')">
-                <xsl:value-of
-                    select="substring-before($word,'&#xA;')"/>
-                <br/>
-                <xsl:call-template
-                    name="br-replace">
-                    <xsl:with-param
-                        name="word"
-                        select="substring-after($word,'&#xA;')"/>
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of
-                    select="$word"/>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-    <xsl:template
-        name="display-time">
-        <xsl:param
-            name="value"/>
-        <xsl:value-of
-            select="format-number($value,'0.000')"/>
-    </xsl:template>
-    <xsl:template
-        name="display-percent">
-        <xsl:param
-            name="value"/>
-        <xsl:value-of
-            select="format-number($value,'0.00%')"/>
-    </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/vex.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/vex.tests/testScripts/test.xml
deleted file mode 100644
index 96c6ddc..0000000
--- a/releng.wtpbuilder/distribution/vex.tests/testScripts/test.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<project
-    name="Automated Eclipse Testing"
-    default="all"
-    basedir=".">
-    <property
-        environment="env"/>
-
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-    <echo
-        level="info"
-        message="starting Automated Eclipse Testing"/>
-    <echo
-        level="debug"
-        message="basedir: ${basedir}"/>
-    <echo
-        level="debug"
-        message="testRoot: ${testRoot}"/>
-    <fail
-        message="testRoot must be set"
-        unless="testRoot"/>
-
-    <!--properties file containing the build information-->
-    <property
-        file="${buildDirectory}/label.properties"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-    <!--default directory where test-eclipse will be installed-->
-    <property
-        name="install"
-        value="${testRoot}"/>
-    <!--
-        name that can be added to report name to identify which platform
-        tests results come from
-    -->
-    <property
-        name="platform"
-        value=""/>
-
-    <!-- The root of the eclipse installation -->
-    <property
-        name="eclipse-home"
-        value="${testRoot}${dropinsFolder}/eclipse/"/>
-    <!--
-        The directory that will contain the xml and html results from
-        the tests that are run
-    -->
-    <property
-        name="results"
-        value="${testRoot}/results"/>
-    <property
-        name="library-file"
-        value="${testRoot}/wtp-junit-tests.xml"/>
-    <target
-        name="init">
-    </target>
-    <target
-        name="all"
-        depends="init">
-        <echo
-            level="info"
-            message="Starting Unit Tests"/>
-        <!--
-            unlike other ant tasks, subant defaults to false for
-            inheritall!
-        -->
-        <subant
-            target=""
-            inheritall="true">
-            <fileset
-                dir="${eclipse-home}/plugins/">
-                <exclude
-                    name="**/*performance*/test.xml"/>
-                <include
-                    name="**/test.xml"/>
-            </fileset>
-        </subant>
-        <echo
-            level="info"
-            message="Ended Unit Tests"/>
-        <antcall
-            target="genHtml"/>
-    </target>
-    <target
-        name="genHtml"
-        description="Generates HTML results with provided JUNIT.XSL provided"
-        unless="genHtml.disable">
-        <xslt
-            style="JUNIT.XSL"
-            basedir="${results}/xml"
-            destdir="${results}/html"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/vex.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/vex.tests/testScripts/wtp-junit-tests.xml
deleted file mode 100644
index 62f4501..0000000
--- a/releng.wtpbuilder/distribution/vex.tests/testScripts/wtp-junit-tests.xml
+++ /dev/null
@@ -1,317 +0,0 @@
-<?xml version="1.0"?>
-<project
-    name="JUnit tests"
-    basedir=".">
-    <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-    <target
-        name="init">
-        <property
-            name="junit-report-output"
-            value="${testRoot}/results"/>
-        <mkdir
-            dir="${junit-report-output}/raw"/>
-        <!--
-            if not otherwise set, be sure extraVMargs is at least some
-            string, even if unused string. 
-            
-            Remember, though, extraVMArgs can contain more than one extra arg, 
-            so much be passed to VM as a "line", not "value". 
-        -->
-        <property
-            name="extraVMargs"
-            value="-DextraVMargsunused=notused"/>
-
-        <!-- if not otherwise set, use a unique workspace name -->
-        <property
-            name="data-dir"
-            value="${testRoot}/junitworkspaces/workspace-${classname}"/>
-        <property
-            name="testRoot"
-            value="${testRoot}"/>
-        <!--
-            Some common values, of milliseconds to more recognizable
-            units: 14400000: 4 hours 7200000: 2 hours 3600000: 1 hour
-            1800000: 30 minutes 600000: 10 minutes
-        -->
-        <property
-            name="timeout"
-            value="1800000"/>
-        <property
-            name="junit-report-output"
-            value="${junit-report-output}"/>
-        <property
-            name="formatter"
-            value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter"/>
-        <property
-            name="test-output"
-            value="${junit-report-output}/raw/${classname}.xml"/>
-        <property
-            name="jvm"
-            value="${env.JAVA_6_HOME}/bin/java"/>
-        <dirname
-            file="${ant.file}"
-            property="currentDir"/>
-        <echo
-            level="debug"
-            message="data-dir: ${data-dir}"/>
-        <echo
-            level="debug"
-            message="plugin-name: ${plugin-name}"/>
-        <echo
-            level="debug"
-            message="classname: ${classname}"/>
-        <echo
-            level="info"
-            message="extraVMargs: ${extraVMargs}"/>
-        <echo
-            level="debug"
-            message="timeout: ${timeout}"/>
-        <echo
-            level="debug"
-            message="testRoot: ${testRoot}"/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="debug"
-            message="eclipse-home: ${eclipse-home}"/>
-        <echo
-            level="debug"
-            message="junit-report-output: ${junit-report-output}"/>
-        <echo
-            level="debug"
-            message="test-output: ${test-output}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="buildLabel: ${buildLabel}"/>
-        <echo
-            level="debug"
-            message="jvm: ${jvm}"/>
-    </target>
-    <target
-        name="core-test"
-        depends="init">
-        <echo
-            level="info"
-            message="test-type: core-test"/>
-        <ant
-            antfile="${ant.file}"
-            dir="${currentDir}"
-            target="eclipse-test">
-            <property
-                name="application"
-                value="org.eclipse.test.coretestapplication"/>
-        </ant>
-    </target>
-    <target
-        name="ui-test"
-        depends="init">
-        <echo
-            level="info"
-            message="test-type: ui-test"/>
-        <ant
-            antfile="${ant.file}"
-            dir="${currentDir}"
-            target="eclipse-test">
-            <property
-                name="application"
-                value="org.eclipse.test.uitestapplication"/>
-        </ant>
-    </target>
-    <target
-        name="eclipse-test"
-        description="Runs the specified classname as a plug-in test.">
-        <echo
-            level="info"
-            message="Running ${classname}"/>
-        <echo
-            level="debug"
-            message="Result file: ${junit-report-output}/${classname}.xml."/>
-        <echo
-            level="debug"
-            message="DISPLAY: ${env.DISPLAY}"/>
-        <mkdir
-            dir="${buildDirectory}/${buildLabel}/httplogstest"/>
-        <echo
-            message="http log messages to: ${buildDirectory}/${buildLabel}/httplogstest"/>
-    	
-       <condition
-           property="xulRunnerParam"
-           value="org.eclipse.swt.browser.XULRunnerPath"
-           else="XULRunnerPathNotSpecified">
-           <isset
-               property="env.WTP_XULRUNNER"/>
-       </condition>
-        <echo
-            message="xulRunnerParam: ${xulRunnerParam}"/>
-        <echo
-            message="WTP_XULRUNNER: ${env.WTP_XULRUNNER}"/>
-        <!--
-            If there is not exactly one launcher in the stack, we'd best
-            fail fast, since we are not expecting that, and may indicate
-            an installation that would produce unpredictable results
-        -->
-        <!--
-            requires ant 1.7, and at this point, we're running 1.6 from
-            eclipse ... <condition property="expectedNumberOfLaunchers">
-            <resourcecount when="equal" count="1" > <fileset
-            dir="${testRoot}/eclipse/plugins"> <include
-            name="org.eclipse.equinox.launcher_*.jar" /> </fileset>
-            </resourcecount> </condition> <fail message="Did not find
-            expected number of launcher jars. Check installation."
-            unless="expectedNumberOfLaunchers" />
-        -->
-        <java
-            taskname="suiteUnitTest"
-            fork="true"
-            resultProperty="suitejunitresult"
-            failonerror="false"
-            timeout="${timeout}"
-            dir="${testRoot}/eclipse"
-            jvm="${jvm}"
-            classname="org.eclipse.equinox.launcher.Main">
-            <classpath>
-                <fileset
-                    dir="${testRoot}/eclipse/plugins">
-                    <include
-                        name="org.eclipse.equinox.launcher_*.jar"/>
-                </fileset>
-            </classpath>
-            <jvmarg
-                value="-Xmx512m"/>
-            <jvmarg
-                value="-Dosgi.ws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dosgi.os=${env.BASEOS}"/>
-            <jvmarg
-                value="-Dosgi.arch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-DbuildLabel=${buildLabel}"/>
-            <jvmarg
-                value="-DbuildDirectory=${buildDirectory}"/>
-            <jvmarg
-                value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
-            <jvmarg
-                value="-DurlLogLocation=${buildDirectory}/${buildLabel}/httplogstest/outgoinghttplog-${plugin-name}.log"/>
-            <jvmarg
-                value="-Dwtp.autotest.noninteractive=true"/>
-            <jvmarg
-                line="${extraVMargs}"/>
-            <jvmarg
-                value="-Declipse.consolelog=true"/>
-            <jvmarg
-                value="-Dosgi.debug"/>
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <jvmarg
-                value="-Dprojectname=${projectname}"/>
-        	
-              <jvmarg
-                  value="-D${xulRunnerParam}=${env.WTP_XULRUNNER}"/> 	
-        	
-        	
-            <arg
-                value="-nosplash"/>
-            <arg
-                value="-data"/>
-            <arg
-                value="${data-dir}"/>
-            <arg
-                value="-application"/>
-            <arg
-                value="${application}"/>
-            <arg
-                value="formatter=${formatter},${test-output}"/>
-            <arg
-                value="-testPluginName"/>
-            <arg
-                value="${plugin-name}"/>
-            <arg
-                value="-className"/>
-            <arg
-                value="${classname}"/>
-            <env
-                key="DISPLAY"
-                value="${env.DISPLAY}"/>
-            <redirector
-                output="${junit-report-output}/${classname}.output.txt"
-                error="${junit-report-output}/${classname}.error.txt"/>
-        </java>
-        <echo
-            level="info"
-            message="suitejunitresult: ${suitejunitresult}"/>
-        <antcall
-            target="summarizeFailure"/>
-        <antcall
-            target="collect-results"/>
-    </target>
-    <target
-        name="collect-results">
-        <dirname
-            property="output-dir"
-            file="${test-output}"/>
-        <basename
-            property="output-file-name"
-            file="${test-output}"/>
-        <mkdir
-            dir="${junit-report-output}/xml"/>
-        <junitreport
-            todir="${junit-report-output}/xml"
-            tofile="${classname}.xml">
-            <fileset
-                dir="${output-dir}">
-                <include
-                    name="${output-file-name}"/>
-            </fileset>
-        </junitreport>
-        <mkdir
-            dir="${junit-report-output}/html"/>
-        <xslt
-            style="${testRoot}/JUNIT.XSL"
-            basedir="${junit-report-output}"
-            includes="${classname}.xml"
-            destdir="${junit-report-output}/html"/>
-    </target>
-    <target
-        name="collect">
-        <!--
-            deprecated, each test.xml uses it, and we should remove,
-            eventually
-        -->
-        <echo
-            message="Deprecated. There is no need to call the collect task. It no longer does anything. Please remove from your test.xml file"/>
-    </target>
-    <target
-        name="summarizeFailure"
-        depends="checkFailure"
-        if="doFailure">
-        <echo
-            append="true"
-            file="${buildDirectory}/junitFailureList.log">${plugin-name}${line.separator}</echo>
-    </target>
-    <target
-        name="checkFailure">
-        <condition
-            property="doFailure">
-            <not>
-                <equals
-                    arg1="${suitejunitresult}"
-                    arg2="0"
-                    trim="true"/>
-            </not>
-        </condition>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/vex.tests/testdependency.xml b/releng.wtpbuilder/distribution/vex.tests/testdependency.xml
deleted file mode 100644
index 74590a0..0000000
--- a/releng.wtpbuilder/distribution/vex.tests/testdependency.xml
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-    <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <fail
-        message="Required property file does not exist: ${keyCfgFile}">
-        <condition>
-            <not>
-                <available
-                    file="${keyCfgFile}"/>
-            </not>
-        </condition>
-    </fail>
-    <property
-        file="${keyCfgFile}"/>
-    <condition
-        property="getprereq.eclipse">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.eclipseplatform">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.emf">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.emfxsd">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.emfvalidation">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.gef">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.dtp">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.wst">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.jst">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.wtp">
-        <istrue
-            value="false"/>
-    </condition>
-    <target
-        name="get">
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined, which we do later with
-            statements such if="${groupId}.url"
-        -->
-        <property
-            file="${dependency.properties}"/>
-        <antcall
-            target="prereq.emf"/>
-        <antcall
-            target="prereq.emfxsd"/>
-        <antcall
-            target="prereq.emfvalidation"/>
-        <antcall
-            target="prereq.gef"/>
-        <antcall
-            target="prereq.dtp"/>
-        <antcall
-            target="prereq.wst"/>
-        <antcall
-            target="prereq.jst"/>
-        <antcall
-            target="prereq.wtp"/>
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="eclipseTestFramework"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.eclipse"
-        if="getprereq.eclipse">
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.eclipseplatform"
-        if="getprereq.eclipseplatform">
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="eclipseplatform"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emf"
-        if="getprereq.emf">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfxsd"
-        if="getprereq.emfxsd">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfvalidation"
-        if="getprereq.emfvalidation">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="emfvalidation"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.gef"
-        if="getprereq.gef">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.dtp"
-        if="getprereq.dtp">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="dtp"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wst"
-        if="getprereq.wst">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="wst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.jst"
-        if="getprereq.jst">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="jst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wtp"
-        if="getprereq.wtp">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="wtp"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstallBase"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-    <target
-        name="getAndInstallDropins"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}${dropinsFolder}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wstfproj.build/build.xml b/releng.wtpbuilder/distribution/wstfproj.build/build.xml
deleted file mode 100644
index 07cd104..0000000
--- a/releng.wtpbuilder/distribution/wstfproj.build/build.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<project
-    default="build"
-    basedir=".">
-    <fail
-        unless="wtp.builder.home"/>
-    <property
-        file="${wtp.builder.home}/build.properties"/>
-    <target
-        name="build"
-        depends="getBaseBuilder">
-        <dirname
-            file="${ant.file}"
-            property="distribution.wtp.build.dir"/>
-        <property
-            name="buildTargets"
-            value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
-        <!--
-            for this distribution, dependencies come from project's
-            releng map project
-        -->
-        <property
-            name="dependency.properties"
-            value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-
-        <!-- calling label.xml to createg label.properties file -->
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-        <echo
-            level="info"
-            message="invoking buildTargets: ${buildTargets} to build for each component"/>
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="wstfproj"/>
-        </ant>
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="wstfproj_sdk"/>
-        </ant>
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="wstfproj_tests"/>
-            <property
-                name="eclipseBuildFailOnError"
-                value="false"/>
-        </ant>
-
-        <!-- package -->
-        <antcall
-            target="package"/>
-    </target>
-
-    <!-- invoking runbuild.xml targetting getBaseBuilder -->
-    <target
-        name="getBaseBuilder"
-        if="eclipse.builder.fetch">
-        <dirname
-            file="${ant.file}"
-            property="wtbuilder.dir"/>
-        <property
-            name="buildTargets"
-            value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
-        <echo
-            level="info"
-            message="invoking buildTargets: ${buildTargets} -> getBaseBuilder"/>
-        <ant
-            antfile="${buildTargets}"
-            target="getBaseBuilder"/>
-    </target>
-    <target
-        name="package">
-        <!--
-            post, post packaging, for WTP ... "manually" assemble the
-            desired zips
-        -->
-        <!-- nothing to assemble right now -->
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wstfproj.site/build.xml b/releng.wtpbuilder/distribution/wstfproj.site/build.xml
deleted file mode 100644
index 1b3b037..0000000
--- a/releng.wtpbuilder/distribution/wstfproj.site/build.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<project
-    name="Build specific targets and properties"
-    default="build"
-    basedir=".">
-    <!--
-        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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- = = = end standard properties pattern = = = -->
-    <echo
-        message="ant.file: ${ant.file}"/>
-    <target
-        name="build">
-        <java
-            jar="${eclipse.launcher}"
-            fork="true"
-            failonerror="true">
-            <jvmarg
-                value="-Dosgi.ws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dosgi.os=${env.BASEOS}"/>
-            <jvmarg
-                value="-Dosgi.arch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-Dbuild.donottagmaps=${build.donottagmaps}"/>
-            <jvmarg
-                value="-DbuildBranch=${buildBranch}"/>
-            <jvmarg
-                value="-DbuildType=${buildType}"/>
-            <jvmarg
-                value="-DbuildId=${buildId}"/>
-            <jvmarg
-                value="-DmapVersionTag=${mapVersionTag}"/>
-            <jvmarg
-                value="-Dbuild.distribution=${build.distribution}"/>
-            <jvmarg
-                value="-DbuildDirectory=${buildDirectory}"/>
-            <jvmarg
-                value="-Dwtp.builder.home=${wtp.builder.home}"/>
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <jvmarg
-                value="-Dprojectname=${projectname}"/>
-            <jvmarg
-                value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
-            <jvmarg
-                value="-DurlLogLocation=${buildDirectory}/outgoinghttplogfromsitebuild.log"/>
-            <arg
-                value="-data"/>
-            <arg
-                value="${basedir}/workspace"/>
-            <arg
-                value="-application"/>
-            <arg
-                value="org.eclipse.ant.core.antRunner"/>
-            <arg
-                value="-buildfile"/>
-            <arg
-                value="${ant.file}"/>
-            <arg
-                value="publish"/>
-        </java>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Steps to do to publish the build results -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="publish">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-        <property
-            file="${buildDirectory}/label.properties"/>
-        <property
-            name="publish.xml"
-            value="${component.dir}/publish.xml"/>
-        <property
-            name="indexFileName"
-            value="index.php"/>
-        <property
-            name="result"
-            value="${buildDirectory}/${buildLabel}"/>
-        <property
-            name="indexTemplateFilename"
-            value="index.html.template.php"/>
-        <copy
-            file="${wtp.builder.home}/distribution/wtp.site/templateFiles/${indexTemplateFilename}"
-            tofile="${buildDirectory}/${indexFileName}"/>
-        <condition
-            property="isBuildTested"
-            value="true">
-            <available
-                file="${buildDirectory}/${buildLabel}/testResults/html"/>
-        </condition>
-        <ant
-            antfile="${publish.xml}"
-            dir="${component.dir}">
-            <property
-                name="dropTokenList"
-                value="%wtpruntime%,%wtpsdk%,%wtptest%,%wst%,%wst-sdk%,%wst-tests%,%jst-tests%,%wst-perf-tests%,%jst-perf-tests%,%jpt-runtime%,%jpt-sdk%,%jpt-tests%"/>
-            <property
-                name="webtoolsDownloadURL"
-                value="http://www.eclipse.org/downloads/download.php?file=/webtools/committers/drops"/>
-            <property
-                name="buildBranch"
-                value="${buildBranch}"/>
-            <property
-                name="isBuildTested"
-                value="${isBuildTested}"/>
-            <property
-                name="indexTemplateFilename"
-                value="${indexTemplateFilename}"/>
-        </ant>
-
-        <!--  Get the build map over for the results to point to. -->
-        <copy
-            file="${buildDirectory}/directory.txt"
-            tofile="${result}/directory.txt"/>
-
-        <!-- Copy info for build identification -->
-        <copy
-            file="${buildDirectory}/buildmachineinfo.properties"
-            tofile="${result}/buildmachineinfo.properties"/>
-
-        <!-- http access logs -->
-        <copy
-            todir="${result}/"
-            failonerror="false">
-            <fileset
-                dir="${buildDirectory}"
-                includes="*.log"/>
-        </copy>
-
-        <!-- ant build log, from control directory -->
-        <copy
-            todir="${result}/"
-            failonerror="false">
-            <fileset
-                dir="${env.ANT_WORKING}/${projectname}"
-                includes="antBuilderOutput.log"/>
-        </copy>
-
-
-
-        <!-- final count files -->
-        <countBuildFiles
-            sourceDirectory="${buildDirectory}/${buildLabel}"
-            filterString=".zip,.tar.gz"
-            outputFile="${buildDirectory}/${buildLabel}/files.count"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wstfproj.site/compilerXMLOutputToHTML.xsl b/releng.wtpbuilder/distribution/wstfproj.site/compilerXMLOutputToHTML.xsl
deleted file mode 100644
index ffc7905..0000000
--- a/releng.wtpbuilder/distribution/wstfproj.site/compilerXMLOutputToHTML.xsl
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet
-    version="1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-    <xsl:output
-        method="html"
-        indent="yes"/>
-    <xsl:template
-        match="/">
-        <html>
-            <body>
-                <xsl:apply-templates
-                    select="compiler"/>
-            </body>
-        </html>
-    </xsl:template>
-    <xsl:template
-        match="compiler">
-        <h2>Compiler Report</h2>
-        <p>
-            Compiler:
-            <xsl:value-of
-                select="@name"/>
-            <xsl:text>   </xsl:text>
-            Version:
-            <xsl:value-of
-                select="@version"/>
-        </p>
-        <xsl:apply-templates
-            select="stats"/>
-        <xsl:apply-templates
-            select="sources"/>
-    </xsl:template>
-    <xsl:template
-        name="stats"
-        match="stats">
-        <p>
-            Number of source files:
-            <xsl:value-of
-                select="count(..//source)"/>
-            Number of classfiles:
-            <xsl:value-of
-                select="number_of_classfiles/@value"/>
-        </p>
-        <p>
-            Problems:
-            <xsl:value-of
-                select="problem_summary/@problems"/>
-            (Errors:
-            <xsl:value-of
-                select="problem_summary/@errors"/>
-            Warnings:
-            <xsl:value-of
-                select="problem_summary/@warnings"/>
-            )
-        </p>
-    </xsl:template>
-    <xsl:template
-        name="sources"
-        match="sources">
-        <xsl:if
-            test="count(source) > 0">
-            <dl>
-                <xsl:for-each
-                    select="source">
-                    <xsl:variable
-                        name="package"
-                        select="normalize-space(@package)">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="path"
-                        select="normalize-space(@path)">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="classname"
-                        select="substring-after($path, $package)">
-                    </xsl:variable>
-                    <xsl:if
-                        test="count(problems) > 0">
-                        <dt
-                            style="font-weight: bold; color: black">
-                            Source File:
-                            <xsl:value-of
-                                select="$package"/>
-                            <xsl:value-of
-                                select="$classname"/>
-                        </dt>
-                        <xsl:apply-templates
-                            select="problems">
-                            <xsl:with-param
-                                name="classname">
-                                <xsl:value-of
-                                    select="$classname"/>
-                            </xsl:with-param>
-                        </xsl:apply-templates>
-                    </xsl:if>
-                </xsl:for-each>
-            </dl>
-        </xsl:if>
-    </xsl:template>
-    <xsl:template
-        match="problems">
-        <xsl:param
-            name="classname"/>
-        <xsl:for-each
-            select="problem">
-            <dd
-                style="font-weight: normal; color: black">
-                <xsl:value-of
-                    select="position()"/>
-                <xsl:text>.  </xsl:text>
-                <xsl:value-of
-                    select="@severity"/>
-                <xsl:text>:  </xsl:text>
-                <xsl:value-of
-                    select="@id"/>
-                <xsl:variable
-                    name="lineNumber"
-                    select="@line">
-                </xsl:variable>
-                <xsl:for-each
-                    select="message">
-                    <p
-                        style="margin-left: +.5in; font-size: -1; margin-top: 0;margin-bottom:0;">
-                        <small>
-                            <xsl:value-of
-                                select="@value"/>
-                        </small>
-                    </p>
-                </xsl:for-each>
-                <xsl:for-each
-                    select="source_context">
-                    <xsl:variable
-                        name="pre"
-                        select="substring(@value,0,(@sourceStart + 1))">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="main"
-                        select="substring(@value,(@sourceStart + 1),(((@sourceEnd + 1) - (@sourceStart + 1)) + 1))">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="end"
-                        select="substring(@value,(@sourceEnd + 2))">
-                    </xsl:variable>
-                    <p
-                        style="margin-left: +.5in; font-size: -2; margin-top: 0;margin-bottom:0;">
-                        <xsl:value-of
-                            select="substring($classname,2)"/>
-                        :
-                    </p>
-                    <p
-                        style="margin-left: +.5in; font-size: -2;font-family: monospace; margin-top: 0;margin-bottom:0;">
-                        <xsl:value-of
-                            select="$lineNumber"/>
-                        :
-                        <xsl:value-of
-                            select="$pre"/>
-                        <b>
-                            <u>
-                                <xsl:value-of
-                                    select="$main"/>
-                            </u>
-                        </b>
-                        <xsl:value-of
-                            select="$end"/>
-                    </p>
-                </xsl:for-each>
-            </dd>
-        </xsl:for-each>
-    </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wstfproj.site/publish.xml b/releng.wtpbuilder/distribution/wstfproj.site/publish.xml
deleted file mode 100644
index 0f35d8d..0000000
--- a/releng.wtpbuilder/distribution/wstfproj.site/publish.xml
+++ /dev/null
@@ -1,649 +0,0 @@
-<project
-    name="Publish Build"
-    default="default"
-    basedir=".">
-    <!--
-        Properties that must be passed to this script: buildDirectory:
-        Path to perform the build in. (A working directory) buildType:
-        Type of build (nightly, integration etc.) buildId: Build name
-        buildLabel: <buildType>-<buildName>-<timestamp>
-    -->
-    <property
-        environment="env"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be provided to publish"/>
-    <fail
-        unless="buildLabel"
-        message="buildLabel must be provided to publish"/>
-    <fail
-        unless="wtp.builder.home"
-        message="wtp.builder.home must be provided to publish"/>
-    <fail
-        unless="build.distribution"
-        message="build.distribution must be provided to publish"/>
-    <property
-        name="resultDir"
-        value="${buildDirectory}/${buildLabel}"/>
-    <!--name of generated index page-->
-    <property
-        name="indexFileName"
-        value="index.php"/>
-    <property
-        name="templateDir"
-        value="${wtp.builder.home}/distribution/${build.distribution}.site"/>
-    <property
-        name="resultingIndex"
-        value="${resultDir}/${indexFileName}"/>
-    <echo
-        level="debug"
-        message="resultDir: ${resultDir}"/>
-    <echo
-        level="debug"
-        message="templateDir: ${templateDir}"/>
-    <echo
-        level="debug"
-        message="resultingIndex: ${resultingIndex}"/>
-    <target
-        name="default">
-        <copy
-            overwrite="true"
-            file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/${indexTemplateFilename}"
-            tofile="${resultingIndex}"/>
-        <antcall
-            target="countFiles"/>
-        <antcall
-            target="generateCompileIndex"/>
-        <antcall
-            target="generateJUnitTestsIndex"/>
-        <antcall
-            target="getStaticFiles"/>
-    </target>
-    <target
-        name="generateCompileIndex">
-        <!--
-            <taskdef name="indexResults"
-            classname="org.eclipse.wtp.releng.tools.ResultsSummaryGenerator"
-            />
-        -->
-        <!--
-            isBuildTested: true|false should JUnit plugin test results
-            be used to generate index page dropTokenList: comma
-            separated list of strings which should be replaced by the
-            fileName attribute settings in the testManifest.xml.
-            xmlDirectoryName: path to directory containing JUnit plugin
-            test results in xml format (see doc is org.eclipse.test).
-            dropDirectoryName: path to directory containing the result
-            of the build. testResultsTemplateFileName: path to template
-            file used to generate page with links to JUnit test results
-            testResultsHtmlFileName: name of file which will be
-            generated with links to JUnit test results dropHtmlFileName:
-            name of generated index page hrefTestResultsTargetPath:
-            relative path from index page to directory containing JUnit
-            html test results hrefCompileLogsTargetPath: relative path
-            from index page directory containing compilelogs
-            testManifestFileName: name of xml file containing
-            descriptions of zip types and log files
-        -->
-        <property
-            file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-
-        <!-- create tables of test plugin compiles first -->
-        <antcall
-            target="generateTestCompileOutput">
-            <param
-                name="outputDirectory"
-                value="${resultDir}/testcompilelogs"/>
-        </antcall>
-
-        <!-- create table of code plugins compiles -->
-        <antcall
-            target="generateCompileOutput">
-            <param
-                name="outputDirectory"
-                value="${resultDir}/compilelogs"/>
-        </antcall>
-        <tstamp>
-            <format
-                property="TODAY"
-                pattern="MMMM d, yyyy"/>
-        </tstamp>
-
-        <!--  Insert Build Type descriptor  -->
-        <antcall
-            target="${buildType}"/>
-        <antcall
-            target="writeData"/>
-        <!--
-            Update timestamp on file to permit overwrite through Ant
-            copy task
-        -->
-        <touch
-            file="${resultingIndex}"/>
-    </target>
-    <target
-        name="generateTestCompileOutput"
-        depends="checkIfCompileLogs"
-        if="doCompileLogs">
-        <summarizeResults
-            isBuildTested="false"
-            includeAll="true"
-            dropTokenList="${dropTokenList}"
-            xmlDirectoryName=""
-            dropDirectoryName="${resultDir}"
-            testResultsTemplateFileName="${templateDir}/templateFiles/testCompileResults.php.template"
-            testResultsHtmlFileName="testCompileResults.php"
-            hrefTestResultsTargetPath=""
-            hrefCompileLogsTargetPath="testcompilelogs"
-            compileLogsDirectoryName="${outputDirectory}"/>
-        <antcall
-            target="compilerXMLToHTML"/>
-    </target>
-    <target
-        name="generateCompileOutput"
-        depends="checkIfCompileLogs"
-        if="doCompileLogs">
-        <summarizeResults
-            isBuildTested="false"
-            includeAll="true"
-            dropTokenList="${dropTokenList}"
-            xmlDirectoryName=""
-            dropDirectoryName="${resultDir}"
-            testResultsTemplateFileName="${templateDir}/templateFiles/compileResults.php.template"
-            testResultsHtmlFileName="compileResults.php"
-            hrefTestResultsTargetPath="testResults/html"
-            hrefCompileLogsTargetPath="compilelogs"
-            compileLogsDirectoryName="${outputDirectory}"/>
-        <antcall
-            target="compilerXMLToHTML"/>
-    </target>
-    <target
-        name="compilerXMLToHTML">
-        <xslt
-            basedir="${outputDirectory}"
-            destdir="${outputDirectory}"
-            includes="**/*.xml"
-            scanincludeddirectories="true"
-            style="compilerXMLOutputToHTML.xsl"
-            force="true"/>
-    </target>
-    <target
-        name="generateJUnitTestsIndex"
-        depends="checkIfTested"
-        if="doTests">
-        <!--
-            isBuildTested: true|false should JUnit plugin test results
-            be used to generate index page dropTokenList: comma
-            separated list of strings which should be replaced by the
-            fileName attribute settings in the testManifest.xml.
-            xmlDirectoryName: path to directory containing JUnit plugin
-            test results in xml format (see doc is org.eclipse.test).
-            dropDirectoryName: path to directory containing the result
-            of the build. testResultsTemplateFileName: path to template
-            file used to generate page with links to JUnit test results
-            testResultsHtmlFileName: name of file which will be
-            generated with links to JUnit test results dropHtmlFileName:
-            name of generated index page hrefTestResultsTargetPath:
-            relative path from index page to directory containing JUnit
-            html test results hrefCompileLogsTargetPath: relative path
-            from index page directory containing compilelogs
-            testManifestFileName: name of xml file containing
-            descriptions of zip types and log files
-        -->
-        <property
-            file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-
-        <!-- create table of test plugin compiles first -->
-        <!-- set isBuildTested to true for the "compile only" results -->
-        <summarizeResults
-            isBuildTested="true"
-            dropTokenList="${dropTokenList}"
-            dropDirectoryName="${resultDir}"
-            xmlDirectoryName="${resultDir}/testResults/xml"
-            testResultsTemplateFileName="${templateDir}/templateFiles/testResults.php.template"
-            testResultsHtmlFileName="testResults.php"
-            hrefTestResultsTargetPath="testResults/html"
-            compileLogsDirectoryName=""/>
-        <tstamp>
-            <format
-                property="TODAY"
-                pattern="MMMM d, yyyy"/>
-        </tstamp>
-
-        <!--  Insert Build Type descriptor  -->
-        <antcall
-            target="${buildType}"/>
-        <antcall
-            target="writeData"/>
-        <!--
-            Update timestamp on file to permit overwrite through Ant
-            copy task
-        -->
-        <touch
-            file="${resultingIndex}"/>
-    </target>
-    <target
-        name="getStaticFiles">
-        <!--get static files required in the buildLabel directory-->
-        <copy
-            todir="${resultDir}">
-            <fileset
-                dir="${templateDir}/staticDropFiles"/>
-        </copy>
-
-        <!--copy buildnotes from plugin directories-->
-        <mkdir
-            dir="${resultDir}/buildnotes"/>
-        <copy
-            todir="${resultDir}/buildnotes"
-            flatten="true">
-            <fileset
-                dir="${buildDirectory}/plugins"
-                includes="**/buildnotes_*.html"/>
-            <fileset
-                dir="${buildDirectory}/features"
-                includes="**/buildnotes_*.html"/>
-        </copy>
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/full/logIndex.php"/>
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/testLogs/logIndex.php"/>
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/testSysErrorLogs/logIndex.php"/>
-    </target>
-    <target
-        name="updateSite">
-
-
-        <!-- get our authored, tokenized site.xml file -->
-        <copy
-            file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/siteWTP.xml"
-            tofile="${buildDirectory}/${buildLabel}/updateSite/site.xml"
-            overwrite="true"
-            failonerror="true"/>
-        <!--
-            get the ${buildDirectory}/finalPluginsVersions.properties,
-            and read as properties
-        -->
-        <!-- substitute property value for tokens -->
-        <replace
-            file="${buildDirectory}/${buildLabel}/updateSite/site.xml"
-            propertyfile="${buildDirectory}/finalFeaturesVersions.properties">
-            <replacefilter
-                token="@org.eclipse.wtp@"
-                property="org.eclipse.wtp"/>
-            <replacefilter
-                token="@org.eclipse.wtp.sdk@"
-                property="org.eclipse.wtp.sdk"/>
-            <replacefilter
-                token="@org.eclipse.jst@"
-                property="org.eclipse.jst"/>
-            <replacefilter
-                token="@org.eclipse.jst.sdk@"
-                property="org.eclipse.jst.sdk"/>
-            <replacefilter
-                token="@org.eclipse.jpt.feature@"
-                property="org.eclipse.jpt.feature"/>
-            <replacefilter
-                token="@org.eclipse.jpt_sdk.feature@"
-                property="org.eclipse.jpt_sdk.feature"/>
-        </replace>
-    </target>
-    <target
-        name="countFiles">
-        <!--
-            files.count is a file that should exist in the drop
-            directory with a count of the zip files in the same
-            directory. It is required to generate a link to the build on
-            the downloads page.
-        -->
-        <countBuildFiles
-            sourceDirectory="${resultDir}"
-            filterString=".zip,.tar.gz"
-            outputFile="${resultDir}/files.count"/>
-    </target>
-
-    <!--Build type descriptors-->
-    <target
-        name="I">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Integration"/>
-    </target>
-    <target
-        name="S">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Stable"/>
-    </target>
-    <target
-        name="N">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Nightly"/>
-    </target>
-    <target
-        name="M">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Maintenance"/>
-    </target>
-    <target
-        name="R">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Release"/>
-    </target>
-    <target
-        name="T">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Test"/>
-    </target>
-    <target
-        name="P">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Patches"/>
-    </target>
-    <target
-        name="checkIfTested">
-        <echo
-            level="debug"
-            message="isBuildTested: ${isBuildTested}"/>
-        <condition
-            property="doTests">
-            <equals
-                arg1="${isBuildTested}"
-                arg2="true"
-                trim="true"
-                casesensitive="false"/>
-        </condition>
-    </target>
-    <target
-        name="checkIfCompileLogs">
-        <condition
-            property="doCompileLogs">
-            <available
-                file="${outputDirectory}"/>
-        </condition>
-    </target>
-    <target
-        name="writeData">
-        <!--  Insert Build Date  -->
-        <replace
-            file="${resultingIndex}"
-            token="@date@"
-            value="${TODAY}"/>
-
-        <!--  Insert Build Name  -->
-        <replace
-            file="${resultingIndex}"
-            token="@build@"
-            value="${buildLabel}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@buildBranch@"
-            value="${buildBranch}"/>
-
-        <!--  Insert PreRequsites  -->
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseFile@"
-            value="${eclipse.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseURL@"
-            value="${eclipse.url}/${eclipse.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseBuildURL@"
-            value="${eclipse.url}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilelinux@"
-            value="${eclipse.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilewindows@"
-            value="${eclipse.file.win32-win32-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilemacos@"
-            value="${eclipse.file.macosx-carbon-ppc}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseBuildHome@"
-            value="${eclipse.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipse.mirror.prefixuri@"
-            value="${eclipse.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipse.fspath.prefix@"
-            value="${eclipse.fspath.prefix}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@testURL@"
-            value="${eclipseTestFramework.url}/${eclipseTestFramework.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@testFile@"
-            value="${eclipseTestFramework.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfName@"
-            value="${emf.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfDescription@"
-            value="${emf.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfFile@"
-            value="${emf.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfURL@"
-            value="${emf.url}/${emf.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfBuildHome@"
-            value="${emf.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emf.mirror.prefixuri@"
-            value="${emf.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdFile@"
-            value="${emfxsd.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdName@"
-            value="${emfxsd.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdDescription@"
-            value="${emfxsd.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdURL@"
-            value="${emfxsd.url}/${emfxsd.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdBuildHome@"
-            value="${emfxsd.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsd.mirror.prefixuri@"
-            value="${emfxsd.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstFile@"
-            value="${wst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstURL@"
-            value="${wst.url}/${wst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstBuildHome@"
-            value="${wst.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wst.mirror.prefixuri@"
-            value="${wst.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstFile@"
-            value="${jst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstURL@"
-            value="${jst.url}/${jst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstBuildHome@"
-            value="${jst.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jst.mirror.prefixuri@"
-            value="${jst.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpFile@"
-            value="${wtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpURL@"
-            value="${wtp.url}/${wtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpBuildHome@"
-            value="${wtp.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtp.mirror.prefixuri@"
-            value="${wtp.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefFile@"
-            value="${gef.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefURL@"
-            value="${gef.url}/${gef.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefBuildHome@"
-            value="${gef.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gef.mirror.prefixuri@"
-            value="${gef.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipserelengFile@"
-            value="${eclipsereleng.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipserelengURL@"
-            value="${eclipsereleng.url}/${eclipsereleng.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipFile@"
-            value="${orbitthirdpartyzip.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipURL@"
-            value="${orbitthirdpartyzip.url}/${orbitthirdpartyzip.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipBuildHome@"
-            value="${orbitthirdpartyzip.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzip.mirror.prefixuri@"
-            value="${orbitthirdpartyzip.mirror.prefixuri}"/>
-
-
-        <!-- no longer used. Post 1.5.5 -->
-        <replace
-            file="${resultingIndex}"
-            token="@jemFile@"
-            value="${jem.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jemURL@"
-            value="${jem.url}/${jem.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jemBuildHome@"
-            value="${jem.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jem.mirror.prefixuri@"
-            value="${jem.mirror.prefixuri}"/>
-        <!--
-            these token/s should not exist in maintenance stream, but do
-            no harm done, so in the interests of keeping builder streams
-            in sync, we'll leave them here as place hold
-        -->
-        <replace
-            file="${resultingIndex}"
-            token="@dtpFile@"
-            value="${dtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtpURL@"
-            value="${dtp.url}/${dtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtpBuildHome@"
-            value="${dtp.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtp.mirror.prefixuri@"
-            value="${dtp.mirror.prefixuri}"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/access_err.gif b/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/access_err.gif
deleted file mode 100644
index 4f0748a..0000000
--- a/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/access_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/access_warn.gif b/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/access_warn.gif
deleted file mode 100644
index 8386e3e..0000000
--- a/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/access_warn.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/buildNotes.php b/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/buildNotes.php
deleted file mode 100644
index e843ecf..0000000
--- a/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/buildNotes.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<html>
-<head>
-<?php
-$parts = explode("/", getcwd());
-$parts2 = explode("-", $parts[count($parts) - 1]);
-$buildName = $parts2[1];
-
-echo "<title>Build Notes for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Build Notes</font></b></p>
-
-<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"> Build Notes for <?php echo "$buildName"; ?></font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$hasNotes = false;
-$aDirectory = dir("buildnotes");
-while ($anEntry = $aDirectory->read()) {
-    if ($anEntry != "." && $anEntry != "..") {
-        //print_r($anEntry);
-        //echo "<br />";
-
-        $subject = $anEntry;
-        $pattern = '/^buildnotes_(.*)/i';
-        preg_match($pattern, $subject, $matches);
-        $subject = $matches[1];
-        //print_r($subject);
-        //echo "<br />";
-        $pattern = '/^(.*)\.html$/';
-        preg_match($pattern, $subject, $matches);
-        //print_r($matches);
-        //echo "<br />";
-
-        $component = $matches[1];
-
-        $line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
-        echo "<tr>";
-        echo "$line";
-        echo "</tr>";
-        $hasNotes = true;
-
-    }
-}
-$aDirectory.closedir();
-if (!$hasNotes) {
-    echo "<br>There are no build notes for this build.";
-}
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/compile_err.gif b/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/compile_err.gif
deleted file mode 100644
index c2bfdd6..0000000
--- a/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/compile_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/compile_warn.gif b/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/compile_warn.gif
deleted file mode 100644
index cf4fdf9..0000000
--- a/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/compile_warn.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/consoleLogs.php b/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/consoleLogs.php
deleted file mode 100644
index 7dd5f42..0000000
--- a/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/consoleLogs.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<html>
-<head>
-<?php
-$parts = explode("/", getcwd());
-$parts2 = explode("-", $parts[count($parts) - 1]);
-$buildName = $parts2[1];
-
-echo "<title>Test Console Output for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-<title>Console Logs from Running JUnit Plug-in Tests</title>
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b></p>
-
-<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">Console output from running
-		JUnit plugin tests for <?php echo "$buildName"; ?> </font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$rootDir = "testResults/consolelogs";
-$hasNotes = false;
-$aDirectory = dir($rootDir);
-$index = 0;
-$dirindex = 0;
-while ($anEntry = $aDirectory->read()) {
-    if ($anEntry != "." && $anEntry != "..") {
-        if (is_file("$rootDir/$anEntry")) {
-            $entries[$index] = $anEntry;
-            $index++;
-        } else if (is_dir("$rootDir/$anEntry")) {
-            $direntries[$dirindex] = $anEntry;
-            $dirindex++;
-        }
-    }
-}
-$aDirectory->close();
-
-
-sort($entries);
-sort($direntries);
-
-for ($i = 0; $i < $dirindex; $i++) {
-    $anEntry = $direntries[$i];
-    $line = "<td><a href=\"testResults/consolelogs/$anEntry/logIndex.php\">$anEntry</a></td>";
-    echo "<tr>";
-    echo "$line";
-    echo "</tr>";
-}
-for ($i = 0; $i < $index; $i++) {
-    $anEntry = $entries[$i];
-    $logsize = filesize("testResults/consolelogs/$anEntry");
-
-
-    $level = 0;
-    if ($logsize > 20000) {
-        $level = 2;
-    }
-    else if ($logsize > 2000) {
-        $level = 1;
-    }
-
-    if ($level == 0) {
-        $line = "<td><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-    }
-    else if ($level == 1) {
-        $line = "<td><em><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-    } else if ($level == 2) {
-        $line = "<td><strong><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-    }
-
-
-    echo "<tr>";
-    echo "$line";
-    echo "</tr>";
-    $hasNotes = true;
-}
-
-if (!$hasNotes) {
-    echo "<br>There are no test logs for this build.";
-}
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/junit_err.gif b/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/junit_err.gif
deleted file mode 100644
index 1b7ff9d..0000000
--- a/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/junit_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/logIndex.php b/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/logIndex.php
deleted file mode 100644
index 0b36334..0000000
--- a/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/logIndex.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<html>
-<head>
-<?php
-
-function endsWith( $str, $sub ) {
-
-   return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub );
-}
-
-        $parts = explode("/", getcwd());
-        $parts2 = explode("-", $parts[count($parts) - 1]);
-        $buildName = $parts2[1];
-
-        echo "<title>Test Console Output for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" type="text/css">
-<title>Console Logs from Running JUnit Plug-in Tests</title></head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b> </p>
-
-<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">Console
-      output from running JUnit plugin tests for
-      <?php echo "$buildName"; ?>
-      </font></b></td>
-  </tr>
-</table>
-<table border="0">
-
-<?php
-        $hasNotes = false;
-        $aDirectory = dir(".");
-        $index = 0;
-        while ($anEntry = $aDirectory->read()) {
-                if ($anEntry != "." && $anEntry != ".." && !endsWith(__FILE__, $anEntry)) {
-                        $entries[$index] = $anEntry;
-                        $index++;
-                }
-        }
-        aDirectory.closedir();
-
-
-        sort($entries);
-
-        for ($i = 0; $i < $index; $i++) {
-                $anEntry = $entries[$i];
-                $logsize = filesize("$anEntry");
-
-
-                $level = 0;
-                if ($logsize > 20000) {
-                        $level = 2;
-                }
-                else if ($logsize > 2000) {
-                        $level = 1;
-                }
-
-                if ($level == 0) {
-                        $line = "<td><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-                }
-                else if ($level == 1) {
-                        $line = "<td><em><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-                } else if ($level == 2) {
-                        $line = "<td><strong><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-                }
-
-
-                echo "<tr>";
-                echo "$line";
-                echo "</tr>";
-                $hasNotes = true;
-        }
-
-        if (!$hasNotes) {
-                echo "<br>There are no test logs for this build.";
-        }
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/miscUtil.php b/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/miscUtil.php
deleted file mode 100644
index 966ed48..0000000
--- a/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/miscUtil.php
+++ /dev/null
@@ -1,219 +0,0 @@
-<?php
-
-// todo: unsure if can handle filenames that are URLs?
-// handy constant to compute file size in megabytes
-
-function fileSizeInMegs($filename) {
-	$onemeg=1024*1024;
-	$zipfilesize=filesize($filename);
-	$zipfilesize=round($zipfilesize/$onemeg, 0);
-	return $zipfilesize;
-}
-
-function fileSizeForDisplay($filename) {
-	$onekilo=1024;
-	$onemeg=$onekilo * $onekilo;
-	$criteria = 10 * $onemeg;
-	$scaleChar = "M";
-	if (file_exists($filename)) {
-      	$zipfilesize=filesize($filename);
-      	if ($zipfilesize > $criteria) {
-      		$zipfilesize=round($zipfilesize/$onemeg, 0);
-      		$scaleChar = "M";
-      	}
-      	else {
-      		$zipfilesize=round($zipfilesize/$onekilo, 0);
-      		$scaleChar = "K";
-      	}
-  	} 
-  	else {
-  	   $zipfilesize = 0;
-  	}
-	$result =  "(" . $zipfilesize . $scaleChar . ")";
-	return $result;
-}
-
-
-function displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription) {
-	echo "<td align=\"right\" valign=\"top\" width=\"30%\">";
-	echo "<a href=\"$downloadprefix$filename\">" . $fileShortDescription . "</a>";
-	echo "</td><td align=\"right\" valign=\"top\" width=\"3%\">";
-	echo $zipfilesize;
-	echo "</td>";
-	echo "<td align=\"right\" valign=\"top\" width=\"2%\">";
-	echo "[<a href=\"checksum/$filename.md5\">md5</a>]";
-	echo "</td>";
-}
-
-function resourceExist($url, $mirrorPrefixuri, $prereqfilename, $eclipseFSpathPrefix)
-{
-	$result = false;
-
-	$allowURLopen = ini_get('allow_url_fopen');
-
-	if ($allowURLopen && stream_last_modified($url)) {
-		$result = true;
-	}
-	else {
-		// TODO: for now, we'll do a raw check on the whole file name, since enable_url_open
-		// is off. better would be to check if we are on build.eclipse.org or download.eclipse.org?
-    $wholePath = trim($eclipseFSpathPrefix) . "/" . trim($mirrorPrefixuri) . "/" . trim($prereqfilename);
-    if (file_exists($wholePath)) {
-    	$result = true;
-    }
-	}
-	return $result;
-}
-
-function stream_last_modified($url)
-{
-	if (function_exists('version_compare') && version_compare(phpversion(), '4.3.0') > 0)
-	{
-		if (!($fp = @fopen($url, 'r')))
-		return NULL;
-
-		$meta = stream_get_meta_data($fp);
-		for ($j = 0; isset($meta['wrapper_data'][$j]); $j++)
-		{
-			if (strstr(strtolower($meta['wrapper_data'][$j]), 'last-modified'))
-			{
-				$modtime = substr($meta['wrapper_data'][$j], 15);
-				break;
-			}
-		}
-		fclose($fp);
-	}
-	else
-	{
-		$parts = parse_url($url);
-		$host  = $parts['host'];
-		$path  = $parts['path'];
-
-		if (!($fp = @fsockopen($host, 80)))
-		return NULL;
-
-		$req = "HEAD $path HTTP/1.0\r\nUser-Agent: PHP/".phpversion()."\r\nHost: $host:80\r\nAccept: */*\r\n\r\n";
-		fputs($fp, $req);
-
-		while (!feof($fp))
-		{
-			$str = fgets($fp, 4096);
-			if (strstr(strtolower($str), 'last-modified'))
-			{
-				$modtime = substr($str, 15);
-				break;
-			}
-		}
-		fclose($fp);
-	}
-	return isset($modtime) ? strtotime($modtime) : time();
-}
-
-function isMirrored($uriToCheck) {
-	global $debugScript;
-	global $debugFunctions;
-	$localuri = $uriToCheck;
-
-	$debugMirrorList = false;
-	if ($debugScript) {
-		echo "uriToCheck: " . $localuri . "<br />";
-	}
-
-	$xmlcount = 0;
-
-	/* This method true and accurate method of parsing mirror results
-	 * may be expensive, and would
-	 * likely cause artificially high counts of "downloads".
-	 * Could maybe use if somehow only checked once ever 5 minutes or something.
-
-
-	 // turn off warnings, as sometimes HTML is returned, which causes lots of warnings
-	 $holdLevel = error_reporting(E_ERROR);
-	 $mirrorsxml=simplexml_load_file(rawurlencode($localuri) . urlencode("&format=xml"));
-	 error_reporting($holdLevel);
-
-
-	 if ($mirrorsxml) {
-	 if ($debugFunctions) {
-	 echo "root node: " . $mirrorsxml->getName() . "<br />";
-	 }
-	 if (strcmp($mirrorsxml->getName(), "mirrors") == 0) {
-	 foreach ($mirrorsxml->children() as $mirror) {
-	 if (strcmp($mirror->getName(),"mirror") == 0) {
-	 $xmlcount=$xmlcount+1;
-	 }
-	 if ($debugMirrorList) {
-	 print_r($mirror);
-	 echo "<br />";
-	 }
-	 }
-	 }
-	 if ($debugFunctions) {
-	 echo "Mirror count: " . $xmlcount . "<br />";
-	 }
-	 }
-	 */
-	/*
-	 * Use simple heuristic based on pattern
-	 * in the URI ... if it contains "/downloads/" then assume it's mirrored
-	 */
-	if (strpos($uriToCheck, "webtools/downloads/") > 0) {
-		$xmlcount = 1;
-	}
-	return ($xmlcount > 0);
-
-}
-
-// TODO: replace with Phoenix variables
-function getPlatform () {
-	global $debugScript;
-	global $debugFunctions;
-	// getBrowser is expensive, so cache the data
-	static $browser;
-	$platform = "unknown";
-
-
-	if(ini_get("browscap")) {
-		if(!isset($browser)){
-			$browser = get_browser(null, true);
-		}
-
-		if ($browser) {
-			$rawPlatform = $browser['platform'];
-			if ($debugFunctions) {
-				echo "browser platfrom: " . $rawPlatform . "<br />" ;
-			}
-
-			if ($debugFunctions) {
-				$browserKeys = array_keys($browser);
-				foreach ($browserKeys as $key) {
-					echo $key . ": " . $browser[$key] . "<br />";
-				}
-			}
-		}
-		if (strpos($rawPlatform, "Win") === 0) {
-			$platform="windows";
-		} else if (strpos($rawPlatform, "Linux") === 0) {
-			$platform="linux";
-		} else if (strpos($rawPlatform, "Mac") === 0) {
-			$platform="mac";
-		}
-	}
-	return $platform;
-}
-
-
-function getPrereqReferenceOrName($eclipseMirrorScript, $mirrorPrefixuri, $prerequrl, $prereqfilename, $eclipseFSpathPrefix) {
-	// todo: we really only need "if exists" so could make a bit more efficient
-	// I tried "file_exists" but is didn't seem to work on my test server
-	// For these pre-reqs, we assume if they exist, they are mirrored. This is true
-	// 99% of the time.
-
-	if (resourceExist($prerequrl, $mirrorPrefixuri, $prereqfilename, $eclipseFSpathPrefix)) {
-		$reflink="<a href=\"" . $eclipseMirrorScript . $mirrorPrefixuri . "/" . $prereqfilename . "\">" . $prereqfilename . "</a>";
-	} else {
-		$reflink=$prereqfilename;
-	}
-	return $reflink;
-}
-?>
diff --git a/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/pending.gif b/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/pending.gif
deleted file mode 100644
index 66db2a6..0000000
--- a/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/pending.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/pending1.gif b/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/pending1.gif
deleted file mode 100644
index 1b2ea6e..0000000
--- a/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/pending1.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/report2.php b/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/report2.php
deleted file mode 100644
index 52d2284..0000000
--- a/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/report2.php
+++ /dev/null
@@ -1,45 +0,0 @@
-
-        <?php
-
-function parse_testResults($filename)
-{
-        $junitFailures = 0;
-        if (is_file($filename)) {
-                $handle = @fopen($filename, "r");
-                if ($handle)
-                {
-                        $size = filesize($filename);
-                        $content = fread($handle, $size);
-                        fclose($handle);
-                        $junitStart = strpos($content, "Errors &amp; Failures");
-                        $junitEnd = strpos($content, "</table>", $junitStart);
-                        $junitInfo = substr($content, $junitStart, $junitEnd - $junitStart);
-                        $start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">");
-                        while ($start !== false)
-                        {
-                                $start += 29;
-                                $stop = strpos($junitInfo, "</font></b></td>", $start);
-                                if ($stop !== false)
-                                {
-                                        $result = substr($junitInfo, $start, $stop - $start);
-                                        if (is_numeric($result))
-                                        {
-                                                $junitFailures += $result;
-                                        }
-                                        else if (strcmp($result, "DNF") == 0)
-                                        {
-                                                $junitFailures++;
-                                        }
-                                }
-                                $start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">", $stop);
-                        }
-                        $results = array($junitFailures);
-                        return $results;
-                }
-        }
-}
-
-
-?>
-
-
diff --git a/releng.wtpbuilder/distribution/wstfproj.site/templateFiles/compileResults.php.template b/releng.wtpbuilder/distribution/wstfproj.site/templateFiles/compileResults.php.template
deleted file mode 100644
index f785771..0000000
--- a/releng.wtpbuilder/distribution/wstfproj.site/templateFiles/compileResults.php.template
+++ /dev/null
@@ -1,76 +0,0 @@
-<html>
-<head>
-
-<?php
-        $parts = explode("/", getcwd());
-        $parts2 = explode("-", $parts[count($parts) - 1]);
-        $buildName = $parts2[1];
-
-        echo "<title>Compile Logs: Code Bundles for $buildName</title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2%;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-}
-</style>
-</head>
-<body>
-
-<?php
-        echo "<h1>Compile Logs: Code Bundles for $buildName</h1>";
-?>
-
-
-<table id=tabledata align = "center" width="75%" border="1">
-  <tr>
-    <td class="bold" align="center">Compile Logs</td>
-    <td class="bold" align="center">Compile Errors</td>
-    <td class="bold" align="center">Compiler Warnings</td>
-    <td class="bold" align="center">Access Violations</td>
-    <td class="bold" align="center">Access Warnings</td>
-  </tr>
-
-  %compilelogs%
-
-</table>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/wstfproj.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/wstfproj.site/templateFiles/index.html.template.php
deleted file mode 100644
index fd5039f..0000000
--- a/releng.wtpbuilder/distribution/wstfproj.site/templateFiles/index.html.template.php
+++ /dev/null
@@ -1,614 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<title>WTP Incubator Downloads</title>
-
-
-<?php
-
-$buildBranch="@buildBranch@";
-$build="@build@";
-$type="@type@";
-$builddate="@date@";
-
-$eclipseMirrorPrefixuri="@eclipse.mirror.prefixuri@";
-$eclipseFSpathPrefix="@eclipse.fspath.prefix@";
-
-$eclipsefilelinux="@eclipsefilelinux@";
-$eclipsefilewindows="@eclipsefilewindows@";
-$eclipsefilemacosx="@eclipsefilemacos@";
-
-$eclipseURL="@eclipseURL@";
-$eclipseFile="@eclipseFile@";
-$eclipseBuildURL="@eclipseBuildURL@";
-$eclipseBuildHome="@eclipseBuildHome@";
-$testURL="@testURL@";
-$testFile="@testFile@";
-
-$wstURL="@wstURL@";
-$wstFile="@wstFile@";
-$wstMirrorPrefixuri="@wst.mirror.prefixuri@";
-$wstBuildHome="@wstBuildHome@";
-
-$jstURL="@jstURL@";
-$jstFile="@jstFile@";
-$jstMirrorPrefixuri="@jst.mirror.prefixuri@";
-$jstBuildHome="@jstBuildHome@";
-
-$wtpURL="@wtpURL@";
-$wtpFile="@wtpFile@";
-$wtpMirrorPrefixuri="@wtp.mirror.prefixuri@";
-$wtpBuildHome="@wtpBuildHome@";
-
-$gefURL="@gefURL@";
-$gefFile="@gefFile@";
-$gefMirrorPrefixuri="@gef.mirror.prefixuri@";
-$gefBuildHome="@gefBuildHome@";
-
-$emfURL="@emfURL@";
-$emfFile="@emfFile@";
-$emfMirrorPrefixuri="@emf.mirror.prefixuri@";
-$emfBuildHome="@emfBuildHome@";
-$emfName="@emfName@";
-$emfDescription="@emfDescription@";
-
-$emfsourceURL="@emfsourceURL@";
-$emfsourceFile="@emfsourceFile@";
-$emfsourceMirrorPrefixuri="@emfsource.mirror.prefixuri@";
-$emfsourceBuildHome="@emfsourceBuildHome@";
-$emfsourceName="@emfsourceName@";
-$emfsourceDescription="@emfsourceDescription@";
-
-
-$emfxsdURL="@emfxsdURL@";
-$emfxsdFile="@emfxsdFile@";
-$emfxsdMirrorPrefixuri="@emfxsd.mirror.prefixuri@";
-$emfxsdBuildHome="@emfxsdBuildHome@";
-$emfxsdName="@emfxsdName@";
-$emfxsdDescription="@emfxsdDescription@";
-
-$emfxsdsourceURL="@emfxsdsourceURL@";
-$emfxsdsourceFile="@emfxsdsourceFile@";
-$emfxsdsourceMirrorPrefixuri="@emfxsdsource.mirror.prefixuri@";
-$emfxsdsourceBuildHome="@emfxsdsourceBuildHome@";
-$emfxsdsourceName="@emfxsdsourceName@";
-$emfxsdsourceDescription="@emfxsdsourceDescription@";
-
-
-$dtpURL="@dtpURL@";
-$dtpFile="@dtpFile@";
-$dtpMirrorPrefixuri="@dtp.mirror.prefixuri@";
-$dtpBuildHome="@dtpBuildHome@";
-
-
-$eclipserelengFile="@eclipserelengFile@";
-$eclipserelengURL="@eclipserelengURL@";
-$orbitthirdpartyzipFile="@orbitthirdpartyzipFile@";
-$orbitthirdpartyzipURL="@orbitthirdpartyzipURL@";
-$orbitthirdpartyzipBuildHome="@orbitthirdpartyzipBuildHome@";
-$orbitthirdpartyzipMirrorPrefixuri="@orbitthirdpartyzip.mirror.prefixuri@";
-
-$incubating="false";
-
-
-include("miscUtil.php");
-
-
-
-ini_set("display_errors", "true");
-error_reporting (E_ALL);
-
-
-$debugScript = false;
-$debugFunctions = false;
-
-$defaultMirrorScript="";
-$defaultWTPMirrorPrefix="./";
-
-$eclipseMirrorScript="http://www.eclipse.org/downloads/download.php?file=";
-
-// TODO: improve so this hard coding isn't required.
-// This depends on the declare script changing webtools/committers to webtools/downloads
-// And, the logic is such that if it is not mirrored, this URI is not used at all, just
-// a relative reference only
-$eclipseWTPMirrorPrefix="/webtools/committers/drops/$buildBranch/$build/";
-
-
-$mirrorScript=$defaultMirrorScript;
-$downloadprefix=$defaultWTPMirrorPrefix;
-
-
-$keytestMirrorString=$eclipseMirrorScript . "$eclipseWTPMirrorPrefix/wst-common-fproj-sdk-$build.zip";
-if (isMirrored($keytestMirrorString) ) {
-        $mirrorScript=$eclipseMirrorScript;
-        $downloadprefix="${mirrorScript}${eclipseWTPMirrorPrefix}";
-}
-
-if ($debugScript)  {
-        echo "inferred platform: " . getPlatform();
-}
-
-
-// our summary results handling requires php 5 (for simple xml file loading)
-// so, if not php 5, just don't display any summary results
-// This was found to be required, since some mirror our whole site (e.g. IBM)
-// and not all mirrors use PHP 5
-$displayTestSummary=false;
-if (phpversion() >= 5) {
-
-        $code_totalBundles=0;
-        $code_totalErrors=0;
-        $code_totalWarnings=0;
-        $code_totalforbiddenAccessWarningCount=0;
-        $code_totaldiscouragedAccessWarningCount=0;
-        
-        $test_totalBundles=0;
-        $test_totalErrors=0;
-        $test_totalWarnings=0;
-        $test_totalforbiddenAccessWarningCount=0;
-        $test_totaldiscouragedAccessWarningCount=0;
-
-
-        $displayTestSummary=true;
-        // expecting grandTotalErrors and grandTotalTests
-        $filename = "unitTestsSummary.xml";
-        if (file_exists($filename)) {
-                $prefix = "unitTests_";
-                $unitTestsSummary = simplexml_load_file($filename);
-                foreach ($unitTestsSummary->summaryItem as $summaryItem) {
-                        $name = $summaryItem->name;
-                        $value = $summaryItem->value;
-                        $code= "\$" . $prefix . $name . " = " . $value . ";";
-                        //echo "<br />code: " . $code;
-                        eval($code);
-                }
-        }
-
-        $filename = "compilelogsSummary.xml";
-        if (file_exists($filename)) {
-          $prefix = "code_";
-          $compileSummary = simplexml_load_file($filename);
-          foreach ($compileSummary->summaryItem as $summaryItem) {
-                  $name = $summaryItem->name;
-                  $value = $summaryItem->value;
-                  $code= "\$" . $prefix . $name . " = " . $value . ";";
-                  //echo "<br />code: " . $code;
-                  eval($code);
-          }
-        }
-
-        $filename = "testcompilelogsSummary.xml";
-        if (file_exists($filename)) {
-          $prefix = "test_";
-          $compileSummary = simplexml_load_file($filename);
-          foreach ($compileSummary->summaryItem as $summaryItem) {
-                  $name = $summaryItem->name;
-                  $value = $summaryItem->value;
-                  $code= "\$" . $prefix . $name . " = " . $value . ";";
-                  //echo "<br />code: " . $code;
-                  eval($code);
-          }
-        }
-}
-
-
-?>
-
-
-</head>
-
-<body>
-
-
-<?php
-
-// tiny banner to remind when looking at "local" machine results
-$serverName = $_SERVER["SERVER_NAME"];
-
-if (!stristr($serverName, "eclipse.org") && !stristr($serverName,"you.are.at.eclipsecon.org")) {
-        echo '<center>
-          <p>
-          Reminder: this is <font color="#FF0000">' .
-        $serverName .
-        '</font>
-          See also
-          <a href="http://download.eclipse.org/webtools/downloads" target="_top">the live public Eclipse site</a>.
-          </p>
-          <hr />
-          </center>';
-
-}
-?>
-
-<?php if ($incubating) { ?>
-<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH="100%">
-        <tr>
-                <td ALIGN=left><font face="'Bitstream Vera',Helvetica,Arial" size="+2"><b><?php echo "$type";?>
-                Build: <?php echo "$build";?></b></font></td>
-           <td align="right" rowspan="3"><a
-  href="http://www.eclipse.org/projects/what-is-incubation.php"><img
-  src="http://www.eclipse.org/images/egg-incubation.png" alt="Incubation"
-  align="middle" border="0"></a></td>
-
-        <tr valign="top">
-                <td><font size="-1"><?php echo "$builddate";?></font></td>
-        </tr>
-        <tr valign="top">
-                <td>
-                <p>The Eclipse Web Tools Platform (WTP) Incubator Project provides
-                tools for development that are just getting started, or are
-                experimental in some fashion.</p>
-                </td>
-        </tr>
-</table>
-
-<?php } else { ?>
-
-<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH="100%">
-        <tr>
-                <td ALIGN=left><font face="'Bitstream Vera',Helvetica,Arial" size="+2"><b><?php echo "$type";?>
-                Build: <?php echo "$build";?></b></font></td>
-           
-
-        <tr valign="top">
-                <td><font size="-1"><?php echo "$builddate";?></font></td>
-        </tr>
-        <tr valign="top">
-                <td>
-                <p>Component build from the Eclipse Web Tools Platform (WTP) Project.</p>
-                </td>
-        </tr>
-</table>
-
-<?php } ?>
-
-<!-- ***********  Prerequisites **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-        <tr>
-                <td align="left" valign="top" bgcolor="#0080C0"><font
-                        face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Prerequisites and Handy Extras</font></td>
-        </tr>
-        <tr>
-                <td>
-                <p>These are the prerequisites to build or run these packages. 
-                Also listed are some frequently needed links for
-                committer-required packages when creating new development
-                environments, or targets to run against.</p>
-                <p>Note that WTP requires Java 5 or higher (and, for some things,
-                actually requires a JDK rather than only a JRE) even though many other
-                <a href="http://www.eclipse.org/downloads/">Eclipse Projects</a> can
-                run with <a href="http://www.eclipse.org/downloads/moreinfo/jre.php">other
-                JRE levels</a>.</p><p></p>
-                </td>
-        </tr>
-        <tr>
-                <td>
-                <table border=0 cellspacing=1 cellpadding=1 width="90%" align="center">
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td width="40%">Eclipse Platform (Platform, JDT)</td>
-                                <?php
-                                //customize page depending on user's browser/platform, if we can detect it
-                                $usersPlatform = getPlatform();
-                                // assume windows by default, since likely most frequent, even for cases where
-                                // platform is "unknown". I've noticed Opera reports 'unknown' :(
-                                $recommendedFile=$eclipsefilewindows;
-                                if (strcmp($usersPlatform,"linux")== 0) {
-                                        $recommendedFile=$eclipsefilelinux;
-                                } else if (strcmp($usersPlatform,"mac") == 0) {
-                                        $recommendedFile=$eclipsefilemacosx;
-                                }
-                                ?>
-                                <td align="right"><?php
-                                echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
-                                echo " or <a href=\"" . $eclipseBuildURL . "\">appropriate platform</a>";
-                                echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-                                ?>
-
-                        </tr>
-
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td>
-                                <?php 
-                                echo $emfName . "&nbsp;" . $emfDescription ; 
-                                ?>
-                                </td>
-                                <td align="right"><?php
-                                echo getPrereqReferenceOrName($eclipseMirrorScript, $emfMirrorPrefixuri, $emfURL, $emfFile, $eclipseFSpathPrefix);
-                                echo " or <a href=\"" . $emfBuildHome . "\">equivalent</a></td>";
-                                ?>
-                        </tr>
-
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td>
-                                <?php 
-                                echo $emfxsdName . "&nbsp;" . $emfxsdDescription ; 
-                                ?>
-                                </td>
-                                <td align="right"><?php
-                                echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdMirrorPrefixuri, $emfxsdURL, $emfxsdFile, $eclipseFSpathPrefix);
-                                echo " or <a href=\"" . $emfxsdBuildHome . "\">equivalent</a></td>";
-                                ?>
-                        </tr>
-
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td>Graphical Editing Framework (GEF)</td>
-                                <td align="right"><?php
-                                echo getPrereqReferenceOrName($eclipseMirrorScript, $gefMirrorPrefixuri, $gefURL, $gefFile, $eclipseFSpathPrefix);
-                                echo " or <a href=\"" . $gefBuildHome . "\">equivalent</a></td>";
-                                ?>
-
-                        </tr>
-
-                        <tr valign="middle">
-                                <td width="10%"></td>
-                                <td colspan="2">
-                                <hr />
-                                </td>
-                        </tr>
-
-
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td>Web Tools Platform portion</td>
-                                <td align="right"><?php
-                                // debug
-                                // echo "debug: full path: " . $eclipseFSpathPrefix . "/" . $wstMirrorPrefixuri . "/" . $wstFile;
-                                $prereqReferenceOrName=getPrereqReferenceOrName($eclipseMirrorScript, $MirrorPrefixuri, $URL, $File, $eclipseFSpathPrefix);
-                                echo $prereqReferenceOrName;
-                                echo " or <a href=\"" . $BuildHome . "\">equivalent</a></td>";
-                                ?>
-
-                        </tr>
-                        <tr valign="middle">
-                                <td width="10%"></td>
-                                <td colspan="2">
-                                <hr />
-                                </td>
-                        </tr>
-
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td>Eclipse Test Framework (required only for Automated JUnit tests)</td>
-                                <td align="right"><?php
-                                echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $testURL, $testFile, $eclipseFSpathPrefix);
-                                echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-                                ?>
-
-                        </tr>
-
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td>Eclipse releng tool (required only for committers to more easily
-                                "release" code to a build)</td>
-                                <td align="right"><?php
-                                echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipserelengURL, $eclipserelengFile, $eclipseFSpathPrefix);
-                                echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-                                ?>
-
-                        </tr>
-
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td>Third Party code from Orbit (currently much more than needed
-                                for WTP, but some committers like having the whole heap in their
-                                target)</td>
-                                <td align="right"><?php
-                                echo getPrereqReferenceOrName($eclipseMirrorScript, $orbitthirdpartyzipMirrorPrefixuri, $orbitthirdpartyzipURL, $orbitthirdpartyzipFile,$eclipseFSpathPrefix);
-                                echo " or <a href=\"" . $orbitthirdpartyzipBuildHome . "\">equivalent</a></td>";
-                                ?>
-
-                        </tr>
-
-                </table>
-                </td>
-        </tr>
-</table>
-
-<!-- ***********  WTP **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-        <tr>
-                <td align=left valign=top colspan="5" bgcolor="#0080C0"><font
-                        face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF"> Web Tools Platform 
-               Components</font></td>
-        </tr>
-
-        <tr>
-                <td align="left" valign="top" colspan="5">
-                <p>The Zip files includes the features and plugins for non-java Faceted Projects </p>
-                </td>
-        </tr>
-        <tr>
-                <td>
-                <table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
-
-
-                        <tr>
-                                <td align="left" valign="top" width="10%"><b>Minimal</b></td>
-                                <td align="left" valign="top">
-                                <p>Executable code only.</p>
-                                </td>
-                                <?php
-                                $zipfilename="wst-common-fproj-${build}";
-                                $filename=$zipfilename.".zip";
-                                $zipfilesize=fileSizeForDisplay($filename);
-                                $fileShortDescription="wstfproj";
-                                displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-                                ?>
-                        </tr>
-
-                        <tr>
-                                <td align="left" valign="top" width="10%"><b>SDK</b></td>
-                                <td align="left" valign="top">
-                                <p>Executable code and source code.</p>
-                                </td>
-                                <?php
-                                $zipfilename="wst-common-fproj-sdk-${build}";
-                                $filename=$zipfilename.".zip";
-                                $zipfilesize=fileSizeForDisplay($filename);
-                                $fileShortDescription="wstfproj sdk";
-                                displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-                                ?>
-                        </tr>
-                        <tr>
-                                <td align="left" valign="top" width="10%"><b>Tests</b></td>
-                                <td align="left" valign="top">
-                                <p>Unit tests.</p>
-                                </td>
-                                <?php
-                                $zipfilename="wst-common-fproj-tests-${build}";
-                                $filename=$zipfilename.".zip";
-                                $zipfilesize=fileSizeForDisplay($filename);
-                                $fileShortDescription="wstfproj tests";
-                                displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-                                ?>
-                        </tr>
-                </table>
-                </td>
-
-
-        <tr>
-
-</table>
-
-
-
-
-
-
-
-<!-- ***********  Build Status **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-        <tr>
-                <td align=left valign=top bgcolor="#0080C0"><font
-                        face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Status, tests
-                and other interesting details</font></td>
-        </tr>
-        <tr>
-                <td>
-                <table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
-
-                        <tr>
-                                <td><a href="buildNotes.php">Build notes</a> <br />
-                                <a href="directory.txt">map files</a> <br />
-                                <?php
-
-                                if ($displayTestSummary) {
-
-
-                                        if (isset($unitTests_grandTotalErrors)) {
-                                                $errorColor="green";
-                                                if ($unitTests_grandTotalErrors > 0) {
-                                                        $errorColor="red";
-                                                }
-                                                echo "<a href=\"testResults.php\">Unit test results</a>&nbsp;";
-                                                echo "<img src=\"junit_err.gif\"/><font color=\"" . $errorColor . "\">" . $unitTests_grandTotalErrors . "</font>&nbsp;&nbsp;Total: " . $unitTests_grandTotalTests;
-                                        }
-                                        else {
-                                               // we hardly ever "pend" anymore ... abscense usually signifies no tests or a build error.  
-                                               echo "<br /><font color=\"orange\">Unit tests don't exists, are pending, or there's a build error.</font>";
-                                               //&nbsp;&nbsp;<img src=\"pending.gif\"/>";
-                                        }
-
-                                        echo "<br />";
-                                        echo "<a href=\"compileResults.php\">Compile logs: Code Bundles</a>";
-
-                                        echo "&nbsp;&nbsp;($code_totalBundles)&nbsp;&nbsp;";
-                                        echo "<img src=\"compile_err.gif\"/><font color=red>$code_totalErrors</font>&nbsp;";
-                                        echo "<img src=\"compile_warn.gif\"/><font color=orange>$code_totalWarnings</font>&nbsp;";
-                                        echo "<img src=\"access_err.gif\"/><font color=red>$code_totalforbiddenAccessWarningCount</font>&nbsp;";
-                                        echo "<img src=\"access_warn.gif\"/><font color=orange>$code_totaldiscouragedAccessWarningCount</font>&nbsp;";
-
-                                        echo "<br />";
-                                        echo "<a href=\"testCompileResults.php\">Compile logs: Test Bundles</a>";
-
-                                        echo "&nbsp;&nbsp;($test_totalBundles)&nbsp;&nbsp;";
-                                        echo "<img src=\"compile_err.gif\"/><font color=red>$test_totalErrors</font>&nbsp;";
-                                        echo "<img src=\"compile_warn.gif\"/><font color=orange>$test_totalWarnings</font>&nbsp;";
-                                        echo "<img src=\"access_err.gif\"/><font color=red>$test_totalforbiddenAccessWarningCount</font>&nbsp;";
-                                        echo "<img src=\"access_warn.gif\"/><font color=orange>$test_totaldiscouragedAccessWarningCount</font>&nbsp;";
-                                }
-
-                                ?> <br />
-
-                                <?php
-                                if (file_exists("versioningReportName.php")) {
-                                        include "versioningReportName.php";
-                                        $fname="${versionReportFilename}.html";
-                                        if (file_exists($fname)) {
-                                                echo "<br /> <a href='$fname'>Versioning Information</a>";
-                                        }
-}
-?> <?php
-echo "<br />";
-if (file_exists("./apiresults/api-progress.html"))
-{
-        echo "<br /> <a href=\"apiresults/api-progress.html\">API Progress Report</a>";
-}
-if (file_exists("./apiresults/api-info-summary.html"))
-{
-        echo "<br /> <a href=\"apiresults/api-info-summary.html\">APIs Defined by Each Component</a>";
-}
-if (file_exists("./apiresults/api-ref-compatibility.html"))
-{
-        echo "<br /> <a href=\"apiresults/api-ref-compatibility.html\">Adopter Breakage Report</a>";
-}
-if (file_exists("./apiresults/api-violation-summary.html"))
-{
-        echo "<br /> <a href=\"apiresults/api-violation-summary.html\">API Violations</a>";
-}
-if (file_exists("./apiresults/component-api-violation-all.html"))
-{
-        echo "<br /> <a href=\"apiresults/component-api-violation-all.html\">Non-API dependencies</a>";
-}
-if (file_exists("./apiresults/api-tc-summary.html"))
-{
-        echo "<br /> <a href=\"apiresults/api-tc-summary.html\">API Test Coverage</a>";
-}
-if (file_exists("./apiresults/api-javadoc-summary.html"))
-{
-        echo "<br /> <a href=\"apiresults/api-javadoc-summary.html\">API Javadoc Coverage</a>";
-}
-if (file_exists("./apiresults/api-tc-summary.html"))
-{
-        echo "<br /><br /> <a href=\"apiresults/full_test_coverage/api-tc-summary.html\">Test Coverage for All Classes and Methods</a>";
-}
-?> <?php
-if (file_exists("./perfresults/graph/performance.php"))
-{
-        echo "<br />";
-        echo "<br /> <a href=\"perfresults/graph/performance.php\">Performance Results</a>";
-        echo "<br />";
-}
-?></td>
-                        </tr>
-
-
-                </table>
-                </td>
-        </tr>
-</table>
-
-
-
-<!-- footer -->
-<center>
-<hr>
-<p>All downloads are provided under the terms and conditions of the <a
-        href="http://www.eclipse.org/legal/notice.html">Eclipse.org Software
-User Agreement</a> unless otherwise specified.</p>
-
-<p>If you have problems downloading the drops, contact the <font
-        face="'Bitstream Vera',Helvetica,Arial" size="-1"><a
-        href="mailto:webmaster@eclipse.org">webmaster</a></font>.</p>
-
-</center>
-<!-- end footer -->
-
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/wstfproj.site/templateFiles/siteEnablingFeatures.xml b/releng.wtpbuilder/distribution/wstfproj.site/templateFiles/siteEnablingFeatures.xml
deleted file mode 100644
index cc3ed81..0000000
--- a/releng.wtpbuilder/distribution/wstfproj.site/templateFiles/siteEnablingFeatures.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-    <description> The update site contains the enabling features. </description>
-    <category-def
-        name="Enabling Features"
-        label="Enabling Features">
-        <description> This category contains features used by several
-            projects that enable some functionality, but which by
-            themselves are not very interesting. </description>
-    </category-def>
-</site>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wstfproj.site/templateFiles/siteWTP.xml b/releng.wtpbuilder/distribution/wstfproj.site/templateFiles/siteWTP.xml
deleted file mode 100644
index f94e83f..0000000
--- a/releng.wtpbuilder/distribution/wstfproj.site/templateFiles/siteWTP.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site
-    pack200="true"
-    mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/webtools/testUpdates/site.xml&amp;format=xml"
-    digestURL="http://download.eclipse.org/webtools/testUpdates/">
-    <description
-        url="http://download.eclipse.org/webtools/declaredUpdates/index.html"> The update site contains the features of the of Eclipse Web
-        Tools Project (WTP) </description>
-    <feature
-        url="features/org.eclipse.wst_@org.eclipse.wst@.jar"
-        id="org.eclipse.wst"
-        version="@org.eclipse.wst@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.wst.sdk_@org.eclipse.wst.sdk@.jar"
-        id="org.eclipse.wst.sdk"
-        version="@org.eclipse.wst.sdk@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jst_@org.eclipse.jst@.jar"
-        id="org.eclipse.jst"
-        version="@org.eclipse.jst@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jst.sdk_@org.eclipse.jst.sdk@.jar"
-        id="org.eclipse.jst.sdk"
-        version="@org.eclipse.jst.sdk@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jpt.feature_@org.eclipse.jpt.feature@.jar"
-        id="org.eclipse.jpt.feature"
-        version="@org.eclipse.jpt.feature@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jpt_sdk.feature_@org.eclipse.jpt_sdk.feature@.jar"
-        id="org.eclipse.jpt_sdk.feature"
-        version="@org.eclipse.jpt_sdk.feature@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <category-def
-        name="Web Tools Platform (WTP)"
-        label="Web Tools Platform (WTP)">
-        <description> This category contains the features of the Eclipse
-            Web Tools Project (WTP). </description>
-    </category-def>
-</site>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wstfproj.site/templateFiles/testCompileResults.php.template b/releng.wtpbuilder/distribution/wstfproj.site/templateFiles/testCompileResults.php.template
deleted file mode 100644
index 42d6f65..0000000
--- a/releng.wtpbuilder/distribution/wstfproj.site/templateFiles/testCompileResults.php.template
+++ /dev/null
@@ -1,76 +0,0 @@
-<html>
-<head>
-
-<?php
-        $parts = explode("/", getcwd());
-        $parts2 = explode("-", $parts[count($parts) - 1]);
-        $buildName = $parts2[1];
-
-        echo "<title>Compile Logs: Test Bundles for $buildName</title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2em;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:Bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-}
-</style>
-</head>
-<body>
-
-<?php
-        echo "<h1>Compile Logs: Test Bundles for $buildName</h1>";
-?>
-
-
-<table id=tabledata align = "center" width="75%" border="1">
-  <tr>
-    <td class="bold" align="center">Compile Logs</td>
-    <td class="bold" align="center">Compile Errors</td>
-    <td class="bold" align="center">Compiler Warnings</td>
-    <td class="bold" align="center">Access Violations</td>
-    <td class="bold" align="center">Access Warnings</td>
-  </tr>
-
-  %compilelogs%
-
-</table>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/wstfproj.site/templateFiles/testResults.php.template b/releng.wtpbuilder/distribution/wstfproj.site/templateFiles/testResults.php.template
deleted file mode 100644
index ddad0b7..0000000
--- a/releng.wtpbuilder/distribution/wstfproj.site/templateFiles/testResults.php.template
+++ /dev/null
@@ -1,119 +0,0 @@
-<html>
-<head>
-
-<?php
-	$parts = explode("/", getcwd());
-	$parts2 = explode("-", $parts[count($parts) - 1]);
-	$buildName = $parts2[1];
-	
-	echo "<title>Test Results for $buildName </title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2em;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:Bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-
-}
-</style>
-
-
-</head>
-<body>
-<p><b><font face="Verdana" size="+3">Test Results</font></b> </p>
-
-<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">
-    Unit Test Results for <?php echo "$buildName"; ?> on Various Platforms and JRE</font></b></td>
-  </tr>
-</table>
-
-<?php
-if (file_exists("testResults"))
-{
-$dir = dir("testResults");
-while ($anEntry = $dir->read())
-{
-  if ($anEntry != "." && $anEntry != ".." && $anEntry != "consolelogs" && $anEntry != "html" && $anEntry != "xml")
-  {
-    $link = "testResults/".$anEntry."/results/index.php";
-    echo "<p><a href=\"$link\">$anEntry</a></p>";
-  }
-}
-}
-?>
-
-<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">Unit 
-      Test Results for <?php echo "$buildName"; ?> </font></b></td>
-  </tr>
-</table>
-
-<table id=tableunittestdata align = "center" width="75%" border="1">
-  <tr> 
-    <td class="bold" align="center" width="70%">Test Suite</td>
-    <td class="bold" align="center" width="10%">Errors &amp; Failures</td>
-    <td class="bold" align="center" width="10%">Total Tests</td>
-    <td class="bold" align="center" width="10%">Total Time (s)</td>
-  </tr>
-  
-  
-  %testresults%
-  
-</table>
-<p></p>
-<br>
-<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"> 
-      Console output logs 
-      <?php echo "$buildName"; ?>
-      </font></b></td>
-  </tr>
-</table>
-<br>
-These <a href="consoleLogs.php">logs</a> contain the console output captured while 
-running the JUnit automated tests. <br>
-<br>
-
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/wstfproj.site/transformReportToHTML.xml b/releng.wtpbuilder/distribution/wstfproj.site/transformReportToHTML.xml
deleted file mode 100644
index 3e9f35b..0000000
--- a/releng.wtpbuilder/distribution/wstfproj.site/transformReportToHTML.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-    name="xsl-conversion"
-    default="main"
-    basedir=".">
-    <target
-        name="main"
-        description="example.@dot.xml to produce example.@dot.html">
-      <xslt
-          destdir="${resultDir}/compilelogs"
-          scanincludeddirectories="true"
-          style="compilerXMLOutputToHTML.xsl"
-          force="true" >
-            <fileset dir="${resultDir}/compilelogs" includes="**/*.xml" />
-      </xslt>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtp.build/build.xml b/releng.wtpbuilder/distribution/wtp.build/build.xml
deleted file mode 100644
index 60a6de1..0000000
--- a/releng.wtpbuilder/distribution/wtp.build/build.xml
+++ /dev/null
@@ -1,297 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-    default="build"
-    basedir=".">
-    <fail
-        unless="wtp.builder.home"/>
-    <property
-        file="${wtp.builder.home}/build.properties"/>
-    <property
-        environment="env"/>
-
-    <!-- required to get proper value of doCreateFprojZips -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-
-    <!-- main -->
-    <target
-        name="build"
-        depends="getBaseBuilder">
-        <dirname
-            file="${ant.file}"
-            property="distribution.wtp.build.dir"/>
-        <property
-            name="buildTargets"
-            value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
-        <!--
-            for this distribution, dependencies come from releng. assume
-            no subdirectory, if not otherwise set (bug 285383).
-        -->
-        <property
-            name="env.DEP_DIR"
-            value=""/>
-        <property
-            name="dependency.properties"
-            value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-
-
-        <!-- calling label.xml to createg label.properties file -->
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-        <echo
-            level="info"
-            message="invoking buildTargets: ${buildTargets} to build for each component"/>
-
-
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="wst-sdk"/>
-        </ant>
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="wst.tests"/>
-            <property
-                name="eclipseBuildFailOnError"
-                value="true"/>
-        </ant>
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="jst-sdk"/>
-        </ant>
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="jst.tests"/>
-            <property
-                name="eclipseBuildFailOnError"
-                value="true"/>
-        </ant>
-
-        <!-- extender (SDK) versions -->
-        <!--
-            <ant antfile="${buildTargets}"> <property name="component"
-            value="common-sdk" /> </ant> <ant antfile="${buildTargets}">
-            <property name="component" value="jsdt-sdk" /> </ant> <ant
-            antfile="${buildTargets}"> <property name="component"
-            value="xml-sdk" /> </ant>
-        -->
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="dali-sdk"/>
-            <property
-                name="eclipseBuildFailOnError"
-                value="true"/>
-        </ant>
-
-        <!-- JUnit test code -->
-        <!--
-            <ant antfile="${buildTargets}"> <property name="component"
-            value="common.tests" /> <property
-            name="eclipseBuildFailOnError" value="false" /> </ant> <ant
-            antfile="${buildTargets}"> <property name="component"
-            value="jsdt.tests" /> <property
-            name="eclipseBuildFailOnError" value="false" /> </ant> <ant
-            antfile="${buildTargets}"> <property name="component"
-            value="xml.tests" /> <property
-            name="eclipseBuildFailOnError" value="false" /> </ant>
-        -->
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="dali.tests"/>
-            <property
-                name="eclipseBuildFailOnError"
-                value="true"/>
-        </ant>
-
-        <!-- package -->
-        <antcall
-            target="package"/>
-    </target>
-
-    <!-- invoking runbuild.xml targetting getBaseBuilder -->
-    <target
-        name="getBaseBuilder"
-        if="eclipse.builder.fetch">
-        <dirname
-            file="${ant.file}"
-            property="wtbuilder.dir"/>
-        <property
-            name="buildTargets"
-            value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
-        <echo
-            level="info"
-            message="invoking buildTargets: ${buildTargets} -> getBaseBuilder"/>
-        <ant
-            antfile="${buildTargets}"
-            target="getBaseBuilder"/>
-    </target>
-    <target
-        name="package">
-        <!--
-            post, post packaging, for WTP ... "manually" assemble the
-            desired zips
-        -->
-        
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/runAntRunner.xml">
-            <property
-                name="antrunnerfile"
-                value="${wtp.builder.home}/distribution/wtp.build/createmainzips.xml"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/runAntRunner.xml">
-            <property
-                name="antrunnerfile"
-                value="${wtp.builder.home}/distribution/wtp.build/createnoopzips.xml"/>
-        </ant>
-        <antcall
-            target="createFprojZips"/>
-    </target>
-    <!--
-        Handles packaging of individual Faceted Project Framework
-        distributions.
-    -->
-    <target
-        name="createFprojZips"
-        if="doCreateFprojZips">
-        <delete
-            file="${buildDirectory}/${buildLabel}/wtp-common-fproj-${buildLabel}.zip"
-            failonerror="false"/>
-        <zip
-            destfile="${buildDirectory}/${buildLabel}/wtp-common-fproj-${buildLabel}.zip">
-            <zipfileset
-                src="${buildDirectory}/${buildLabel}/wtp-sdk-${buildLabel}.zip">
-                <include
-                    name="eclipse/features/org.eclipse.wst.common.fproj_*/**"/>
-                <include
-                    name="eclipse/plugins/org.eclipse.wst.common.project.facet.core_*.jar"/>
-                <include
-                    name="eclipse/plugins/org.eclipse.wst.common.project.facet.ui_*.jar"/>
-            </zipfileset>
-        </zip>
-        <delete
-            file="${buildDirectory}/${buildLabel}/wtp-common-fproj-sdk-${buildLabel}.zip"
-            failonerror="false"/>
-        <zip
-            destfile="${buildDirectory}/${buildLabel}/wtp-common-fproj-sdk-${buildLabel}.zip">
-            <zipfileset
-                src="${buildDirectory}/${buildLabel}/wtp-common-fproj-${buildLabel}.zip"/>
-            <zipfileset
-                src="${buildDirectory}/${buildLabel}/wtp-sdk-${buildLabel}.zip">
-                <include
-                    name="eclipse/features/org.eclipse.wst.common.fproj.sdk_*/**"/>
-                <include
-                    name="eclipse/plugins/org.eclipse.wst.common.fproj.sdk_*.jar"/>
-                <include
-                    name="eclipse/plugins/org.eclipse.wst.common.project.facet.doc.api_*.jar"/>
-                <include
-                    name="eclipse/plugins/org.eclipse.wst.common.project.facet.core.source_*.jar"/>
-                <include
-                    name="eclipse/plugins/org.eclipse.wst.common.project.facet.ui.source_*.jar"/>
-            </zipfileset>
-        </zip>
-        <delete
-            file="${buildDirectory}/${buildLabel}/wtp-common-fproj-enablement-jdt-${buildLabel}.zip"
-            failonerror="false"/>
-        <zip
-            destfile="${buildDirectory}/${buildLabel}/wtp-common-fproj-enablement-jdt-${buildLabel}.zip">
-            <zipfileset
-                src="${buildDirectory}/${buildLabel}/wtp-sdk-${buildLabel}.zip">
-                <include
-                    name="eclipse/features/org.eclipse.jst.common.fproj.enablement.jdt_*/**"/>
-                <include
-                    name="eclipse/plugins/org.eclipse.jst.common.project.facet.core_*.jar"/>
-                <include
-                    name="eclipse/plugins/org.eclipse.jst.common.project.facet.ui_*.jar"/>
-            </zipfileset>
-        </zip>
-        <delete
-            file="${buildDirectory}/${buildLabel}/wtp-common-fproj-enablement-jdt-sdk-${buildLabel}.zip"
-            failonerror="false"/>
-        <zip
-            destfile="${buildDirectory}/${buildLabel}/wtp-common-fproj-enablement-jdt-sdk-${buildLabel}.zip">
-            <zipfileset
-                src="${buildDirectory}/${buildLabel}/wtp-common-fproj-enablement-jdt-${buildLabel}.zip"/>
-            <zipfileset
-                src="${buildDirectory}/${buildLabel}/wtp-sdk-${buildLabel}.zip">
-                <include
-                    name="eclipse/features/org.eclipse.jst.common.fproj.enablement.jdt.sdk_*/**"/>
-                <include
-                    name="eclipse/plugins/org.eclipse.jst.common.fproj.enablement.jdt.sdk_*.jar"/>
-                <include
-                    name="eclipse/plugins/org.eclipse.jst.common.project.facet.core.source_*.jar"/>
-                <include
-                    name="eclipse/plugins/org.eclipse.jst.common.project.facet.ui.source_*.jar"/>
-            </zipfileset>
-        </zip>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="createChecksums">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-            <property
-                name="buildLabel"
-                value="${buildLabel}"/>
-            <property
-                name="archiveName"
-                value="wtp-common-fproj-${buildLabel}.zip"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="createChecksums">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-            <property
-                name="buildLabel"
-                value="${buildLabel}"/>
-            <property
-                name="archiveName"
-                value="wtp-common-fproj-sdk-${buildLabel}.zip"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="createChecksums">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-            <property
-                name="buildLabel"
-                value="${buildLabel}"/>
-            <property
-                name="archiveName"
-                value="wtp-common-fproj-enablement-jdt-${buildLabel}.zip"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="createChecksums">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-            <property
-                name="buildLabel"
-                value="${buildLabel}"/>
-            <property
-                name="archiveName"
-                value="wtp-common-fproj-enablement-jdt-sdk-${buildLabel}.zip"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtp.build/create311zips.xml b/releng.wtpbuilder/distribution/wtp.build/create311zips.xml
deleted file mode 100644
index 71fa8fb..0000000
--- a/releng.wtpbuilder/distribution/wtp.build/create311zips.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-    <!--
-        This script is to create some zips to handle fix described in
-        https://bugs.eclipse.org/bugs/show_bug.cgi?id=294156
-    -->
-<project
-    default="build"
-    basedir=".">
-    <!--
-        These properties are normally set by calling task, but for
-        "local" tests from command line, they can be set here
-    -->
-    <property
-        name="buildDirectory"
-        value="/home/data/httpd/download.eclipse.org/webtools/downloads/drops/R3.1"/>
-    <property
-        name="buildLabel"
-        value="R-3.1.1-20090917225226"/>
-    <property
-        name="wtp.builder.home"
-        value="/shared/webtools/projectBuilders/wtp-R3.2.0-I/webtools.releng/releng.wtpbuilder"/>
-    <echo
-        message="buildDirectory: ${buildDirectory}"/>
-    <echo
-        message="buildLabel: ${buildLabel}"/>
-    <echo
-        message="wtp.builder.home: ${wtp.builder.home}"/>
-    <!--
-        three convenience variables to help avoid typos, etc. Should
-        never need to be changed
-    -->
-	<property name="temproot"
-		value="/tmp/wtp/${buildLabel}" />
-    <property
-        name="tempDir"
-        value="${temproot}/tempdir"/>
-    <property
-        name="tempRunnableEclipse"
-        value="${tempDir}/eclipse"/>
-    <property
-        name="tempRepo"
-        value="${temproot}/temprepo"/>
-    <target
-        name="build">
-        <antcall
-            target="createCodeZip">
-            <param
-                name="newarchiveName"
-                value="jst-${buildLabel}b.zip"/>
-        </antcall>
-        <antcall
-            target="createSDKZip">
-            <param
-                name="newarchiveName"
-                value="jst-sdk-${buildLabel}b.zip"/>
-        </antcall>
-
-    </target>
-    <target
-        name="createCodeZip">
-        <ant
-            antfile="ziputils.xml"
-            target="premirrortasks"/>
-        <p2.mirror
-            source="${buildDirectory}/${buildLabel}/updateSite"
-            destination="${tempRepo}"
-            log="mirrorlog-${buildDirectory}/${buildLabel}/${newarchiveName}.log"
-            verbose="true">
-            <slicingoptions
-                followstrict="true"
-                includeNonGreedy="false"
-                includeOptional="false"/>
-            <iu
-                id="org.eclipse.wst.web_ui.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.enterprise_ui.feature.feature.group"/>
-            <iu
-                id="org.eclipse.wst.xml_ui.feature.feature.group"/>
-            <iu
-                id="org.eclipse.wst.jsdt.feature.feature.group"/>
-            <iu
-                id="org.eclipse.wst.common.fproj.feature.group"/>
-            <iu
-                id="org.eclipse.wst.server_adapters.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group"/>
-            <iu
-                id="org.eclipse.jst.server_ui.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.server_adapters.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.server_adapters.ext.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.web_ui.feature.feature.group"/>
-            <iu
-                id="org.eclipse.wst.xsl.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.webpageeditor.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.ws.axis2tools.feature.feature.group"/>
-        </p2.mirror>
-        <ant
-            antfile="ziputils.xml"
-            target="postmirrortasks"/>
-    </target>
-    <target
-        name="createSDKZip">
-        <ant
-            antfile="ziputils.xml"
-            target="premirrortasks"/>
-        <p2.mirror
-            source="${buildDirectory}/${buildLabel}/updateSite"
-            destination="${tempRepo}"
-            log="mirrorlog-${buildDirectory}/${buildLabel}/${newarchiveName}.log"
-            verbose="true">
-            <slicingoptions
-                followstrict="true"
-                includeNonGreedy="false"
-                includeOptional="false"/>
-            <iu
-                id="org.eclipse.wst.web_sdk.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.enterprise_sdk.feature.feature.group"/>
-            <iu
-                id="org.eclipse.wst.xml_sdk.feature.feature.group"/>
-            <iu
-                id="org.eclipse.wst.jsdt_sdk.feature.feature.group"/>
-            <iu
-                id="org.eclipse.wst.common.fproj.sdk.feature.group"/>
-            <iu
-                id="org.eclipse.wst.server_adapters.sdk.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.common.fproj.enablement.jdt.sdk.feature.group"/>
-            <iu
-                id="org.eclipse.jst.server_sdk.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.server_adapters.sdk.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.server_adapters.ext.sdk.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.web_sdk.feature.feature.group"/>
-            <iu
-                id="org.eclipse.wst.xsl_sdk.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.webpageeditor_sdk.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.ws.axis2tools_sdk.feature.feature.group"/>
-        </p2.mirror>
-        <ant
-            antfile="ziputils.xml"
-            target="postmirrortasks"/>
-    </target>
-    
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtp.build/createmainzips.xml b/releng.wtpbuilder/distribution/wtp.build/createmainzips.xml
deleted file mode 100644
index 73e7513..0000000
--- a/releng.wtpbuilder/distribution/wtp.build/createmainzips.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-    <!--
-        This script is to create some zips with core features only.
-        Limited, specialized usefulness, so they are not linked or
-        advertised. That is, could change at any time.
-    -->
-<project
-    default="build"
-    basedir=".">
-    <!--
-        These properties are normally set by calling task, but for
-        "local" tests from command line, they can be set here
-    -->
-    <property
-        name="buildDirectory"
-        value="/shared/webtools/committers/wtp-R3.2.0-I/20091029001529"/>
-    <property
-        name="buildLabel"
-        value="I-3.2.0-20091029030635"/>
-    <property
-        name="wtp.builder.home"
-        value="/shared/webtools/projectBuilders/wtp-R3.2.0-I/webtools.releng/releng.wtpbuilder"/>
-    <echo
-        message="buildDirectory: ${buildDirectory}"/>
-    <echo
-        message="buildLabel: ${buildLabel}"/>
-    <echo
-        message="wtp.builder.home: ${wtp.builder.home}"/>
-    <!--
-        three convenience variables to help avoid typos, etc. Should
-        never need to be changed
-    -->
-    <property
-        name="tempDir"
-        value="${buildDirectory}/${buildLabel}/tempdir"/>
-    <property
-        name="tempRunnableEclipse"
-        value="${tempDir}/eclipse"/>
-    <property
-        name="tempRepo"
-        value="${buildDirectory}/${buildLabel}/temprepo"/>
-    <target
-        name="build">
-        <antcall
-            target="createCodeZip">
-            <param
-                name="newarchiveName"
-                value="wtp-${buildLabel}.zip"/>
-        </antcall>
-        <antcall
-            target="createSDKZip">
-            <param
-                name="newarchiveName"
-                value="wtp-sdk-${buildLabel}.zip"/>
-        </antcall>
-        <antcall
-            target="createTestZip">
-            <param
-                name="newarchiveName"
-                value="wtp-tests-${buildLabel}.zip"/>
-        </antcall>
-    </target>
-
-    	
-    <import file="${buildDirectory}/maps/webtools.maps/releng/packages/mirrortasks.xml" /> 
-    	
-    	
-
- 
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtp.build/createnoopzips.xml b/releng.wtpbuilder/distribution/wtp.build/createnoopzips.xml
deleted file mode 100644
index 0d6928c..0000000
--- a/releng.wtpbuilder/distribution/wtp.build/createnoopzips.xml
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-    <!--
-        This script is to create some zips with core features only.
-        Limited, specialized usefulness, so they are not linked or
-        advertised. That is, could change at any time.
-    -->
-<project
-    default="build"
-    basedir=".">
-    <!--
-        These properties are normally set by calling task, but for
-        "local" tests from command line, they can be set here
-    -->
-    <property
-        name="buildDirectory"
-        value="/shared/webtools/committers/wtp-R3.2.0-I/20091029001529"/>
-    <property
-        name="buildLabel"
-        value="I-3.2.0-20091029030635"/>
-    <property
-        name="wtp.builder.home"
-        value="/shared/webtools/projectBuilders/wtp-R3.2.0-I/webtools.releng/releng.wtpbuilder"/>
-    <echo
-        message="buildDirectory: ${buildDirectory}"/>
-    <echo
-        message="buildLabel: ${buildLabel}"/>
-    <echo
-        message="wtp.builder.home: ${wtp.builder.home}"/>
-    <!--
-        three convenience variables to help avoid typos, etc. Should
-        never need to be changed
-    -->
-    <property
-        name="tempDir"
-        value="${buildDirectory}/${buildLabel}/tempdir"/>
-    <property
-        name="tempRunnableEclipse"
-        value="${tempDir}/eclipse"/>
-    <property
-        name="tempRepo"
-        value="${buildDirectory}/${buildLabel}/temprepo"/>
-    <target
-        name="build">
-        <antcall
-            target="createNoOptionalZip">
-            <param
-                name="newarchiveName"
-                value="wtp-noop-${buildLabel}.zip"/>
-        </antcall>
-        <antcall
-            target="createNoOptionalSDKZip">
-            <param
-                name="newarchiveName"
-                value="wtp-sdk-noop-${buildLabel}.zip"/>
-        </antcall>
-        <antcall
-            target="createNoOptionalTestZip">
-            <param
-                name="newarchiveName"
-                value="wtp-tests-noop-${buildLabel}.zip"/>
-        </antcall>
-    </target>
-    <target
-        name="createNoOptionalZip">
-        <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
-            target="premirrortasks"/>
-        <p2.mirror
-            source="${buildDirectory}/${buildLabel}/updateSite"
-            destination="${tempRepo}"
-            log="mirrorlog-${buildDirectory}/${buildLabel}/${newarchiveName}.log"
-            verbose="true">
-            <slicingoptions
-                followstrict="true"
-                includeNonGreedy="false"
-                includeOptional="false"/>
-            <iu
-                id="org.eclipse.wst.web_ui.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.enterprise_ui.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jpt.feature.feature.group"/>
-            <iu
-                id="org.eclipse.wst.xml_ui.feature.feature.group"/>
-            <iu
-                id="org.eclipse.wst.jsdt.feature.feature.group"/>
-            <iu
-                id="org.eclipse.wst.common.fproj.feature.group"/>
-            <iu
-                id="org.eclipse.wst.server_adapters.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group"/>
-            <iu
-                id="org.eclipse.jst.server_ui.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.server_adapters.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.server_adapters.ext.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.web_ui.feature.feature.group"/>
-        </p2.mirror>
-        <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
-            target="postmirrortasks"/>
-    </target>
-    <target
-        name="createNoOptionalSDKZip">
-        <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
-            target="premirrortasks"/>
-        <p2.mirror
-            source="${buildDirectory}/${buildLabel}/updateSite"
-            destination="${tempRepo}"
-            log="mirrorlog-${buildDirectory}/${buildLabel}/${newarchiveName}.log"
-            verbose="true">
-            <slicingoptions
-                followstrict="true"
-                includeNonGreedy="false"
-                includeOptional="false"/>
-            <iu
-                id="org.eclipse.wst.web_sdk.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.enterprise_sdk.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jpt_sdk.feature.feature.group"/>
-            <iu
-                id="org.eclipse.wst.xml_sdk.feature.feature.group"/>
-            <iu
-                id="org.eclipse.wst.jsdt_sdk.feature.feature.group"/>
-            <iu
-                id="org.eclipse.wst.common.fproj.sdk.feature.group"/>
-            <iu
-                id="org.eclipse.wst.server_adapters.sdk.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.common.fproj.enablement.jdt.sdk.feature.group"/>
-            <iu
-                id="org.eclipse.jst.server_sdk.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.server_adapters.sdk.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.server_adapters.ext.sdk.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.web_sdk.feature.feature.group"/>
-        </p2.mirror>
-        <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
-            target="postmirrortasks"/>
-    </target>
-    <target
-        name="createNoOptionalTestZip">
-        <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
-            target="premirrortasks"/>
-        <p2.mirror
-            source="${buildDirectory}/${buildLabel}/updateSite"
-            destination="${tempRepo}"
-            log="mirrorlog-${buildDirectory}/${buildLabel}/${newarchiveName}.log"
-            verbose="true">
-            <slicingoptions
-                followstrict="true"
-                includeNonGreedy="false"
-                includeOptional="false"/>
-            <iu
-                id="org.eclipse.jpt.tests.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.enterprise_tests.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.jsf.tests.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.server_adapters.ext_tests.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.server_tests.feature.feature.group"/>
-            <iu
-                id="org.eclipse.jst.web_tests.feature.feature.group"/>
-            <iu
-                id="org.eclipse.wst.common_tests.feature.feature.group"/>
-            <iu
-                id="org.eclipse.wst.jsdt_tests.feature.feature.group"/>
-            <iu
-                id="org.eclipse.wst.server_tests.feature.feature.group"/>
-            <iu
-                id="org.eclipse.wst.web_tests.feature.feature.group"/>
-            <iu
-                id="org.eclipse.wst.ws_tests.feature.feature.group"/>
-            <iu
-                id="org.eclipse.wst.xml_tests.feature.feature.group"/>
-            <iu
-                id="org.eclipse.wtp.releng.tests.feature.feature.group"/>
-        </p2.mirror>
-        <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
-            target="postmirrortasks"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtp.build/p2work.shsource b/releng.wtpbuilder/distribution/wtp.build/p2work.shsource
deleted file mode 100644
index b3dffaa..0000000
--- a/releng.wtpbuilder/distribution/wtp.build/p2work.shsource
+++ /dev/null
@@ -1,18 +0,0 @@
-# minor utility to aid running test scripts from command line
-
-# the top level directory, that should "contain" all else involved with build, control and output
-export BUILD_HOME=${HOME}/p2work
-
-# platform install. One level above what will contain the 'eclipse' directory.
-export ECLIPSE_HOME=/shared/webtools/basebuilders/R36_M2/org.eclipse.releng.basebuilder
-
-export ANT_HOME=/shared/webtools/apps/apache-ant-1.7.1
-
-export JAVA_5_HOME=/shared/webtools/apps/ibm-java2-i386-50
-export JAVA_6_HOME=/shared/webtools/apps/ibm-java-ppc-605
-
-export JAVA_HOME=${JAVA_6_HOME}
-
-export JAVA_EXEC_DIR=${JAVA_HOME}/jre/bin/
-
-export PDE_BUILDER_PATH=/shared/webtools/basebuilders/R36_M2/org.eclipse.releng.basebuilder
diff --git a/releng.wtpbuilder/distribution/wtp.build/runEclipseAntRunner.sh b/releng.wtpbuilder/distribution/wtp.build/runEclipseAntRunner.sh
deleted file mode 100644
index d06906e..0000000
--- a/releng.wtpbuilder/distribution/wtp.build/runEclipseAntRunner.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-# minor utility to aid running test scripts from command line
-
-echo "p2work"
-
-source ./p2work.shsource
-
-echo ECLIPSE_HOME: ${ECLIPSE_HOME}
-
-#"${ECLIPSE_HOME}"/eclipse -consolelog -data ./mirrorWorkWorkspace -nosplash --launcher.suppressErrors -vm "${JAVA_EXEC_DIR}" -application org.eclipse.ant.core.antRunner -f createnoopzips.xml "$@"
-"${JAVA_EXEC_DIR}"/java -jar ${PDE_BUILDER_PATH}/plugins/org.eclipse.equinox.launcher.jar -consolelog -data ./mirrorWorkWorkspace -nosplash --launcher.suppressErrors -vm "${JAVA_EXEC_DIR}" -application org.eclipse.ant.core.antRunner -f create311zips.xml "$@"
diff --git a/releng.wtpbuilder/distribution/wtp.build/tempbuild.xml b/releng.wtpbuilder/distribution/wtp.build/tempbuild.xml
deleted file mode 100644
index 3913e09..0000000
--- a/releng.wtpbuilder/distribution/wtp.build/tempbuild.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-    default="build"
-    basedir=".">
-    
-       <property
-           name="buildDirectory"
-           value="/home/shared/webtools/projects/wtp-R3.2.0-I/workdir"/>
-       <property
-           name="buildLabel"
-           value="I-3.2.0-20091104001502"/>
-       <property
-           name="wtp.builder.home"
-           value="/shared/webtools/projectBuilders/wtp-R3.2.0-I/webtools.releng/releng.wtpbuilder"/>
-       <echo
-           message="buildDirectory: ${buildDirectory}"/>
-       <echo
-           message="buildLabel: ${buildLabel}"/>
-       <echo
-           message="wtp.builder.home: ${wtp.builder.home}"/>
-
-    <!-- main -->
-    <target
-        name="build">
-       <copy
-           todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
-           overwrite="true">
-           <!--
-               we want all @dot.xml files, but assumes a certain
-               structure, to include directory for name of plugin
-           -->
-           <fileset
-               dir="${buildDirectory}/features/">
-               <include
-                   name="**/feature.temp.folder/"/>
-           </fileset>
-              
-       <mapper type="regex" from="(.*)/plugins/(.*)/@dot.xml" to="/\2/@dot.xml"/>
-
-       </copy>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtp.build/ziputils.xml b/releng.wtpbuilder/distribution/wtp.build/ziputils.xml
deleted file mode 100644
index a0b44b7..0000000
--- a/releng.wtpbuilder/distribution/wtp.build/ziputils.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-    default="nodefault"
-    basedir=".">
-    <target
-        name="premirrortasks">
-        <!--
-            if desired zip already exists, remove it. It normally would
-            not exist, but might if restarting a build, or something
-        -->
-        <delete
-            file="${buildDirectory}/${buildLabel}/${newarchiveName}"
-            quiet="true"
-            failonerror="false"/>
-    </target>
-    <target
-        name="postmirrortasks">
-        <p2.repo2runnable>
-            <repository
-                location="${tempRunnableEclipse}"/>
-            <source>
-                <repository
-                    location="${tempRepo}"/>
-            </source>
-        </p2.repo2runnable>
-        <!--
-            remove content.jar and artifacts.jar, since not in
-            traditional zips
-        -->
-        <delete
-            file="${tempRunnableEclipse}/artifacts.jar"
-            quiet="true"
-            failonerror="false"/>
-        <delete
-            file="${tempRunnableEclipse}/content.jar"
-            quiet="true"
-            failonerror="false"/>
-        <!-- copy in standard root license files -->
-        <copy
-            todir="${tempRunnableEclipse}"
-            overwrite="false">
-            <fileset
-                dir="${wtp.builder.home}/rootfiles">
-            </fileset>
-        </copy>
-        <zip
-            destfile="${buildDirectory}/${buildLabel}/${newarchiveName}"
-            basedir="${tempDir}"/>
-        <delete
-            dir="${tempDir}"
-            quiet="true"
-            failonerror="false"/>
-        <delete
-            dir="${tempRepo}"
-            quiet="true"
-            failonerror="false"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
-            target="createChecksums">
-            <property
-                name="buildDirectory"
-                value="${buildDirectory}"/>
-            <property
-                name="buildLabel"
-                value="${buildLabel}"/>
-            <property
-                name="archiveName"
-                value="${newarchiveName}"/>
-        </ant>
-    </target>
-    <target
-        name="nodefault">
-        <fail
-            message="There is do default task. Must be specified when calling."/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtp.site/build.xml b/releng.wtpbuilder/distribution/wtp.site/build.xml
deleted file mode 100644
index 3073e1a..0000000
--- a/releng.wtpbuilder/distribution/wtp.site/build.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<project
-    name="Build specific targets and properties"
-    default="build"
-    basedir=".">
-
-    <!-- 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" />
-    <!-- 
-        Let users override standard properties, if desired.
-        If directory, file, or some properties do not exist,  
-        then standard properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties" />
-
-    <!-- = = = end standard properties pattern = = = -->
-
-    <echo message="ant.file: ${ant.file}" />
-    <target name="build">
-        <java
-            jar="${eclipse.launcher}"
-            fork="true"
-            failonerror="true">
-            <jvmarg value="-Dosgi.ws=${env.BASEWS}" />
-            <jvmarg value="-Dosgi.os=${env.BASEOS}" />
-            <jvmarg value="-Dosgi.arch=${env.BASEARCH}" />
-            <jvmarg value="-Dbuild.donottagmaps=${build.donottagmaps}" />
-            <jvmarg value="-DbuildBranch=${buildBranch}" />
-            <jvmarg value="-DbuildType=${buildType}" />
-            <jvmarg value="-DbuildId=${buildId}" />
-            <jvmarg value="-DmapVersionTag=${mapVersionTag}" />
-            <jvmarg value="-Dbuild.distribution=${build.distribution}" />
-            <jvmarg value="-DbuildDirectory=${buildDirectory}" />
-            <jvmarg value="-Dwtp.builder.home=${wtp.builder.home}" />
-          <jvmarg
-            value="-Dprojectname=${projectname}" />
-            <jvmarg value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}" />            	
-          <jvmarg
-               value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol" />
-           <jvmarg
-               value="-DurlLogLocation=${buildDirectory}/outgoinghttplogfromsitebuild.log" />
-               	
-            <arg value="-data" />
-            <arg value="${basedir}/workspace" />
-            <arg value="-application" />
-            <arg value="org.eclipse.ant.core.antRunner" />
-            <arg value="-buildfile" />
-            <arg value="${ant.file}" />
-            <arg value="publish" />
-        </java>
-    </target>
-
-    <!-- ===================================================================== -->
-    <!-- Steps to do to publish the build results -->
-    <!-- ===================================================================== -->
-    <target name="publish">
-        <dirname
-            file="${ant.file}"
-            property="component.dir" />
-        <ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
-        <property file="${buildDirectory}/label.properties" />
-
-        <property
-            name="publish.xml"
-            value="${component.dir}/publish.xml" />
-
-        <property
-            name="indexFileName"
-            value="index.php" />
-        <property
-            name="result"
-            value="${buildDirectory}/${buildLabel}" />
-        <property
-            name="indexTemplateFilename"
-            value="index.html.template.php" />
-
-    	<!-- not used or needed, and messes up "drill down" on some servers
-        <copy
-            file="${wtp.builder.home}/distribution/wtp.site/templateFiles/${indexTemplateFilename}"
-            tofile="${buildDirectory}/${indexFileName}" />
-       -->
-            	
-        <condition
-            property="isBuildTested"
-            value="true">
-            <available
-                file="${buildDirectory}/${buildLabel}/testResults/html" />
-        </condition>
-
-        <ant
-            antfile="${publish.xml}"
-            dir="${component.dir}">
-            <property
-                name="dropTokenList"
-                value="%wtpruntime%,%wtpsdk%,%wtptest%,%wst%,%wst-sdk%,%wst-tests%,%jst-tests%,%wst-perf-tests%,%jst-perf-tests%,%jpt-runtime%,%jpt-sdk%,%jpt-tests%" />
-            <property
-                name="webtoolsDownloadURL"
-                value="http://www.eclipse.org/downloads/download.php?file=/webtools/committers/drops" />
-
-            <property
-                name="buildBranch"
-                value="${buildBranch}" />
-            <property
-                name="isBuildTested"
-                value="${isBuildTested}" />
-            <property
-                name="indexTemplateFilename"
-                value="${indexTemplateFilename}" />
-        </ant>
-
-        <!--  Get the build map over for the results to point to. -->
-        <copy
-            file="${buildDirectory}/directory.txt"
-            tofile="${result}/directory.txt" />
-
-        <!-- Copy info for build identification -->
-        <copy
-            file="${buildDirectory}/buildmachineinfo.properties"
-            tofile="${result}/buildmachineinfo.properties" />
-
-      <!-- http access logs -->
-      <copy todir="${result}/" failonerror="false">
-      	<fileset dir="${buildDirectory}" includes="*.log" />
-     	</copy>
-    	
-    	<!-- ant build log, from control directory -->
-      <copy todir="${result}/" failonerror="false">
-        <fileset dir="${env.ANT_WORKING}/${projectname}" includes="antBuilderOutput.log" />
-      </copy>
-    	
-        <!-- final count files -->
-        <countBuildFiles
-            sourceDirectory="${buildDirectory}/${buildLabel}"
-            filterString=".zip,.tar.gz"
-            outputFile="${buildDirectory}/${buildLabel}/files.count" />
-
-    </target>
-
-
-</project>
diff --git a/releng.wtpbuilder/distribution/wtp.site/compilerXMLOutputToHTML.xsl b/releng.wtpbuilder/distribution/wtp.site/compilerXMLOutputToHTML.xsl
deleted file mode 100644
index 4f6809e..0000000
--- a/releng.wtpbuilder/distribution/wtp.site/compilerXMLOutputToHTML.xsl
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet
-    version="1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-    <xsl:output
-        method="html"
-        indent="yes" />
-
-    <xsl:template match="/">
-        <html>
-            <body>
-                <xsl:apply-templates select="compiler" />
-            </body>
-        </html>
-    </xsl:template>
-
-    <xsl:template match="compiler">
-        <h2>Compiler Report</h2>
-        <p>
-            Compiler:
-            <xsl:value-of select="@name" />
-            <xsl:text>   </xsl:text>
-            Version:
-            <xsl:value-of select="@version" />
-        </p>
-
-        <xsl:apply-templates select="stats" />
-
-        <xsl:apply-templates select="sources" />
-    </xsl:template>
-
-    <xsl:template
-        name="stats"
-        match="stats">
-
-        <p>
-            Number of source files:
-            <xsl:value-of select="count(..//source)" />
-            Number of classfiles:
-            <xsl:value-of select="number_of_classfiles/@value" />
-        </p>
-        <p>
-            Problems:
-            <xsl:value-of select="problem_summary/@problems" />
-            (Errors:
-            <xsl:value-of select="problem_summary/@errors" />
-            Warnings:
-            <xsl:value-of select="problem_summary/@warnings" />
-            )
-        </p>
-    </xsl:template>
-
-
-    <xsl:template
-        name="sources"
-        match="sources">
-
-        <xsl:if test="count(source) > 0">
-
-            <dl>
-                <xsl:for-each select="source">
-
-                    <xsl:variable
-                        name="package"
-                        select="normalize-space(@package)">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="path"
-                        select="normalize-space(@path)">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="classname"
-                        select="substring-after($path, $package)">
-                    </xsl:variable>
-                    <xsl:if test="count(problems) > 0">
-                        <dt style="font-weight: bold; color: black">
-                            Source File:
-                            <xsl:value-of select="$package" />
-                            <xsl:value-of select="$classname" />
-                        </dt>
-                        <xsl:apply-templates select="problems">
-                            <xsl:with-param name="classname">
-                                <xsl:value-of select="$classname" />
-                            </xsl:with-param>
-                        </xsl:apply-templates>
-                    </xsl:if>
-                </xsl:for-each>
-            </dl>
-
-        </xsl:if>
-
-    </xsl:template>
-
-    <xsl:template match="problems">
-        <xsl:param name="classname" />
-        <xsl:for-each select="problem">
-
-            <dd style="font-weight: normal; color: black">
-                <xsl:value-of select="position()" />
-                <xsl:text>.  </xsl:text>
-                <xsl:value-of select="@severity" />
-                <xsl:text>:  </xsl:text>
-                <xsl:value-of select="@id" />
-                <xsl:variable
-                    name="lineNumber"
-                    select="@line">
-                </xsl:variable>
-                <xsl:for-each select="message">
-                    <p
-                        style="margin-left: +.5in; font-size: -1; margin-top: 0;margin-bottom:0;">
-                        <small>
-                            <xsl:value-of select="@value" />
-                        </small>
-                    </p>
-                </xsl:for-each>
-                <xsl:for-each select="source_context">
-                    <xsl:variable
-                        name="pre"
-                        select="substring(@value,0,(@sourceStart + 1))">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="main"
-                        select="substring(@value,(@sourceStart + 1),(((@sourceEnd + 1) - (@sourceStart + 1)) + 1))">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="end"
-                        select="substring(@value,(@sourceEnd + 2))">
-                    </xsl:variable>
-
-                    <p
-                        style="margin-left: +.5in; font-size: -2; margin-top: 0;margin-bottom:0;">
-                        <xsl:value-of select="substring($classname,2)" />
-                        :
-                    </p>
-                    <p
-                        style="margin-left: +.5in; font-size: -2;font-family: monospace; margin-top: 0;margin-bottom:0;">
-                        <xsl:value-of select="$lineNumber" />
-                        :
-                        <xsl:value-of select="$pre" />
-                        <b>
-                            <u>
-                                <xsl:value-of select="$main" />
-                            </u>
-                        </b>
-                        <xsl:value-of select="$end" />
-                    </p>
-                </xsl:for-each>
-            </dd>
-        </xsl:for-each>
-
-
-    </xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtp.site/example.bin.html b/releng.wtpbuilder/distribution/wtp.site/example.bin.html
deleted file mode 100644
index 3f9529e..0000000
--- a/releng.wtpbuilder/distribution/wtp.site/example.bin.html
+++ /dev/null
@@ -1,2975 +0,0 @@
-<html>
-<body>
-<h2>Compiler Report</h2>
-<p>Compiler: Eclipse Java Compiler Version: 0.735, 3.3.0 milestone-5</p>
-<p>Number of source files: 16 Number of classfiles: 179</p>
-<p>Problems: 1826 (Errors: 0 Warnings: 1826 )</p>
-<dl>
-	<dt style="font-weight: bold; color: black">Source File:
-	org/eclipse/jst/jsp/css/ui/internal/properties/JSPedCSSPropertySource.java</dt>
-	<dd style="font-weight: normal; color: black">1. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type ICSSNode is not accessible
-	due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">JSPedCSSPropertySource.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">17:
-	import <b><u>org.eclipse.wst.css.core.internal.provisional.document.ICSSNode</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">2. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type CSSPropertySource is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">JSPedCSSPropertySource.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">18:
-	import <b><u>org.eclipse.wst.css.ui.internal.properties.CSSPropertySource</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">3. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type CSSPropertySource is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">JSPedCSSPropertySource.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">22:
-	public class JSPedCSSPropertySource extends <b><u>CSSPropertySource</u></b>
-	{</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">4. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type ICSSNode is not accessible
-	due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">JSPedCSSPropertySource.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">24:
-	public JSPedCSSPropertySource(<b><u>ICSSNode</u></b> target) {</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">5. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The constructor
-	CSSPropertySource(ICSSNode) is not accessible due to restriction on
-	classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">JSPedCSSPropertySource.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">25:
-	<b><u>super(target)</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">6. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The method setPropertyValue(Object,
-	Object) from the type CSSPropertySource is not accessible due to
-	restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">JSPedCSSPropertySource.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">38:
-	<b><u>super.setPropertyValue(name, value)</u></b>;</p>
-	</dd>
-	<dt style="font-weight: bold; color: black">Source File:
-	org/eclipse/jst/jsp/css/ui/internal/registry/AdapterFactoryProviderJSPedCSS.java</dt>
-	<dd style="font-weight: normal; color: black">1. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type AdapterFactoryProviderCSS
-	is not accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AdapterFactoryProviderJSPedCSS.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">14:
-	import <b><u>org.eclipse.wst.css.ui.internal.registry.AdapterFactoryProviderCSS</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">2. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type IDocumentTypeHandler is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AdapterFactoryProviderJSPedCSS.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">15:
-	import <b><u>org.eclipse.wst.sse.core.internal.ltk.modelhandler.IDocumentTypeHandler</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">3. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type AdapterFactoryProviderCSS
-	is not accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AdapterFactoryProviderJSPedCSS.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">17:
-	public class AdapterFactoryProviderJSPedCSS extends <b><u>AdapterFactoryProviderCSS</u></b>
-	{</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">4. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type IDocumentTypeHandler is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AdapterFactoryProviderJSPedCSS.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">20:
-	public boolean isFor(<b><u>IDocumentTypeHandler</u></b>
-	contentTypeDescription) {</p>
-	</dd>
-	<dt style="font-weight: bold; color: black">Source File:
-	org/eclipse/jst/jsp/css/ui/internal/views/properties/JSPedCSSPropertySheetConfiguration.java</dt>
-	<dd style="font-weight: normal; color: black">1. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type ICSSNode is not accessible
-	due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">JSPedCSSPropertySheetConfiguration.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">32:
-	import <b><u>org.eclipse.wst.css.core.internal.provisional.document.ICSSNode</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">2. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type INodeAdapter is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">JSPedCSSPropertySheetConfiguration.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">33:
-	import <b><u>org.eclipse.wst.sse.core.internal.provisional.INodeAdapter</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">3. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type INodeNotifier is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">JSPedCSSPropertySheetConfiguration.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">34:
-	import <b><u>org.eclipse.wst.sse.core.internal.provisional.INodeNotifier</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">4. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type XMLUIMessages is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">JSPedCSSPropertySheetConfiguration.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">36:
-	import <b><u>org.eclipse.wst.xml.ui.internal.XMLUIMessages</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">5. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type INodeAdapter is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">JSPedCSSPropertySheetConfiguration.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">39:
-	private class CSSPropertySheetRefreshAdapter implements <b><u>INodeAdapter</u></b>
-	{</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">6. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type INodeNotifier is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">JSPedCSSPropertySheetConfiguration.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">44:
-	public void notifyChanged(<b><u>INodeNotifier</u></b> notifier, int
-	eventType, Object changedFeature, Object oldValue, Object newValue, int
-	pos) {</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">7. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type ICSSNode is not accessible
-	due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">JSPedCSSPropertySheetConfiguration.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">53:
-	private <b><u>ICSSNode</u></b> fSource = null;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">8. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type ICSSNode is not accessible
-	due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">JSPedCSSPropertySheetConfiguration.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">60:
-	if (object instanceof <b><u>ICSSNode</u></b>) {</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">9. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type ICSSNode is not accessible
-	due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">JSPedCSSPropertySheetConfiguration.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">61:
-	fSource = (<b><u>ICSSNode</u></b>)object;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">10. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type XMLUIMessages is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">JSPedCSSPropertySheetConfiguration.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">78:
-	super(<b><u>XMLUIMessages.JFaceNodeAdapter_1</u></b>);</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">11. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The field JFaceNodeAdapter_1 from
-	the type XMLUIMessages is not accessible due to restriction on
-	classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">JSPedCSSPropertySheetConfiguration.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">78:
-	super(XMLUIMessages.<b><u>JFaceNodeAdapter_1</u></b>);</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">12. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type INodeAdapter is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">JSPedCSSPropertySheetConfiguration.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">110:
-	private <b><u>INodeAdapter</u></b> fRefreshAdapter = new
-	CSSPropertySheetRefreshAdapter();</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">13. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type INodeNotifier is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">JSPedCSSPropertySheetConfiguration.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">112:
-	private <b><u>INodeNotifier[]</u></b> fSelectedNotifiers;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">14. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The method
-	removeAdapter(INodeAdapter) from the type INodeNotifier is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">JSPedCSSPropertySheetConfiguration.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">126:
-	<b><u>fSelectedNotifiers[i].removeAdapter(fRefreshAdapter)</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">15. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type ICSSNode is not accessible
-	due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">JSPedCSSPropertySheetConfiguration.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">136:
-	if (selectedObjects[i] instanceof <b><u>ICSSNode</u></b>) {</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">16. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type ICSSNode is not accessible
-	due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">JSPedCSSPropertySheetConfiguration.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">137:
-	<b><u>ICSSNode</u></b> node = (ICSSNode) selectedObjects[i];</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">17. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type ICSSNode is not accessible
-	due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">JSPedCSSPropertySheetConfiguration.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">137:
-	ICSSNode node = (<b><u>ICSSNode</u></b>) selectedObjects[i];</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">18. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The method getNodeType() from the
-	type ICSSNode is not accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">JSPedCSSPropertySheetConfiguration.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">138:
-	while (<b><u>node.getNodeType()</u></b> == ICSSNode.PRIMITIVEVALUE_NODE
-	|| node.getNodeType() == ICSSNode.STYLEDECLITEM_NODE) {</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">19. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type ICSSNode is not accessible
-	due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">JSPedCSSPropertySheetConfiguration.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">138:
-	while (node.getNodeType() == <b><u>ICSSNode.PRIMITIVEVALUE_NODE</u></b>
-	|| node.getNodeType() == ICSSNode.STYLEDECLITEM_NODE) {</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">20. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The field PRIMITIVEVALUE_NODE from
-	the type ICSSNode is not accessible due to restriction on classpath
-	entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">JSPedCSSPropertySheetConfiguration.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">138:
-	while (node.getNodeType() == ICSSNode.<b><u>PRIMITIVEVALUE_NODE</u></b>
-	|| node.getNodeType() == ICSSNode.STYLEDECLITEM_NODE) {</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">21. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The method getNodeType() from the
-	type ICSSNode is not accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">JSPedCSSPropertySheetConfiguration.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">138:
-	while (node.getNodeType() == ICSSNode.PRIMITIVEVALUE_NODE || <b><u>node.getNodeType()</u></b>
-	== ICSSNode.STYLEDECLITEM_NODE) {</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">22. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type ICSSNode is not accessible
-	due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">JSPedCSSPropertySheetConfiguration.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">138:
-	while (node.getNodeType() == ICSSNode.PRIMITIVEVALUE_NODE ||
-	node.getNodeType() == <b><u>ICSSNode.STYLEDECLITEM_NODE</u></b>) {</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">23. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The field STYLEDECLITEM_NODE from
-	the type ICSSNode is not accessible due to restriction on classpath
-	entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">JSPedCSSPropertySheetConfiguration.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">138:
-	while (node.getNodeType() == ICSSNode.PRIMITIVEVALUE_NODE ||
-	node.getNodeType() == ICSSNode.<b><u>STYLEDECLITEM_NODE</u></b>) {</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">24. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The method getParentNode() from the
-	type ICSSNode is not accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">JSPedCSSPropertySheetConfiguration.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">139:
-	node = <b><u>node.getParentNode()</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">25. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type INodeNotifier is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">JSPedCSSPropertySheetConfiguration.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">152:
-	if (selectedObjects[i] instanceof <b><u>INodeNotifier</u></b>) {</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">26. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The method addAdapter(INodeAdapter)
-	from the type INodeNotifier is not accessible due to restriction on
-	classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">JSPedCSSPropertySheetConfiguration.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">154:
-	<b><u>((INodeNotifier)
-	selectedObjects[i]).addAdapter(fRefreshAdapter)</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">27. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type INodeNotifier is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">JSPedCSSPropertySheetConfiguration.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">154:
-	((<b><u>INodeNotifier</u></b>)
-	selectedObjects[i]).addAdapter(fRefreshAdapter);</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">28. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type INodeNotifier is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">JSPedCSSPropertySheetConfiguration.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">157:
-	fSelectedNotifiers = (<b><u>INodeNotifier[]</u></b>)
-	selectedNotifiers.toArray(new INodeNotifier[selectedNotifiers.size()]);</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">29. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type INodeNotifier is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">JSPedCSSPropertySheetConfiguration.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">157:
-	fSelectedNotifiers = (INodeNotifier[]) selectedNotifiers.toArray(new <b><u>INodeNotifier</u></b>[selectedNotifiers.size()]);</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">30. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The method
-	removeAdapter(INodeAdapter) from the type INodeNotifier is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">JSPedCSSPropertySheetConfiguration.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">183:
-	<b><u>fSelectedNotifiers[i].removeAdapter(fRefreshAdapter)</u></b>;</p>
-	</dd>
-	<dt style="font-weight: bold; color: black">Source File:
-	org/eclipse/jst/jsp/ui/StructuredTextViewerConfigurationJSP.java</dt>
-	<dd style="font-weight: normal; color: black">1. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type HTMLFormatProcessorImpl is
-	not accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.html.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">53:
-	import <b><u>org.eclipse.wst.html.core.internal.format.HTMLFormatProcessorImpl</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">2. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type ContentTypeIdForHTML is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.html.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">54:
-	import <b><u>org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">3. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type SSEUIPlugin is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">59:
-	import <b><u>org.eclipse.wst.sse.ui.internal.SSEUIPlugin</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">4. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type
-	StructuredFormattingStrategy is not accessible due to restriction on
-	classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">60:
-	import <b><u>org.eclipse.wst.sse.ui.internal.format.StructuredFormattingStrategy</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">5. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type LineStyleProvider is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">61:
-	import <b><u>org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">6. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type TextHoverManager is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">62:
-	import <b><u>org.eclipse.wst.sse.ui.internal.taginfo.TextHoverManager</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">7. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type EditorUtility is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">63:
-	import <b><u>org.eclipse.wst.sse.ui.internal.util.EditorUtility</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">8. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type ContentTypeIdForXML is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">64:
-	import <b><u>org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">9. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type JFaceNodeLabelProvider is
-	not accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">67:
-	import <b><u>org.eclipse.wst.xml.ui.internal.contentoutline.JFaceNodeLabelProvider</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">10. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type LineStyleProvider is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">89:
-	private <b><u>LineStyleProvider</u></b> fLineStyleProviderForJava;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">11. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type LineStyleProvider is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">93:
-	private <b><u>LineStyleProvider</u></b> fLineStyleProviderForJSP;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">12. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type LineStyleProvider is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">97:
-	private <b><u>LineStyleProvider</u></b> fLineStyleProviderForJSPEL;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">13. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The constructor
-	StructuredFormattingStrategy(IStructuredFormatProcessor) is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">236:
-	formatter.setMasterStrategy(<b><u>new
-	StructuredFormattingStrategy(new HTMLFormatProcessorImpl())</u></b>);</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">14. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type
-	StructuredFormattingStrategy is not accessible due to restriction on
-	classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">236:
-	formatter.setMasterStrategy(new <b><u>StructuredFormattingStrategy</u></b>(new
-	HTMLFormatProcessorImpl()));</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">15. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The constructor
-	HTMLFormatProcessorImpl() is not accessible due to restriction on
-	classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.html.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">236:
-	formatter.setMasterStrategy(new StructuredFormattingStrategy(<b><u>new
-	HTMLFormatProcessorImpl()</u></b>));</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">16. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type HTMLFormatProcessorImpl is
-	not accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.html.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">236:
-	formatter.setMasterStrategy(new StructuredFormattingStrategy(new <b><u>HTMLFormatProcessorImpl</u></b>()));</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">17. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type LineStyleProvider is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">321:
-	public <b><u>LineStyleProvider[]</u></b>
-	getLineStyleProviders(ISourceViewer sourceViewer, String partitionType)
-	{</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">18. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type LineStyleProvider is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">322:
-	<b><u>LineStyleProvider[]</u></b> providers = null;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">19. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type LineStyleProvider is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">337:
-	providers = new <b><u>LineStyleProvider</u></b>[]{getLineStyleProviderForJava()};</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">20. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type LineStyleProvider is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">340:
-	providers = new <b><u>LineStyleProvider</u></b>[]{getLineStyleProviderForJSPEL()};</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">21. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type LineStyleProvider is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">343:
-	providers = new <b><u>LineStyleProvider</u></b>[]{getLineStyleProviderForJSP()};</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">22. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type LineStyleProvider is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">349:
-	private <b><u>LineStyleProvider</u></b> getLineStyleProviderForJava() {</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">23. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type LineStyleProvider is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">356:
-	private <b><u>LineStyleProvider</u></b> getLineStyleProviderForJSP() {</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">24. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type LineStyleProvider is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">363:
-	private <b><u>LineStyleProvider</u></b> getLineStyleProviderForJSPEL()
-	{</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">25. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type JFaceNodeLabelProvider is
-	not accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">372:
-	fStatusLineLabelProvider = new <b><u>JFaceNodeLabelProvider</u></b>() {</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">26. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The method getText(Object) from the
-	type JFaceNodeLabelProvider is not accessible due to restriction on
-	classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">382:
-	s.insert(0, <b><u>super.getText(node)</u></b>);</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">27. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type TextHoverManager is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">408:
-	<b><u>TextHoverManager</u></b> manager =
-	SSEUIPlugin.getDefault().getTextHoverManager();</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">28. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type SSEUIPlugin is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">408:
-	TextHoverManager manager = <b><u>SSEUIPlugin</u></b>.getDefault().getTextHoverManager();</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">29. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The method getDefault() from the
-	type SSEUIPlugin is not accessible due to restriction on classpath
-	entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">408:
-	TextHoverManager manager = <b><u>SSEUIPlugin.getDefault()</u></b>.getTextHoverManager();</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">30. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The method getTextHoverManager()
-	from the type SSEUIPlugin is not accessible due to restriction on
-	classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">408:
-	TextHoverManager manager = <b><u>SSEUIPlugin.getDefault().getTextHoverManager()</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">31. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type TextHoverManager is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">409:
-	<b><u>TextHoverManager.TextHoverDescriptor[]</u></b> hoverDescs =
-	manager.getTextHovers();</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">32. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type
-	TextHoverManager.TextHoverDescriptor is not accessible due to
-	restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">409:
-	<b><u>TextHoverManager.TextHoverDescriptor[]</u></b> hoverDescs =
-	manager.getTextHovers();</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">33. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The method getTextHovers() from the
-	type TextHoverManager is not accessible due to restriction on classpath
-	entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">409:
-	TextHoverManager.TextHoverDescriptor[] hoverDescs = <b><u>manager.getTextHovers()</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">34. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The method isEnabled() from the type
-	TextHoverManager.TextHoverDescriptor is not accessible due to
-	restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">412:
-	if (<b><u>hoverDescs[i].isEnabled()</u></b> &amp;&amp;
-	EditorUtility.computeStateMask(hoverDescs[i].getModifierString()) ==
-	stateMask) {</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">35. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type EditorUtility is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">412:
-	if (hoverDescs[i].isEnabled() &amp;&amp; <b><u>EditorUtility</u></b>.computeStateMask(hoverDescs[i].getModifierString())
-	== stateMask) {</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">36. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The method computeStateMask(String)
-	from the type EditorUtility is not accessible due to restriction on
-	classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">412:
-	if (hoverDescs[i].isEnabled() &amp;&amp; <b><u>EditorUtility.computeStateMask(hoverDescs[i].getModifierString())</u></b>
-	== stateMask) {</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">37. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The method getModifierString() from
-	the type TextHoverManager.TextHoverDescriptor is not accessible due to
-	restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">412:
-	if (hoverDescs[i].isEnabled() &amp;&amp;
-	EditorUtility.computeStateMask(<b><u>hoverDescs[i].getModifierString()</u></b>)
-	== stateMask) {</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">38. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The method getId() from the type
-	TextHoverManager.TextHoverDescriptor is not accessible due to
-	restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">413:
-	String hoverType = <b><u>hoverDescs[i].getId()</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">39. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type TextHoverManager is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">414:
-	if (<b><u>TextHoverManager.COMBINATION_HOVER</u></b>.equalsIgnoreCase(hoverType))
-	{</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">40. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The field COMBINATION_HOVER from the
-	type TextHoverManager is not accessible due to restriction on classpath
-	entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">414:
-	if (TextHoverManager.<b><u>COMBINATION_HOVER</u></b>.equalsIgnoreCase(hoverType))
-	{</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">41. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The method
-	createBestMatchHover(ITextHover) from the type TextHoverManager is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">417:
-	hover = <b><u>manager.createBestMatchHover(new
-	JSPTagInfoHoverProcessor())</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">42. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The method
-	createBestMatchHover(ITextHover) from the type TextHoverManager is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">421:
-	hover = <b><u>manager.createBestMatchHover(new
-	JSPJavaJavadocHoverProcessor())</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">43. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type TextHoverManager is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">424:
-	else if (<b><u>TextHoverManager.DOCUMENTATION_HOVER</u></b>.equalsIgnoreCase(hoverType))
-	{</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">44. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The field DOCUMENTATION_HOVER from
-	the type TextHoverManager is not accessible due to restriction on
-	classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">424:
-	else if (TextHoverManager.<b><u>DOCUMENTATION_HOVER</u></b>.equalsIgnoreCase(hoverType))
-	{</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">45. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type ContentTypeIdForHTML is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.html.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">458:
-	targets.put(<b><u>ContentTypeIdForHTML.ContentTypeID_HTML</u></b>,
-	null);</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">46. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The field ContentTypeID_HTML from
-	the type ContentTypeIdForHTML is not accessible due to restriction on
-	classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.html.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">458:
-	targets.put(ContentTypeIdForHTML.<b><u>ContentTypeID_HTML</u></b>,
-	null);</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">47. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type ContentTypeIdForXML is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">459:
-	targets.put(<b><u>ContentTypeIdForXML.ContentTypeID_XML</u></b>, null);</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">48. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The field ContentTypeID_XML from the
-	type ContentTypeIdForXML is not accessible due to restriction on
-	classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredTextViewerConfigurationJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">459:
-	targets.put(ContentTypeIdForXML.<b><u>ContentTypeID_XML</u></b>, null);</p>
-	</dd>
-	<dt style="font-weight: bold; color: black">Source File:
-	org/eclipse/jst/jsp/ui/internal/JSPUIPlugin.java</dt>
-	<dd style="font-weight: normal; color: black">1. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type AdapterFactoryRegistry is
-	not accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">JSPUIPlugin.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">22:
-	import <b><u>org.eclipse.wst.sse.ui.internal.provisional.registry.AdapterFactoryRegistry</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">2. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type AdapterFactoryRegistryImpl
-	is not accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">JSPUIPlugin.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">23:
-	import <b><u>org.eclipse.wst.sse.ui.internal.provisional.registry.AdapterFactoryRegistryImpl</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">3. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type AdapterFactoryRegistry is
-	not accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">JSPUIPlugin.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">56:
-	public <b><u>AdapterFactoryRegistry</u></b> getAdapterFactoryRegistry()
-	{</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">4. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type AdapterFactoryRegistryImpl
-	is not accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">JSPUIPlugin.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">57:
-	return <b><u>AdapterFactoryRegistryImpl</u></b>.getInstance();</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">5. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The method getInstance() from the
-	type AdapterFactoryRegistryImpl is not accessible due to restriction on
-	classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">JSPUIPlugin.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">57:
-	return <b><u>AdapterFactoryRegistryImpl.getInstance()</u></b>;</p>
-	</dd>
-	<dt style="font-weight: bold; color: black">Source File:
-	org/eclipse/jst/jsp/ui/internal/autoedit/AutoEditStrategyForTabs.java</dt>
-	<dd style="font-weight: normal; color: black">1. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type HTMLCorePlugin is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.html.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AutoEditStrategyForTabs.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">31:
-	import <b><u>org.eclipse.wst.html.core.internal.HTMLCorePlugin</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">2. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type HTMLCorePreferenceNames is
-	not accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.html.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AutoEditStrategyForTabs.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">32:
-	import <b><u>org.eclipse.wst.html.core.internal.preferences.HTMLCorePreferenceNames</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">3. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type HTMLCorePlugin is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.html.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AutoEditStrategyForTabs.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">181:
-	Preferences preferences = <b><u>HTMLCorePlugin</u></b>.getDefault().getPluginPreferences();</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">4. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The method getDefault() from the
-	type HTMLCorePlugin is not accessible due to restriction on classpath
-	entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.html.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AutoEditStrategyForTabs.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">181:
-	Preferences preferences = <b><u>HTMLCorePlugin.getDefault()</u></b>.getPluginPreferences();</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">5. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type HTMLCorePreferenceNames is
-	not accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.html.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AutoEditStrategyForTabs.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">182:
-	if (<b><u>HTMLCorePreferenceNames.SPACE</u></b>.equals(preferences.getString(HTMLCorePreferenceNames.INDENTATION_CHAR)))</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">6. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The field SPACE from the type
-	HTMLCorePreferenceNames is not accessible due to restriction on
-	classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.html.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AutoEditStrategyForTabs.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">182:
-	if (HTMLCorePreferenceNames.<b><u>SPACE</u></b>.equals(preferences.getString(HTMLCorePreferenceNames.INDENTATION_CHAR)))</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">7. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type HTMLCorePreferenceNames is
-	not accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.html.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AutoEditStrategyForTabs.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">182:
-	if (HTMLCorePreferenceNames.SPACE.equals(preferences.getString(<b><u>HTMLCorePreferenceNames.INDENTATION_CHAR</u></b>)))</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">8. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The field INDENTATION_CHAR from the
-	type HTMLCorePreferenceNames is not accessible due to restriction on
-	classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.html.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AutoEditStrategyForTabs.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">182:
-	if
-	(HTMLCorePreferenceNames.SPACE.equals(preferences.getString(HTMLCorePreferenceNames.<b><u>INDENTATION_CHAR</u></b>)))</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">9. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type HTMLCorePreferenceNames is
-	not accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.html.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AutoEditStrategyForTabs.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">183:
-	width = preferences.getInt(<b><u>HTMLCorePreferenceNames.INDENTATION_SIZE</u></b>);</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">10. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The field INDENTATION_SIZE from the
-	type HTMLCorePreferenceNames is not accessible due to restriction on
-	classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.html.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AutoEditStrategyForTabs.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">183:
-	width = preferences.getInt(HTMLCorePreferenceNames.<b><u>INDENTATION_SIZE</u></b>);</p>
-	</dd>
-	<dt style="font-weight: bold; color: black">Source File:
-	org/eclipse/jst/jsp/ui/internal/autoedit/StructuredAutoEditStrategyJSP.java</dt>
-	<dd style="font-weight: normal; color: black">1. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type IStructuredModel is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredAutoEditStrategyJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">25:
-	import <b><u>org.eclipse.wst.sse.core.internal.provisional.IStructuredModel</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">2. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type IDOMNode is not accessible
-	due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredAutoEditStrategyJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">26:
-	import <b><u>org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">3. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type IStructuredModel is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredAutoEditStrategyJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">34:
-	<b><u>IStructuredModel</u></b> model = null;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">4. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The method
-	getExistingModelForRead(IDocument) from the type IModelManager is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredAutoEditStrategyJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">36:
-	model = <b><u>StructuredModelManager.getModelManager().getExistingModelForRead(document)</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">5. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type IDOMNode is not accessible
-	due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredAutoEditStrategyJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">42:
-	<b><u>IDOMNode</u></b> node = (IDOMNode)
-	model.getIndexedRegion(command.offset);</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">6. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type IDOMNode is not accessible
-	due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredAutoEditStrategyJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">42:
-	IDOMNode node = (<b><u>IDOMNode</u></b>)
-	model.getIndexedRegion(command.offset);</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">7. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The method getIndexedRegion(int)
-	from the type IStructuredModel is not accessible due to restriction on
-	classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredAutoEditStrategyJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">42:
-	IDOMNode node = (IDOMNode) <b><u>model.getIndexedRegion(command.offset)</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">8. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The method getSource() from the type
-	IDOMNode is not accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredAutoEditStrategyJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">43:
-	if (prefixedWith(document, command.offset, "&lt;") &amp;&amp; !<b><u>node.getSource()</u></b>.endsWith("%&gt;"))
-	{ //$NON-NLS-1$ //$NON-NLS-2$</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">9. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type IDOMNode is not accessible
-	due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredAutoEditStrategyJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">51:
-	<b><u>IDOMNode</u></b> node = (IDOMNode)
-	model.getIndexedRegion(command.offset);</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">10. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type IDOMNode is not accessible
-	due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredAutoEditStrategyJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">51:
-	IDOMNode node = (<b><u>IDOMNode</u></b>)
-	model.getIndexedRegion(command.offset);</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">11. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The method getIndexedRegion(int)
-	from the type IStructuredModel is not accessible due to restriction on
-	classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredAutoEditStrategyJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">51:
-	IDOMNode node = (IDOMNode) <b><u>model.getIndexedRegion(command.offset)</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">12. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The method getSource() from the type
-	IDOMNode is not accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredAutoEditStrategyJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">53:
-	!<b><u>node.getSource()</u></b>.endsWith("}")) { //$NON-NLS-1$
-	//$NON-NLS-2$</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">13. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The method releaseFromRead() from
-	the type IStructuredModel is not accessible due to restriction on
-	classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">StructuredAutoEditStrategyJSP.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">65:
-	<b><u>model.releaseFromRead()</u></b>;</p>
-	</dd>
-	<dt style="font-weight: bold; color: black">Source File:
-	org/eclipse/jst/jsp/ui/internal/breakpointproviders/AbstractBreakpointProvider.java</dt>
-	<dd style="font-weight: normal; color: black">1. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type IStructuredModel is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">21:
-	import <b><u>org.eclipse.wst.sse.core.internal.provisional.IStructuredModel</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">2. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type IndexedRegion is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">22:
-	import <b><u>org.eclipse.wst.sse.core.internal.provisional.IndexedRegion</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">3. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type IStructuredDocument is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">23:
-	import <b><u>org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">4. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type IStructuredDocumentRegion
-	is not accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">24:
-	import <b><u>org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">5. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type ITextRegion is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">25:
-	import <b><u>org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">6. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type ITextRegionCollection is
-	not accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">26:
-	import <b><u>org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionCollection</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">7. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type ITextRegionList is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">27:
-	import <b><u>org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">8. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type ISourceEditingTextTools is
-	not accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">28:
-	import <b><u>org.eclipse.wst.sse.ui.internal.provisional.extensions.ISourceEditingTextTools</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">9. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type IBreakpointProvider is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">29:
-	import <b><u>org.eclipse.wst.sse.ui.internal.provisional.extensions.breakpoint.IBreakpointProvider</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">10. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type CMElementDeclaration is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">30:
-	import <b><u>org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">11. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type CMNode is not accessible
-	due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">31:
-	import <b><u>org.eclipse.wst.xml.core.internal.contentmodel.CMNode</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">12. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type ModelQuery is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">32:
-	import <b><u>org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">13. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type ModelQueryUtil is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">33:
-	import <b><u>org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">14. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type CMNodeWrapper is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">34:
-	import <b><u>org.eclipse.wst.xml.core.internal.provisional.contentmodel.CMNodeWrapper</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">15. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type IDOMDocument is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">35:
-	import <b><u>org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">16. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type DOMRegionContext is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">36:
-	import <b><u>org.eclipse.wst.xml.core.internal.regions.DOMRegionContext</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">17. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type IDOMSourceEditingTextTools
-	is not accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">37:
-	import <b><u>org.eclipse.wst.xml.ui.internal.provisional.IDOMSourceEditingTextTools</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">18. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type IBreakpointProvider is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">51:
-	public abstract class AbstractBreakpointProvider implements <b><u>IBreakpointProvider</u></b>
-	{</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">19. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type IStructuredModel is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">107:
-	private static int getValidRegionPosition(<b><u>IStructuredModel</u></b>
-	model, ITextRegionCollection regionContainer, int startOffset, int
-	endOffset) {</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">20. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type ITextRegionCollection is
-	not accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">107:
-	private static int getValidRegionPosition(IStructuredModel model, <b><u>ITextRegionCollection</u></b>
-	regionContainer, int startOffset, int endOffset) {</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">21. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type ITextRegionList is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">109:
-	<b><u>ITextRegionList</u></b> regions = regionContainer.getRegions();</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">22. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The method getRegions() from the
-	type ITextRegionCollection is not accessible due to restriction on
-	classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">109:
-	ITextRegionList regions = <b><u>regionContainer.getRegions()</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">23. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The method size() from the type
-	ITextRegionList is not accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">110:
-	for (int i = 0; i &lt; <b><u>regions.size()</u></b>; i++) {</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">24. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type ITextRegion is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">111:
-	<b><u>ITextRegion</u></b> region = regions.get(i);</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">25. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The method get(int) from the type
-	ITextRegionList is not accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">111:
-	ITextRegion region = <b><u>regions.get(i)</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">26. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type ITextRegionCollection is
-	not accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">112:
-	if (region instanceof <b><u>ITextRegionCollection</u></b>) {</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">27. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type ITextRegionCollection is
-	not accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">113:
-	int validPosition = getValidRegionPosition(model, (<b><u>ITextRegionCollection</u></b>)
-	region, startOffset, endOffset);</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">28. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The method getEndOffset(ITextRegion)
-	from the type ITextRegionCollection is not accessible due to
-	restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">119:
-	if (<b><u>regionContainer.getEndOffset(region)</u></b> &gt;
-	startOffset) {</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">29. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The method
-	getStartOffset(ITextRegion) from the type ITextRegionCollection is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">121:
-	int regionStartOffset = <b><u>regionContainer.getStartOffset(region)</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">30. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The method getType() from the type
-	ITextRegion is not accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">130:
-	if (<b><u>region.getType()</u></b>.equals(DOMJSPRegionContexts.JSP_CONTENT))
-	{</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">31. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The method getType() from the type
-	ITextRegion is not accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">159:
-	else if (<b><u>region.getType()</u></b>.equals(DOMRegionContext.XML_TAG_NAME)
-	&amp;&amp;
-	(isCustomTagRegion(model.getIndexedRegion(regionStartOffset)) ||
-	regionContainer.getText(region).equals(JSP12Namespace.ElementName.USEBEAN)
-	||
-	regionContainer.getText(region).equals(JSP12Namespace.ElementName.GETPROPERTY)
-	||
-	regionContainer.getText(region).equals(JSP12Namespace.ElementName.SETPROPERTY)))
-	{</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">32. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type DOMRegionContext is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">159:
-	else if (region.getType().equals(<b><u>DOMRegionContext.XML_TAG_NAME</u></b>)
-	&amp;&amp;
-	(isCustomTagRegion(model.getIndexedRegion(regionStartOffset)) ||
-	regionContainer.getText(region).equals(JSP12Namespace.ElementName.USEBEAN)
-	||
-	regionContainer.getText(region).equals(JSP12Namespace.ElementName.GETPROPERTY)
-	||
-	regionContainer.getText(region).equals(JSP12Namespace.ElementName.SETPROPERTY)))
-	{</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">33. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The field XML_TAG_NAME from the type
-	DOMRegionContext is not accessible due to restriction on classpath
-	entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">159:
-	else if (region.getType().equals(DOMRegionContext.<b><u>XML_TAG_NAME</u></b>)
-	&amp;&amp;
-	(isCustomTagRegion(model.getIndexedRegion(regionStartOffset)) ||
-	regionContainer.getText(region).equals(JSP12Namespace.ElementName.USEBEAN)
-	||
-	regionContainer.getText(region).equals(JSP12Namespace.ElementName.GETPROPERTY)
-	||
-	regionContainer.getText(region).equals(JSP12Namespace.ElementName.SETPROPERTY)))
-	{</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">34. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The method getIndexedRegion(int)
-	from the type IStructuredModel is not accessible due to restriction on
-	classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">159:
-	else if (region.getType().equals(DOMRegionContext.XML_TAG_NAME)
-	&amp;&amp; (isCustomTagRegion(<b><u>model.getIndexedRegion(regionStartOffset)</u></b>)
-	||
-	regionContainer.getText(region).equals(JSP12Namespace.ElementName.USEBEAN)
-	||
-	regionContainer.getText(region).equals(JSP12Namespace.ElementName.GETPROPERTY)
-	||
-	regionContainer.getText(region).equals(JSP12Namespace.ElementName.SETPROPERTY)))
-	{</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">35. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The method getText(ITextRegion) from
-	the type ITextRegionCollection is not accessible due to restriction on
-	classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">159:
-	else if (region.getType().equals(DOMRegionContext.XML_TAG_NAME)
-	&amp;&amp;
-	(isCustomTagRegion(model.getIndexedRegion(regionStartOffset)) || <b><u>regionContainer.getText(region)</u></b>.equals(JSP12Namespace.ElementName.USEBEAN)
-	||
-	regionContainer.getText(region).equals(JSP12Namespace.ElementName.GETPROPERTY)
-	||
-	regionContainer.getText(region).equals(JSP12Namespace.ElementName.SETPROPERTY)))
-	{</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">36. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The method getText(ITextRegion) from
-	the type ITextRegionCollection is not accessible due to restriction on
-	classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">159:
-	else if (region.getType().equals(DOMRegionContext.XML_TAG_NAME)
-	&amp;&amp;
-	(isCustomTagRegion(model.getIndexedRegion(regionStartOffset)) ||
-	regionContainer.getText(region).equals(JSP12Namespace.ElementName.USEBEAN)
-	|| <b><u>regionContainer.getText(region)</u></b>.equals(JSP12Namespace.ElementName.GETPROPERTY)
-	||
-	regionContainer.getText(region).equals(JSP12Namespace.ElementName.SETPROPERTY)))
-	{</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">37. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The method getText(ITextRegion) from
-	the type ITextRegionCollection is not accessible due to restriction on
-	classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">159:
-	else if (region.getType().equals(DOMRegionContext.XML_TAG_NAME)
-	&amp;&amp;
-	(isCustomTagRegion(model.getIndexedRegion(regionStartOffset)) ||
-	regionContainer.getText(region).equals(JSP12Namespace.ElementName.USEBEAN)
-	||
-	regionContainer.getText(region).equals(JSP12Namespace.ElementName.GETPROPERTY)
-	|| <b><u>regionContainer.getText(region)</u></b>.equals(JSP12Namespace.ElementName.SETPROPERTY)))
-	{</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">38. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type IndexedRegion is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">171:
-	<b><u>IndexedRegion</u></b> node =
-	model.getIndexedRegion(regionStartOffset);</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">39. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The method getIndexedRegion(int)
-	from the type IStructuredModel is not accessible due to restriction on
-	classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">171:
-	IndexedRegion node = <b><u>model.getIndexedRegion(regionStartOffset)</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">40. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type IndexedRegion is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">193:
-	private static boolean isCustomTagRegion(<b><u>IndexedRegion</u></b>
-	node) {</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">41. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type ModelQuery is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">197:
-	<b><u>ModelQuery</u></b> mq =
-	ModelQueryUtil.getModelQuery(xmlElement.getOwnerDocument());</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">42. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type ModelQueryUtil is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">197:
-	ModelQuery mq = <b><u>ModelQueryUtil</u></b>.getModelQuery(xmlElement.getOwnerDocument());</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">43. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The method getModelQuery(Document)
-	from the type ModelQueryUtil is not accessible due to restriction on
-	classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">197:
-	ModelQuery mq = <b><u>ModelQueryUtil.getModelQuery(xmlElement.getOwnerDocument())</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">44. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type CMElementDeclaration is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">198:
-	<b><u>CMElementDeclaration</u></b> decl =
-	mq.getCMElementDeclaration(xmlElement);</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">45. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The method
-	getCMElementDeclaration(Element) from the type ModelQuery is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">198:
-	CMElementDeclaration decl = <b><u>mq.getCMElementDeclaration(xmlElement)</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">46. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type CMNodeWrapper is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">199:
-	if (decl instanceof <b><u>CMNodeWrapper</u></b>) {</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">47. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type CMNode is not accessible
-	due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">200:
-	<b><u>CMNode</u></b> cmNode = ((CMNodeWrapper) decl).getOriginNode();</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">48. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The method getOriginNode() from the
-	type CMNodeWrapper is not accessible due to restriction on classpath
-	entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">200:
-	CMNode cmNode = <b><u>((CMNodeWrapper) decl).getOriginNode()</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">49. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type CMNodeWrapper is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">200:
-	CMNode cmNode = ((<b><u>CMNodeWrapper</u></b>) decl).getOriginNode();</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">50. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type ISourceEditingTextTools is
-	not accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">207:
-	private <b><u>ISourceEditingTextTools</u></b> fSourceEditingTextTools;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">51. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type ISourceEditingTextTools is
-	not accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">218:
-	public <b><u>ISourceEditingTextTools</u></b>
-	getSourceEditingTextTools() {</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">52. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type IDOMSourceEditingTextTools
-	is not accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">223:
-	if (!(getSourceEditingTextTools() instanceof <b><u>IDOMSourceEditingTextTools</u></b>))
-	{</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">53. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type IStructuredDocumentRegion
-	is not accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">248:
-	<b><u>IStructuredDocumentRegion</u></b> flatNode =
-	((IStructuredDocument) idoc).getRegionAtCharacterOffset(startOffset);</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">54. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The method
-	getRegionAtCharacterOffset(int) from the type IStructuredDocument is
-	not accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">248:
-	IStructuredDocumentRegion flatNode = <b><u>((IStructuredDocument)
-	idoc).getRegionAtCharacterOffset(startOffset)</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">55. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type IStructuredDocument is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">248:
-	IStructuredDocumentRegion flatNode = ((<b><u>IStructuredDocument</u></b>)
-	idoc).getRegionAtCharacterOffset(startOffset);</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">56. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The method getModel() from the type
-	IDOMNode is not accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">252:
-	int validPosition = getValidRegionPosition(<b><u>((IDOMDocument)
-	((IDOMSourceEditingTextTools)
-	getSourceEditingTextTools()).getDOMDocument()).getModel()</u></b>, flatNode,
-	startOffset, endOffset);</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">57. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type IDOMDocument is not
-	accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">252:
-	int validPosition = getValidRegionPosition(((<b><u>IDOMDocument</u></b>)
-	((IDOMSourceEditingTextTools)
-	getSourceEditingTextTools()).getDOMDocument()).getModel(), flatNode,
-	startOffset, endOffset);</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">58. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The method getDOMDocument() from the
-	type IDOMSourceEditingTextTools is not accessible due to restriction on
-	classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">252:
-	int validPosition = getValidRegionPosition(((IDOMDocument) <b><u>((IDOMSourceEditingTextTools)
-	getSourceEditingTextTools()).getDOMDocument()</u></b>).getModel(), flatNode,
-	startOffset, endOffset);</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">59. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type IDOMSourceEditingTextTools
-	is not accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">252:
-	int validPosition = getValidRegionPosition(((IDOMDocument) ((<b><u>IDOMSourceEditingTextTools</u></b>)
-	getSourceEditingTextTools()).getDOMDocument()).getModel(), flatNode,
-	startOffset, endOffset);</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">60. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The method getNext() from the type
-	IStructuredDocumentRegion is not accessible due to restriction on
-	classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">260:
-	flatNode = <b><u>flatNode.getNext()</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">61. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type ISourceEditingTextTools is
-	not accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">AbstractBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">265:
-	public void setSourceEditingTextTools(<b><u>ISourceEditingTextTools</u></b>
-	sourceEditingTextTools) {</p>
-	</dd>
-	<dt style="font-weight: bold; color: black">Source File:
-	org/eclipse/jst/jsp/ui/internal/breakpointproviders/JavaBreakpointProvider.java</dt>
-	<dd style="font-weight: normal; color: black">1. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type IDOMSourceEditingTextTools
-	is not accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">JavaBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">24:
-	import <b><u>org.eclipse.wst.xml.ui.internal.provisional.IDOMSourceEditingTextTools</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">2. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type IDOMSourceEditingTextTools
-	is not accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">JavaBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">76:
-	if (getSourceEditingTextTools() instanceof <b><u>IDOMSourceEditingTextTools</u></b>)
-	{</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">3. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The method getDOMDocument() from the
-	type IDOMSourceEditingTextTools is not accessible due to restriction on
-	classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">JavaBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">77:
-	doc = <b><u>((IDOMSourceEditingTextTools)
-	getSourceEditingTextTools()).getDOMDocument()</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">4. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type IDOMSourceEditingTextTools
-	is not accessible due to restriction on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.ui/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">JavaBreakpointProvider.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">77:
-	doc = ((<b><u>IDOMSourceEditingTextTools</u></b>)
-	getSourceEditingTextTools()).getDOMDocument();</p>
-	</dd>
-	<dt style="font-weight: bold; color: black">Source File:
-	org/eclipse/jst/jsp/ui/internal/wizard/NewJSPWizard.java</dt>
-	<dd style="font-weight: normal; color: black">1. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type
-	CommonEncodingPreferenceNames is not accessible due to restriction on
-	classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">NewJSPWizard.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">34:
-	import <b><u>org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames</u></b>;</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">2. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The type
-	CommonEncodingPreferenceNames is not accessible due to restriction on
-	classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">NewJSPWizard.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">99:
-	String charSet = preference.getString(<b><u>CommonEncodingPreferenceNames.OUTPUT_CODESET</u></b>);</p>
-	</dd>
-	<dd style="font-weight: normal; color: black">3. WARNING:
-	DiscouragedReference
-	<p
-		style="margin-left: +.5in; font-size: -1; margin-top: 0; margin-bottom: 0;">
-	<small>Discouraged access: The field OUTPUT_CODESET from the
-	type CommonEncodingPreferenceNames is not accessible due to restriction
-	on classpath entry
-	/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot</small>
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; margin-top: 0; margin-bottom: 0;">NewJSPWizard.java:
-	</p>
-	<p
-		style="margin-left: +.5in; font-size: -2; font-family: monospace; margin-top: 0; margin-bottom: 0;">99:
-	String charSet = preference.getString(CommonEncodingPreferenceNames.<b><u>OUTPUT_CODESET</u></b>);</p>
-	</dd>
-</dl>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/wtp.site/example.bin.xml b/releng.wtpbuilder/distribution/wtp.site/example.bin.xml
deleted file mode 100644
index d13e26c..0000000
--- a/releng.wtpbuilder/distribution/wtp.site/example.bin.xml
+++ /dev/null
@@ -1,4109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 4/3/07 9:22:11 PM EDT -->
-<!DOCTYPE compiler PUBLIC "-//Eclipse.org//DTD Eclipse JDT 3.2.002 Compiler//EN" "http://www.eclipse.org/jdt/core/compiler_32_002.dtd">
-<compiler
-    copyright="Copyright IBM Corp 2000, 2007. All rights reserved."
-    name="Eclipse Java Compiler"
-    version="0.735, 3.3.0 milestone-5">
-    <command_line>
-        <argument value="-noExit" />
-        <argument value="-bootclasspath" />
-        <argument
-            value="/home/shared/webtools/apps/j2sdk1.4.2_11/jre/lib/rt.jar" />
-        <argument value="-classpath" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/temp.folder/@dot.bin:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.ui.ide_3.3.0.I20070321-1300a.jar[+org/eclipse/ui/*:+org/eclipse/ui/actions/*:+org/eclipse/ui/dialogs/*:+org/eclipse/ui/ide/*:+org/eclipse/ui/ide/dialogs/*:+org/eclipse/ui/ide/fileSystem/*:+org/eclipse/ui/ide/undo/*:~org/eclipse/ui/internal/ide/*:~org/eclipse/ui/internal/ide/actions/*:~org/eclipse/ui/internal/ide/commands/*:~org/eclipse/ui/internal/ide/dialogs/*:~org/eclipse/ui/internal/ide/filesystem/*:~org/eclipse/ui/internal/ide/handlers/*:~org/eclipse/ui/internal/ide/misc/*:~org/eclipse/ui/internal/ide/model/*:~org/eclipse/ui/internal/ide/registry/*:~org/eclipse/ui/internal/ide/undo/*:~org/eclipse/ui/internal/ide/update/*:~org/eclipse/ui/internal/views/bookmarkexplorer/*:~org/eclipse/ui/internal/views/framelist/*:~org/eclipse/ui/internal/views/navigator/*:~org/eclipse/ui/internal/views/properties/*:~org/eclipse/ui/internal/views/tasklist/*:~org/eclipse/ui/internal/wizards/datatransfer/*:~org/eclipse/ui/internal/wizards/newresource/*:+org/eclipse/ui/model/*:+org/eclipse/ui/part/*:+org/eclipse/ui/views/bookmarkexplorer/*:+org/eclipse/ui/views/framelist/*:+org/eclipse/ui/views/markers/*:~org/eclipse/ui/views/markers/internal/*:+org/eclipse/ui/views/navigator/*:+org/eclipse/ui/views/properties/*:+org/eclipse/ui/views/tasklist/*:+org/eclipse/ui/wizards/datatransfer/*:+org/eclipse/ui/wizards/newresource/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/com.ibm.icu.base_3.6.0.20061215.jar[?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.core.resources_3.3.0.v20070316.jar[~org/eclipse/core/internal/dtree/*:~org/eclipse/core/internal/events/*:~org/eclipse/core/internal/localstore/*:~org/eclipse/core/internal/properties/*:~org/eclipse/core/internal/propertytester/*:~org/eclipse/core/internal/refresh/*:~org/eclipse/core/internal/resources/*:~org/eclipse/core/internal/resources/mapping/*:~org/eclipse/core/internal/utils/*:~org/eclipse/core/internal/watson/*:+org/eclipse/core/resources/*:+org/eclipse/core/resources/mapping/*:+org/eclipse/core/resources/refresh/*:+org/eclipse/core/resources/team/*:~org/eclipse/core/internal/indexing/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.core.resources.compatibility_3.2.0.v20070226.jar[~org/eclipse/core/internal/dtree/*:~org/eclipse/core/internal/events/*:~org/eclipse/core/internal/localstore/*:~org/eclipse/core/internal/properties/*:~org/eclipse/core/internal/propertytester/*:~org/eclipse/core/internal/refresh/*:~org/eclipse/core/internal/resources/*:~org/eclipse/core/internal/resources/mapping/*:~org/eclipse/core/internal/utils/*:~org/eclipse/core/internal/watson/*:+org/eclipse/core/resources/*:+org/eclipse/core/resources/mapping/*:+org/eclipse/core/resources/refresh/*:+org/eclipse/core/resources/team/*:~org/eclipse/core/internal/indexing/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.ant.core_3.1.200.v20070318.jar[?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.core.variables_3.1.100.v20070205.jar[?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.core.runtime_3.3.100.v20070319.jar[~org/eclipse/core/internal/preferences/legacy/*:~org/eclipse/core/internal/runtime/*:+org/eclipse/core/runtime/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.osgi_3.3.0.v20070321.jar[+org/eclipse/osgi/event/*:+org/eclipse/osgi/framework/console/*:+org/eclipse/osgi/framework/eventmgr/*:+org/eclipse/osgi/framework/log/*:+org/eclipse/osgi/service/datalocation/*:+org/eclipse/osgi/service/debug/*:+org/eclipse/osgi/service/environment/*:+org/eclipse/osgi/service/localization/*:+org/eclipse/osgi/service/pluginconversion/*:+org/eclipse/osgi/service/resolver/*:+org/eclipse/osgi/service/runnable/*:+org/eclipse/osgi/service/urlconversion/*:+org/eclipse/osgi/storagemanager/*:+org/eclipse/osgi/util/*:+org/osgi/framework/*:+org/osgi/service/condpermadmin/*:+org/osgi/service/packageadmin/*:+org/osgi/service/permissionadmin/*:+org/osgi/service/startlevel/*:+org/osgi/service/url/*:+org/osgi/util/tracker/*:~org/eclipse/core/runtime/adaptor/*:~org/eclipse/core/runtime/internal/adaptor/*:~org/eclipse/core/runtime/internal/stats/*:~org/eclipse/osgi/baseadaptor/*:~org/eclipse/osgi/baseadaptor/bundlefile/*:~org/eclipse/osgi/baseadaptor/hooks/*:~org/eclipse/osgi/baseadaptor/loader/*:~org/eclipse/osgi/framework/adaptor/*:~org/eclipse/osgi/framework/debug/*:~org/eclipse/osgi/framework/internal/core/*:~org/eclipse/osgi/framework/internal/protocol/*:~org/eclipse/osgi/framework/internal/protocol/bundleentry/*:~org/eclipse/osgi/framework/internal/protocol/bundleresource/*:~org/eclipse/osgi/framework/internal/protocol/reference/*:~org/eclipse/osgi/framework/internal/reliablefile/*:~org/eclipse/osgi/framework/launcher/*:~org/eclipse/osgi/framework/util/*:~org/eclipse/osgi/internal/baseadaptor/*:~org/eclipse/osgi/internal/module/*:~org/eclipse/osgi/internal/profile/*:~org/eclipse/osgi/internal/resolver/*:~org/eclipse/osgi/internal/verifier/*:~org/eclipse/osgi/internal/provisional/verifier/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.equinox.common_3.3.0.v20070318.jar[~org/eclipse/core/internal/runtime/*:~org/eclipse/core/internal/boot/*:+org/eclipse/core/runtime/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.core.jobs_3.3.0.v20070319.jar[~org/eclipse/core/internal/jobs/*:+org/eclipse/core/runtime/jobs/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.core.runtime.compatibility.registry_3.2.100.v20070316/runtime_registry_compatibility.jar[~org/eclipse/core/internal/registry/*:~org/eclipse/core/internal/registry/osgi/*:~org/eclipse/core/internal/registry/spi/*:+org/eclipse/core/runtime/*:+org/eclipse/core/runtime/dynamichelpers/*:+org/eclipse/core/runtime/spi/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.equinox.registry_3.3.0.v20070318.jar[~org/eclipse/core/internal/registry/*:~org/eclipse/core/internal/registry/osgi/*:~org/eclipse/core/internal/registry/spi/*:+org/eclipse/core/runtime/*:+org/eclipse/core/runtime/dynamichelpers/*:+org/eclipse/core/runtime/spi/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.equinox.preferences_3.2.100.v20070312.jar[~org/eclipse/core/internal/preferences/*:~org/eclipse/core/internal/preferences/exchange/*:+org/eclipse/core/runtime/preferences/*:+org/osgi/service/prefs/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.core.contenttype_3.2.100.v20070319.jar[~org/eclipse/core/internal/content/*:+org/eclipse/core/runtime/content/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.core.runtime.compatibility.auth_3.2.0.v20070202.jar[?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.equinox.app_1.0.0.v20070318.jar[+org/eclipse/equinox/app/*:~org/eclipse/equinox/internal/app/*:+org/osgi/service/application/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.osgi.services_3.1.100.v20060918.jar[?**/*]:/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/javax.servlet_2.4.0.v200612120446.jar[?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.core.expressions_3.3.0.v20070319-1800.jar[?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.core.filesystem_1.1.0.v20070226.jar[?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.core.filesystem.linux.x86_1.1.0.v20070202.jar[?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.help_3.3.0.v20070316.jar[?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.ui_3.3.0.I20070322-1800.jar[~org/eclipse/ui/internal/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.swt_3.3.0.v3333g.jar[+org/eclipse/swt/*:+org/eclipse/swt/accessibility/*:+org/eclipse/swt/awt/*:+org/eclipse/swt/browser/*:+org/eclipse/swt/custom/*:+org/eclipse/swt/dnd/*:+org/eclipse/swt/events/*:+org/eclipse/swt/graphics/*:+org/eclipse/swt/layout/*:+org/eclipse/swt/opengl/*:+org/eclipse/swt/printing/*:+org/eclipse/swt/program/*:+org/eclipse/swt/widgets/*:~org/eclipse/swt/internal/*:~org/eclipse/swt/internal/image/*:~org/eclipse/swt/internal/theme/*:~org/eclipse/swt/internal/accessibility/gtk/*:~org/eclipse/swt/internal/cairo/*:~org/eclipse/swt/internal/cde/*:~org/eclipse/swt/internal/gnome/*:~org/eclipse/swt/internal/gtk/*:~org/eclipse/swt/internal/mozilla/*:~org/eclipse/swt/internal/opengl/glx/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.swt.gtk.linux.x86_3.3.0.v3333.jar[+org/eclipse/swt/*:+org/eclipse/swt/accessibility/*:+org/eclipse/swt/awt/*:+org/eclipse/swt/browser/*:+org/eclipse/swt/custom/*:+org/eclipse/swt/dnd/*:+org/eclipse/swt/events/*:+org/eclipse/swt/graphics/*:+org/eclipse/swt/layout/*:+org/eclipse/swt/opengl/*:+org/eclipse/swt/printing/*:+org/eclipse/swt/program/*:+org/eclipse/swt/widgets/*:~org/eclipse/swt/internal/*:~org/eclipse/swt/internal/image/*:~org/eclipse/swt/internal/theme/*:~org/eclipse/swt/internal/accessibility/gtk/*:~org/eclipse/swt/internal/cairo/*:~org/eclipse/swt/internal/cde/*:~org/eclipse/swt/internal/gnome/*:~org/eclipse/swt/internal/gtk/*:~org/eclipse/swt/internal/mozilla/*:~org/eclipse/swt/internal/opengl/glx/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.jface_3.3.0.I20070321-1800.jar[+org/eclipse/jface/*:+org/eclipse/jface/action/*:+org/eclipse/jface/action/images/*:+org/eclipse/jface/bindings/*:+org/eclipse/jface/bindings/keys/*:+org/eclipse/jface/bindings/keys/formatting/*:+org/eclipse/jface/commands/*:+org/eclipse/jface/contexts/*:+org/eclipse/jface/dialogs/*:+org/eclipse/jface/dialogs/images/*:+org/eclipse/jface/fieldassist/*:+org/eclipse/jface/fieldassist/images/*:+org/eclipse/jface/images/*:~org/eclipse/jface/internal/provisional/action/*:+org/eclipse/jface/layout/*:+org/eclipse/jface/menus/*:+org/eclipse/jface/operation/*:+org/eclipse/jface/preference/*:+org/eclipse/jface/preference/images/*:+org/eclipse/jface/resource/*:+org/eclipse/jface/util/*:+org/eclipse/jface/viewers/*:+org/eclipse/jface/viewers/deferred/*:+org/eclipse/jface/window/*:+org/eclipse/jface/wizard/*:+org/eclipse/jface/wizard/images/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.core.commands_3.3.0.I20070321-0010.jar[+org/eclipse/core/commands/*:+org/eclipse/core/commands/common/*:+org/eclipse/core/commands/contexts/*:+org/eclipse/core/commands/operations/*:+org/eclipse/core/commands/util/*:~org/eclipse/core/internal/commands/operations/*:~org/eclipse/core/internal/commands/util/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.ui.workbench_3.3.0.I20070322-1800.jar[+org/eclipse/ui/*:+org/eclipse/ui/actions/*:+org/eclipse/ui/dialogs/*:+org/eclipse/ui/model/*:+org/eclipse/ui/part/*:+org/eclipse/ui/about/*:+org/eclipse/ui/activities/*:+org/eclipse/ui/application/*:+org/eclipse/ui/branding/*:+org/eclipse/ui/browser/*:+org/eclipse/ui/commands/*:+org/eclipse/ui/contexts/*:+org/eclipse/ui/dnd/*:+org/eclipse/ui/fieldassist/*:+org/eclipse/ui/handlers/*:+org/eclipse/ui/help/*:~org/eclipse/ui/internal/*:~org/eclipse/ui/internal/about/*:~org/eclipse/ui/internal/actions/*:~org/eclipse/ui/internal/activities/*:~org/eclipse/ui/internal/activities/ws/*:~org/eclipse/ui/internal/application/*:~org/eclipse/ui/internal/browser/*:~org/eclipse/ui/internal/commands/*:~org/eclipse/ui/internal/contexts/*:~org/eclipse/ui/internal/decorators/*:~org/eclipse/ui/internal/dialogs/*:~org/eclipse/ui/internal/dnd/*:~org/eclipse/ui/internal/editorsupport/*:~org/eclipse/ui/internal/expressions/*:~org/eclipse/ui/internal/handlers/*:~org/eclipse/ui/internal/help/*:~org/eclipse/ui/internal/incubator/*:~org/eclipse/ui/internal/intro/*:~org/eclipse/ui/internal/keys/*:~org/eclipse/ui/internal/layout/*:~org/eclipse/ui/internal/menus/*:~org/eclipse/ui/internal/misc/*:~org/eclipse/ui/internal/operations/*:~org/eclipse/ui/internal/part/*:~org/eclipse/ui/internal/preferences/*:~org/eclipse/ui/internal/presentations/*:~org/eclipse/ui/internal/presentations/defaultpresentation/*:~org/eclipse/ui/internal/presentations/r33/*:~org/eclipse/ui/internal/presentations/util/*:~org/eclipse/ui/internal/progress/*:~org/eclipse/ui/internal/provisional/application/*:~org/eclipse/ui/internal/provisional/presentations/*:~org/eclipse/ui/internal/registry/*:~org/eclipse/ui/internal/services/*:~org/eclipse/ui/internal/splash/*:~org/eclipse/ui/internal/statushandlers/*:~org/eclipse/ui/internal/testing/*:~org/eclipse/ui/internal/themes/*:~org/eclipse/ui/internal/tweaklets/*:~org/eclipse/ui/internal/util/*:~org/eclipse/ui/internal/wizards/*:~org/eclipse/ui/internal/wizards/preferences/*:+org/eclipse/ui/intro/*:+org/eclipse/ui/keys/*:+org/eclipse/ui/menus/*:+org/eclipse/ui/operations/*:+org/eclipse/ui/plugin/*:+org/eclipse/ui/preferences/*:+org/eclipse/ui/presentations/*:+org/eclipse/ui/progress/*:+org/eclipse/ui/services/*:+org/eclipse/ui/splash/*:+org/eclipse/ui/statushandlers/*:+org/eclipse/ui/swt/*:+org/eclipse/ui/testing/*:+org/eclipse/ui/themes/*:+org/eclipse/ui/views/*:+org/eclipse/ui/wizards/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.ui.workbench.compatibility_3.2.0.I20070319-0010/compatibility.jar[+org/eclipse/ui/*:+org/eclipse/ui/actions/*:+org/eclipse/ui/dialogs/*:+org/eclipse/ui/model/*:+org/eclipse/ui/part/*:+org/eclipse/ui/about/*:+org/eclipse/ui/activities/*:+org/eclipse/ui/application/*:+org/eclipse/ui/branding/*:+org/eclipse/ui/browser/*:+org/eclipse/ui/commands/*:+org/eclipse/ui/contexts/*:+org/eclipse/ui/dnd/*:+org/eclipse/ui/fieldassist/*:+org/eclipse/ui/handlers/*:+org/eclipse/ui/help/*:~org/eclipse/ui/internal/*:~org/eclipse/ui/internal/about/*:~org/eclipse/ui/internal/actions/*:~org/eclipse/ui/internal/activities/*:~org/eclipse/ui/internal/activities/ws/*:~org/eclipse/ui/internal/application/*:~org/eclipse/ui/internal/browser/*:~org/eclipse/ui/internal/commands/*:~org/eclipse/ui/internal/contexts/*:~org/eclipse/ui/internal/decorators/*:~org/eclipse/ui/internal/dialogs/*:~org/eclipse/ui/internal/dnd/*:~org/eclipse/ui/internal/editorsupport/*:~org/eclipse/ui/internal/expressions/*:~org/eclipse/ui/internal/handlers/*:~org/eclipse/ui/internal/help/*:~org/eclipse/ui/internal/incubator/*:~org/eclipse/ui/internal/intro/*:~org/eclipse/ui/internal/keys/*:~org/eclipse/ui/internal/layout/*:~org/eclipse/ui/internal/menus/*:~org/eclipse/ui/internal/misc/*:~org/eclipse/ui/internal/operations/*:~org/eclipse/ui/internal/part/*:~org/eclipse/ui/internal/preferences/*:~org/eclipse/ui/internal/presentations/*:~org/eclipse/ui/internal/presentations/defaultpresentation/*:~org/eclipse/ui/internal/presentations/r33/*:~org/eclipse/ui/internal/presentations/util/*:~org/eclipse/ui/internal/progress/*:~org/eclipse/ui/internal/provisional/application/*:~org/eclipse/ui/internal/provisional/presentations/*:~org/eclipse/ui/internal/registry/*:~org/eclipse/ui/internal/services/*:~org/eclipse/ui/internal/splash/*:~org/eclipse/ui/internal/statushandlers/*:~org/eclipse/ui/internal/testing/*:~org/eclipse/ui/internal/themes/*:~org/eclipse/ui/internal/tweaklets/*:~org/eclipse/ui/internal/util/*:~org/eclipse/ui/internal/wizards/*:~org/eclipse/ui/internal/wizards/preferences/*:+org/eclipse/ui/intro/*:+org/eclipse/ui/keys/*:+org/eclipse/ui/menus/*:+org/eclipse/ui/operations/*:+org/eclipse/ui/plugin/*:+org/eclipse/ui/preferences/*:+org/eclipse/ui/presentations/*:+org/eclipse/ui/progress/*:+org/eclipse/ui/services/*:+org/eclipse/ui/splash/*:+org/eclipse/ui/statushandlers/*:+org/eclipse/ui/swt/*:+org/eclipse/ui/testing/*:+org/eclipse/ui/themes/*:+org/eclipse/ui/views/*:+org/eclipse/ui/wizards/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.jface.databinding_1.1.0.I20070319-1300.jar[?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.core.databinding_1.0.0.I20070322-0010.jar[?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.ui.views_3.2.100.I20070319-0010.jar[~org/eclipse/ui/internal/views/properties/*:+org/eclipse/ui/views/properties/*:~org/eclipse/ui/internal/views/*:~org/eclipse/ui/internal/views/contentoutline/*:+org/eclipse/ui/views/contentoutline/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.update.configurator_3.2.100.v20070322.jar[?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.update.core_3.2.100.v20070322b.jar[?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.update.core.linux_3.2.0.v20060605.jar[?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.update.ui_3.2.100.v20070322a.jar[?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.ui.forms_3.3.0.v20070322.jar[?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.jface.text_3.3.0.v20070321-1800.jar[+org/eclipse/jface/contentassist/*:+org/eclipse/jface/contentassist/images/*:~org/eclipse/jface/internal/text/*:~org/eclipse/jface/internal/text/html/*:~org/eclipse/jface/internal/text/link/contentassist/*:~org/eclipse/jface/internal/text/revisions/*:~org/eclipse/jface/internal/text/source/*:+org/eclipse/jface/text/*:+org/eclipse/jface/text/contentassist/*:+org/eclipse/jface/text/formatter/*:+org/eclipse/jface/text/hyperlink/*:+org/eclipse/jface/text/information/*:+org/eclipse/jface/text/link/*:+org/eclipse/jface/text/presentation/*:+org/eclipse/jface/text/quickassist/*:+org/eclipse/jface/text/reconciler/*:+org/eclipse/jface/text/revisions/*:+org/eclipse/jface/text/rules/*:+org/eclipse/jface/text/source/*:+org/eclipse/jface/text/source/projection/*:+org/eclipse/jface/text/source/projection/images/*:+org/eclipse/jface/text/templates/*:+org/eclipse/jface/text/templates/persistence/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.text_3.3.0.v20070319-1800.jar[+org/eclipse/jface/text/*:+org/eclipse/jface/text/link/*:+org/eclipse/jface/text/projection/*:+org/eclipse/jface/text/source/*:+org/eclipse/jface/text/templates/*:+org/eclipse/text/edits/*:+org/eclipse/text/undo/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.ui.workbench.texteditor_3.3.0.v20070321-1300.jar[+org/eclipse/ui/contentassist/*:~org/eclipse/ui/internal/texteditor/*:~org/eclipse/ui/internal/texteditor/quickdiff/*:~org/eclipse/ui/internal/texteditor/quickdiff/compare/equivalence/*:~org/eclipse/ui/internal/texteditor/quickdiff/compare/rangedifferencer/*:~org/eclipse/ui/internal/texteditor/rulers/*:~org/eclipse/ui/internal/texteditor/spelling/*:+org/eclipse/ui/texteditor/*:+org/eclipse/ui/texteditor/link/*:+org/eclipse/ui/texteditor/quickdiff/*:+org/eclipse/ui/texteditor/rulers/*:+org/eclipse/ui/texteditor/spelling/*:+org/eclipse/ui/texteditor/templates/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot[+org/eclipse/wst/sse/ui/*:~org/eclipse/wst/sse/ui/internal/*:~org/eclipse/wst/sse/ui/internal/actions/*:~org/eclipse/wst/sse/ui/internal/contentassist/*:~org/eclipse/wst/sse/ui/internal/contentoutline/*:~org/eclipse/wst/sse/ui/internal/contentproperties/ui/*:~org/eclipse/wst/sse/ui/internal/correction/*:~org/eclipse/wst/sse/ui/internal/debug/*:~org/eclipse/wst/sse/ui/internal/derived/*:~org/eclipse/wst/sse/ui/internal/edit/util/*:~org/eclipse/wst/sse/ui/internal/editor/*:~org/eclipse/wst/sse/ui/internal/encoding/ui/*:~org/eclipse/wst/sse/ui/internal/extension/*:~org/eclipse/wst/sse/ui/internal/format/*:~org/eclipse/wst/sse/ui/internal/hyperlink/*:~org/eclipse/wst/sse/ui/internal/openon/*:~org/eclipse/wst/sse/ui/internal/preferences/*:~org/eclipse/wst/sse/ui/internal/preferences/ui/*:~org/eclipse/wst/sse/ui/internal/projection/*:~org/eclipse/wst/sse/ui/internal/properties/*:~org/eclipse/wst/sse/ui/internal/provisional/extensions/*:~org/eclipse/wst/sse/ui/internal/provisional/extensions/breakpoint/*:~org/eclipse/wst/sse/ui/internal/provisional/preferences/*:~org/eclipse/wst/sse/ui/internal/provisional/registry/*:~org/eclipse/wst/sse/ui/internal/provisional/style/*:~org/eclipse/wst/sse/ui/internal/reconcile/*:~org/eclipse/wst/sse/ui/internal/reconcile/validator/*:~org/eclipse/wst/sse/ui/internal/search/*:~org/eclipse/wst/sse/ui/internal/selection/*:~org/eclipse/wst/sse/ui/internal/spelling/*:~org/eclipse/wst/sse/ui/internal/taginfo/*:~org/eclipse/wst/sse/ui/internal/text/*:~org/eclipse/wst/sse/ui/internal/ui/*:~org/eclipse/wst/sse/ui/internal/util/*:~org/eclipse/wst/sse/ui/internal/view/events/*:+org/eclipse/wst/sse/ui/views/contentoutline/*:+org/eclipse/wst/sse/ui/views/properties/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.debug.ui_3.3.0.v20070322a.jar[?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.ui.console_3.2.0.v20070212.jar[?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.debug.core_3.3.0.v20070323.jar[+org/eclipse/debug/core/*:+org/eclipse/debug/core/commands/*:+org/eclipse/debug/core/model/*:+org/eclipse/debug/core/sourcelookup/*:+org/eclipse/debug/core/sourcelookup/containers/*:~org/eclipse/debug/internal/core/*:~org/eclipse/debug/internal/core/commands/*:~org/eclipse/debug/internal/core/sourcelookup/*:~org/eclipse/debug/internal/core/sourcelookup/containers/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.ui.editors_3.3.0.v20070321-1800.jar[+org/eclipse/ui/editors/text/*:+org/eclipse/ui/editors/text/templates/*:~org/eclipse/ui/internal/editors/quickdiff/*:~org/eclipse/ui/internal/editors/text/*:~org/eclipse/ui/internal/texteditor/*:+org/eclipse/ui/texteditor/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.core.filebuffers_3.3.0.v20070319-1800.jar[+org/eclipse/core/filebuffers/*:+org/eclipse/core/filebuffers/manipulation/*:~org/eclipse/core/internal/filebuffers/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.search_3.3.0.v20070319-1800.jar[+org/eclipse/search/core/text/*:~org/eclipse/search/internal/core/text/*:~org/eclipse/search/internal/ui/*:~org/eclipse/search/internal/ui/text/*:~org/eclipse/search/internal/ui/util/*:+org/eclipse/search/ui/*:+org/eclipse/search/ui/actions/*:+org/eclipse/search/ui/text/*:~org/eclipse/search2/internal/ui/*:~org/eclipse/search2/internal/ui/basic/views/*:~org/eclipse/search2/internal/ui/text/*:~org/eclipse/search2/internal/ui/text2/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot[+org/eclipse/wst/sse/core/*:~org/eclipse/wst/sse/core/internal/*:~org/eclipse/wst/sse/core/internal/cleanup/*:~org/eclipse/wst/sse/core/internal/document/*:~org/eclipse/wst/sse/core/internal/encoding/*:~org/eclipse/wst/sse/core/internal/encoding/util/*:~org/eclipse/wst/sse/core/internal/exceptions/*:~org/eclipse/wst/sse/core/internal/filebuffers/*:~org/eclipse/wst/sse/core/internal/format/*:~org/eclipse/wst/sse/core/internal/ltk/modelhandler/*:~org/eclipse/wst/sse/core/internal/ltk/parser/*:~org/eclipse/wst/sse/core/internal/model/*:~org/eclipse/wst/sse/core/internal/modelhandler/*:~org/eclipse/wst/sse/core/internal/parser/*:~org/eclipse/wst/sse/core/internal/preferences/*:~org/eclipse/wst/sse/core/internal/provisional/*:~org/eclipse/wst/sse/core/internal/provisional/document/*:~org/eclipse/wst/sse/core/internal/provisional/events/*:~org/eclipse/wst/sse/core/internal/provisional/exceptions/*:~org/eclipse/wst/sse/core/internal/provisional/model/*:~org/eclipse/wst/sse/core/internal/provisional/tasks/*:~org/eclipse/wst/sse/core/internal/provisional/text/*:~org/eclipse/wst/sse/core/internal/tasks/*:~org/eclipse/wst/sse/core/internal/text/*:~org/eclipse/wst/sse/core/internal/text/rules/*:~org/eclipse/wst/sse/core/internal/undo/*:~org/eclipse/wst/sse/core/internal/util/*:~org/eclipse/wst/sse/core/internal/validate/*:+org/eclipse/wst/sse/core/text/*:+org/eclipse/wst/sse/core/utils/*:~org/eclipse/wst/sse/internal/contentproperties/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.common.uriresolver/@dot[+org/eclipse/wst/common/uriresolver/internal/*:+org/eclipse/wst/common/uriresolver/internal/provisional/*:+org/eclipse/wst/common/uriresolver/internal/util/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.emf.common_2.3.0.v200703291501.jar[?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/com.ibm.icu_3.6.0.20061215.jar[+com/ibm/icu/lang/*:+com/ibm/icu/math/*:+com/ibm/icu/text/*:+com/ibm/icu/util/*:~com/ibm/icu/impl/*:~com/ibm/icu/impl/data/*:~com/ibm/icu/impl/data/icudt36b/*:~com/ibm/icu/impl/data/icudt36b/brkitr/*:~com/ibm/icu/impl/data/icudt36b/coll/*:~com/ibm/icu/impl/data/icudt36b/rbnf/*:~com/ibm/icu/impl/data/icudt36b/translit/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.validation/@dot[~org/eclipse/wst/validation/internal/*:~org/eclipse/wst/validation/internal/core/*:~org/eclipse/wst/validation/internal/delegates/*:~org/eclipse/wst/validation/internal/operations/*:~org/eclipse/wst/validation/internal/plugin/*:~org/eclipse/wst/validation/internal/provisional/*:~org/eclipse/wst/validation/internal/provisional/core/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.common.frameworks/@dot[?**/*]:/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jem.util/@dot[?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.emf.ecore_2.3.0.v200703291501.jar[?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.emf.ecore.xmi_2.3.0.v200703291501.jar[?**/*]:/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.common.environment/@dot[?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.osgi.util_3.1.100.v20060918.jar[?**/*]:/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.common.project.facet.core/@dot[+org/eclipse/wst/common/project/facet/core/*:+org/eclipse/wst/common/project/facet/core/events/*:~org/eclipse/wst/common/project/facet/core/internal/*:~org/eclipse/wst/common/project/facet/core/internal/util/*:+org/eclipse/wst/common/project/facet/core/runtime/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.html.ui/@dot[~org/eclipse/wst/html/internal/validation/*:+org/eclipse/wst/html/ui/*:~org/eclipse/wst/html/ui/internal/*:~org/eclipse/wst/html/ui/internal/autoedit/*:~org/eclipse/wst/html/ui/internal/contentassist/*:~org/eclipse/wst/html/ui/internal/contentoutline/*:~org/eclipse/wst/html/ui/internal/contentproperties/ui/*:~org/eclipse/wst/html/ui/internal/correction/*:~org/eclipse/wst/html/ui/internal/derived/*:~org/eclipse/wst/html/ui/internal/edit/ui/*:~org/eclipse/wst/html/ui/internal/editor/*:~org/eclipse/wst/html/ui/internal/preferences/*:~org/eclipse/wst/html/ui/internal/preferences/ui/*:~org/eclipse/wst/html/ui/internal/projection/*:~org/eclipse/wst/html/ui/internal/registry/*:~org/eclipse/wst/html/ui/internal/search/*:~org/eclipse/wst/html/ui/internal/style/*:~org/eclipse/wst/html/ui/internal/taginfo/*:~org/eclipse/wst/html/ui/internal/templates/*:~org/eclipse/wst/html/ui/internal/text/*:~org/eclipse/wst/html/ui/internal/wizard/*:+org/eclipse/wst/html/ui/views/contentoutline/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.ui/@dot[+org/eclipse/wst/xml/ui/*:~org/eclipse/wst/xml/ui/internal/*:~org/eclipse/wst/xml/ui/internal/actions/*:~org/eclipse/wst/xml/ui/internal/autoedit/*:~org/eclipse/wst/xml/ui/internal/catalog/*:~org/eclipse/wst/xml/ui/internal/catalog/icons/etool50/*:~org/eclipse/wst/xml/ui/internal/catalog/icons/obj16/*:~org/eclipse/wst/xml/ui/internal/catalog/icons/ovr16/*:~org/eclipse/wst/xml/ui/internal/contentassist/*:~org/eclipse/wst/xml/ui/internal/contentoutline/*:~org/eclipse/wst/xml/ui/internal/correction/*:~org/eclipse/wst/xml/ui/internal/dialogs/*:~org/eclipse/wst/xml/ui/internal/dnd/*:~org/eclipse/wst/xml/ui/internal/doubleclick/*:~org/eclipse/wst/xml/ui/internal/editor/*:~org/eclipse/wst/xml/ui/internal/hyperlink/*:~org/eclipse/wst/xml/ui/internal/nsedit/*:~org/eclipse/wst/xml/ui/internal/preferences/*:~org/eclipse/wst/xml/ui/internal/projection/*:~org/eclipse/wst/xml/ui/internal/properties/*:~org/eclipse/wst/xml/ui/internal/provisional/*:~org/eclipse/wst/xml/ui/internal/registry/*:~org/eclipse/wst/xml/ui/internal/search/*:~org/eclipse/wst/xml/ui/internal/selection/*:~org/eclipse/wst/xml/ui/internal/style/*:~org/eclipse/wst/xml/ui/internal/tabletree/*:~org/eclipse/wst/xml/ui/internal/taginfo/*:~org/eclipse/wst/xml/ui/internal/templates/*:~org/eclipse/wst/xml/ui/internal/text/*:~org/eclipse/wst/xml/ui/internal/util/*:~org/eclipse/wst/xml/ui/internal/validation/*:~org/eclipse/wst/xml/ui/internal/validation/core/errorinfo/*:~org/eclipse/wst/xml/ui/internal/wizards/*:+org/eclipse/wst/xml/ui/views/contentoutline/*:+org/eclipse/wst/xml/ui/views/properties/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot[~org/eclipse/wst/xml/core/internal/*:~org/eclipse/wst/xml/core/internal/catalog/*:~org/eclipse/wst/xml/core/internal/catalog/provisional/*:~org/eclipse/wst/xml/core/internal/cleanup/*:~org/eclipse/wst/xml/core/internal/commentelement/*:~org/eclipse/wst/xml/core/internal/commentelement/impl/*:~org/eclipse/wst/xml/core/internal/commentelement/util/*:~org/eclipse/wst/xml/core/internal/contentmodel/*:~org/eclipse/wst/xml/core/internal/contentmodel/annotation/*:~org/eclipse/wst/xml/core/internal/contentmodel/basic/*:~org/eclipse/wst/xml/core/internal/contentmodel/factory/*:~org/eclipse/wst/xml/core/internal/contentmodel/internal/annotation/*:~org/eclipse/wst/xml/core/internal/contentmodel/internal/modelqueryimpl/*:~org/eclipse/wst/xml/core/internal/contentmodel/internal/util/*:~org/eclipse/wst/xml/core/internal/contentmodel/modelquery/*:~org/eclipse/wst/xml/core/internal/contentmodel/modelquery/extension/*:~org/eclipse/wst/xml/core/internal/contentmodel/modelqueryimpl/*:~org/eclipse/wst/xml/core/internal/contentmodel/util/*:~org/eclipse/wst/xml/core/internal/contenttype/*:~org/eclipse/wst/xml/core/internal/document/*:~org/eclipse/wst/xml/core/internal/emf2xml/*:~org/eclipse/wst/xml/core/internal/encoding/*:~org/eclipse/wst/xml/core/internal/modelhandler/*:~org/eclipse/wst/xml/core/internal/modelquery/*:~org/eclipse/wst/xml/core/internal/parser/*:~org/eclipse/wst/xml/core/internal/parser/regions/*:~org/eclipse/wst/xml/core/internal/preferences/*:~org/eclipse/wst/xml/core/internal/propagate/*:~org/eclipse/wst/xml/core/internal/provisional/*:~org/eclipse/wst/xml/core/internal/provisional/contentmodel/*:~org/eclipse/wst/xml/core/internal/provisional/contenttype/*:~org/eclipse/wst/xml/core/internal/provisional/document/*:~org/eclipse/wst/xml/core/internal/provisional/format/*:~org/eclipse/wst/xml/core/internal/provisional/text/*:~org/eclipse/wst/xml/core/internal/regions/*:~org/eclipse/wst/xml/core/internal/search/*:~org/eclipse/wst/xml/core/internal/search/impl/*:~org/eclipse/wst/xml/core/internal/search/matching/*:~org/eclipse/wst/xml/core/internal/search/quickscan/*:~org/eclipse/wst/xml/core/internal/ssemodelquery/*:~org/eclipse/wst/xml/core/internal/tasks/*:~org/eclipse/wst/xml/core/internal/text/*:~org/eclipse/wst/xml/core/internal/text/rules/*:~org/eclipse/wst/xml/core/internal/validate/*:~org/eclipse/wst/xml/core/internal/validation/*:~org/eclipse/wst/xml/core/internal/validation/core/*:~org/eclipse/wst/xml/core/internal/validation/core/logging/*:~org/eclipse/wst/xml/core/internal/validation/eclipse/*:~org/eclipse/wst/xml/core/internal/validation/errorcustomization/*:+org/eclipse/wst/xml/core/text/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.apache.xerces_2.8.0.v200702082200.jar[+META-INF/services/*:+org/apache/html/dom/*:+org/apache/wml/*:+org/apache/wml/dom/*:+org/apache/xerces/dom/*:+org/apache/xerces/dom/events/*:+org/apache/xerces/dom3/as/*:+org/apache/xerces/impl/*:+org/apache/xerces/impl/dtd/*:+org/apache/xerces/impl/dtd/models/*:+org/apache/xerces/impl/dv/*:+org/apache/xerces/impl/dv/dtd/*:+org/apache/xerces/impl/dv/util/*:+org/apache/xerces/impl/dv/xs/*:+org/apache/xerces/impl/io/*:+org/apache/xerces/impl/msg/*:+org/apache/xerces/impl/validation/*:+org/apache/xerces/impl/xpath/*:+org/apache/xerces/impl/xpath/regex/*:+org/apache/xerces/impl/xs/*:+org/apache/xerces/impl/xs/identity/*:+org/apache/xerces/impl/xs/models/*:+org/apache/xerces/impl/xs/opti/*:+org/apache/xerces/impl/xs/traversers/*:+org/apache/xerces/impl/xs/util/*:+org/apache/xerces/jaxp/*:+org/apache/xerces/jaxp/datatype/*:+org/apache/xerces/jaxp/validation/*:+org/apache/xerces/parsers/*:+org/apache/xerces/util/*:+org/apache/xerces/xinclude/*:+org/apache/xerces/xni/*:+org/apache/xerces/xni/grammars/*:+org/apache/xerces/xni/parser/*:+org/apache/xerces/xpointer/*:+org/apache/xerces/xs/*:+org/apache/xerces/xs/datatypes/*:+org/apache/xml/serialize/*:+org/w3c/dom/html/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.w3c.dom_1.3.3.v200702082200.jar[+javax/xml/*:+javax/xml/datatype/*:+javax/xml/namespace/*:+javax/xml/parsers/*:+javax/xml/transform/*:+javax/xml/transform/dom/*:+javax/xml/transform/sax/*:+javax/xml/transform/stream/*:+javax/xml/validation/*:+javax/xml/xpath/*:+license/*:+org/apache/xmlcommons/*:+org/w3c/dom/*:+org/w3c/dom/bootstrap/*:+org/w3c/dom/css/*:+org/w3c/dom/events/*:+org/w3c/dom/html/*:+org/w3c/dom/ls/*:+org/w3c/dom/ranges/*:+org/w3c/dom/stylesheets/*:+org/w3c/dom/traversal/*:+org/w3c/dom/views/*:+org/w3c/dom/xpath/*:+org/xml/sax/*:+org/xml/sax/ext/*:+org/xml/sax/helpers/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.apache.xml.resolver_1.1.0.v200702082200.jar[+org/apache/env/*:+org/apache/xml/resolver/*:+org/apache/xml/resolver/apps/*:+org/apache/xml/resolver/etc/*:+org/apache/xml/resolver/helpers/*:+org/apache/xml/resolver/readers/*:+org/apache/xml/resolver/tools/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.emf.ecore.edit_2.3.0.v200703291501.jar[?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.emf.edit_2.3.0.v200703291501.jar[?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.emf.ecore.change_2.3.0.v200703291501.jar[?**/*]:/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.common.emf/@dot[?**/*]:/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.common.emfworkbench.integration/@dot[?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.xsd_2.3.0.v200703291501.jar[?**/*]:/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.common.core/@dot[?**/*]:/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.common.ui/@dot[?**/*]:/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.ui/@dot[+org/eclipse/wst/css/ui/*:~org/eclipse/wst/css/ui/internal/*:~org/eclipse/wst/css/ui/internal/autoedit/*:~org/eclipse/wst/css/ui/internal/contentassist/*:~org/eclipse/wst/css/ui/internal/contentoutline/*:~org/eclipse/wst/css/ui/internal/contentproperties/*:~org/eclipse/wst/css/ui/internal/contentproperties/ui/*:~org/eclipse/wst/css/ui/internal/edit/ui/*:~org/eclipse/wst/css/ui/internal/editor/*:~org/eclipse/wst/css/ui/internal/image/*:~org/eclipse/wst/css/ui/internal/preferences/*:~org/eclipse/wst/css/ui/internal/preferences/ui/*:~org/eclipse/wst/css/ui/internal/projection/*:~org/eclipse/wst/css/ui/internal/properties/*:~org/eclipse/wst/css/ui/internal/registry/*:~org/eclipse/wst/css/ui/internal/selection/*:~org/eclipse/wst/css/ui/internal/style/*:~org/eclipse/wst/css/ui/internal/templates/*:~org/eclipse/wst/css/ui/internal/text/*:~org/eclipse/wst/css/ui/internal/wizard/*:+org/eclipse/wst/css/ui/views/contentoutline/*:+org/eclipse/wst/css/ui/views/properties/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.core/@dot[~org/eclipse/wst/css/core/internal/*:~org/eclipse/wst/css/core/internal/cleanup/*:~org/eclipse/wst/css/core/internal/contentmodel/*:~org/eclipse/wst/css/core/internal/contentproperties/*:~org/eclipse/wst/css/core/internal/contenttype/*:~org/eclipse/wst/css/core/internal/document/*:~org/eclipse/wst/css/core/internal/encoding/*:~org/eclipse/wst/css/core/internal/event/*:~org/eclipse/wst/css/core/internal/eventimpl/*:~org/eclipse/wst/css/core/internal/format/*:~org/eclipse/wst/css/core/internal/formatter/*:~org/eclipse/wst/css/core/internal/metamodel/*:~org/eclipse/wst/css/core/internal/metamodel/util/*:~org/eclipse/wst/css/core/internal/metamodelimpl/*:~org/eclipse/wst/css/core/internal/modelhandler/*:~org/eclipse/wst/css/core/internal/parser/*:~org/eclipse/wst/css/core/internal/parser/regions/*:~org/eclipse/wst/css/core/internal/parserz/*:~org/eclipse/wst/css/core/internal/preferences/*:~org/eclipse/wst/css/core/internal/provisional/adapters/*:~org/eclipse/wst/css/core/internal/provisional/contenttype/*:~org/eclipse/wst/css/core/internal/provisional/document/*:~org/eclipse/wst/css/core/internal/provisional/preferences/*:~org/eclipse/wst/css/core/internal/provisional/text/*:~org/eclipse/wst/css/core/internal/tasks/*:~org/eclipse/wst/css/core/internal/text/*:~org/eclipse/wst/css/core/internal/util/*:~org/eclipse/wst/css/core/internal/util/declaration/*:+org/eclipse/wst/css/core/text/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.html.core/@dot[~org/eclipse/wst/html/core/internal/*:~org/eclipse/wst/html/core/internal/cleanup/*:~org/eclipse/wst/html/core/internal/commentelement/handlers/*:~org/eclipse/wst/html/core/internal/contentmodel/*:~org/eclipse/wst/html/core/internal/contentmodel/chtml/*:~org/eclipse/wst/html/core/internal/contentmodel/ssi/*:~org/eclipse/wst/html/core/internal/contentproperties/*:~org/eclipse/wst/html/core/internal/contenttype/*:~org/eclipse/wst/html/core/internal/document/*:~org/eclipse/wst/html/core/internal/encoding/*:~org/eclipse/wst/html/core/internal/format/*:~org/eclipse/wst/html/core/internal/htmlcss/*:~org/eclipse/wst/html/core/internal/modelhandler/*:~org/eclipse/wst/html/core/internal/modelquery/*:~org/eclipse/wst/html/core/internal/preferences/*:~org/eclipse/wst/html/core/internal/provisional/*:~org/eclipse/wst/html/core/internal/provisional/contenttype/*:~org/eclipse/wst/html/core/internal/provisional/text/*:~org/eclipse/wst/html/core/internal/text/*:~org/eclipse/wst/html/core/internal/validate/*:+org/eclipse/wst/html/core/text/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.common.modulecore/@dot[+org/eclipse/wst/common/componentcore/*:+org/eclipse/wst/common/componentcore/datamodel/*:+org/eclipse/wst/common/componentcore/datamodel/properties/*:~org/eclipse/wst/common/componentcore/internal/*:~org/eclipse/wst/common/componentcore/internal/builder/*:~org/eclipse/wst/common/componentcore/internal/impl/*:~org/eclipse/wst/common/componentcore/internal/operation/*:~org/eclipse/wst/common/componentcore/internal/resources/*:~org/eclipse/wst/common/componentcore/internal/util/*:+org/eclipse/wst/common/componentcore/resources/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.javascript.ui/@dot[~org/eclipse/wst/javascript/ui/internal/actions/*:~org/eclipse/wst/javascript/ui/internal/common/*:~org/eclipse/wst/javascript/ui/internal/common/autoedit/*:~org/eclipse/wst/javascript/ui/internal/common/contentassist/*:~org/eclipse/wst/javascript/ui/internal/common/contentassist/fcs/js1/*:~org/eclipse/wst/javascript/ui/internal/common/contentassist/javadoc/*:~org/eclipse/wst/javascript/ui/internal/common/preferences/*:~org/eclipse/wst/javascript/ui/internal/common/preferences/ui/*:~org/eclipse/wst/javascript/ui/internal/common/style/*:~org/eclipse/wst/javascript/ui/internal/common/taginfo/*:~org/eclipse/wst/javascript/ui/internal/editor/*:~org/eclipse/wst/javascript/ui/internal/views/contentoutline/*:~org/eclipse/wst/javascript/ui/internal/wizard/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.javascript.core/@dot[?**/*]:/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.core/@dot[+org/eclipse/jst/jsp/core/internal/*:+org/eclipse/jst/jsp/core/internal/contentmodel/*:+org/eclipse/jst/jsp/core/internal/contentmodel/tld/*:+org/eclipse/jst/jsp/core/internal/contentmodel/tld/provisional/*:+org/eclipse/jst/jsp/core/internal/contentproperties/*:+org/eclipse/jst/jsp/core/internal/contenttype/*:+org/eclipse/jst/jsp/core/internal/document/*:+org/eclipse/jst/jsp/core/internal/domdocument/*:+org/eclipse/jst/jsp/core/internal/encoding/*:+org/eclipse/jst/jsp/core/internal/java/*:+org/eclipse/jst/jsp/core/internal/java/jspel/*:+org/eclipse/jst/jsp/core/internal/java/search/*:+org/eclipse/jst/jsp/core/internal/modelhandler/*:+org/eclipse/jst/jsp/core/internal/modelquery/*:+org/eclipse/jst/jsp/core/internal/parser/*:+org/eclipse/jst/jsp/core/internal/parser/internal/*:+org/eclipse/jst/jsp/core/internal/preferences/*:+org/eclipse/jst/jsp/core/internal/provisional/*:+org/eclipse/jst/jsp/core/internal/provisional/contenttype/*:+org/eclipse/jst/jsp/core/internal/provisional/text/*:+org/eclipse/jst/jsp/core/internal/regions/*:+org/eclipse/jst/jsp/core/internal/taglib/*:+org/eclipse/jst/jsp/core/internal/tasks/*:+org/eclipse/jst/jsp/core/internal/text/*:+org/eclipse/jst/jsp/core/internal/util/*:+org/eclipse/jst/jsp/core/internal/validation/*:+org/eclipse/jst/jsp/core/jspel/*:+org/eclipse/jst/jsp/core/taglib/*:+org/eclipse/jst/jsp/core/text/*:~org/eclipse/jst/jsp/css/core/internal/contentmodel/*:~org/eclipse/jst/jsp/css/core/internal/contenttype/*:~org/eclipse/jst/jsp/css/core/internal/document/*:~org/eclipse/jst/jsp/css/core/internal/encoding/*:+org/eclipse/jst/jsp/css/core/internal/modelhandler/*:~org/eclipse/jst/jsp/css/core/internal/parser/*:~org/eclipse/jst/jsp/css/core/internal/parserz/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.jdt.core_3.3.0.v_745.jar[+org/eclipse/jdt/core/*:+org/eclipse/jdt/core/compiler/*:+org/eclipse/jdt/core/dom/*:+org/eclipse/jdt/core/dom/rewrite/*:+org/eclipse/jdt/core/eval/*:+org/eclipse/jdt/core/formatter/*:+org/eclipse/jdt/core/jdom/*:+org/eclipse/jdt/core/search/*:+org/eclipse/jdt/core/util/*:~org/eclipse/jdt/internal/codeassist/*:~org/eclipse/jdt/internal/codeassist/complete/*:~org/eclipse/jdt/internal/codeassist/impl/*:~org/eclipse/jdt/internal/codeassist/select/*:~org/eclipse/jdt/internal/compiler/*:~org/eclipse/jdt/internal/compiler/ast/*:~org/eclipse/jdt/internal/compiler/batch/*:~org/eclipse/jdt/internal/compiler/classfmt/*:~org/eclipse/jdt/internal/compiler/codegen/*:~org/eclipse/jdt/internal/compiler/env/*:~org/eclipse/jdt/internal/compiler/flow/*:~org/eclipse/jdt/internal/compiler/impl/*:~org/eclipse/jdt/internal/compiler/lookup/*:~org/eclipse/jdt/internal/compiler/parser/*:~org/eclipse/jdt/internal/compiler/parser/diagnose/*:~org/eclipse/jdt/internal/compiler/problem/*:~org/eclipse/jdt/internal/compiler/util/*:~org/eclipse/jdt/internal/core/*:~org/eclipse/jdt/internal/core/builder/*:~org/eclipse/jdt/internal/core/dom/rewrite/*:~org/eclipse/jdt/internal/core/eval/*:~org/eclipse/jdt/internal/core/hierarchy/*:~org/eclipse/jdt/internal/core/index/*:~org/eclipse/jdt/internal/core/jdom/*:~org/eclipse/jdt/internal/core/search/*:~org/eclipse/jdt/internal/core/search/indexing/*:~org/eclipse/jdt/internal/core/search/matching/*:~org/eclipse/jdt/internal/core/search/processing/*:~org/eclipse/jdt/internal/core/util/*:~org/eclipse/jdt/internal/eval/*:~org/eclipse/jdt/internal/formatter/*:~org/eclipse/jdt/internal/formatter/align/*:~org/eclipse/jdt/internal/formatter/comment/*:~org/eclipse/jdt/internal/formatter/old/*:+META-INF/services/*:+org/eclipse/jdt/internal/compiler/tool/*:~org/eclipse/jdt/internal/compiler/apt/dispatch/*:~org/eclipse/jdt/internal/compiler/apt/model/*:~org/eclipse/jdt/internal/compiler/apt/util/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.jdt.compiler.tool_1.0.0.v20070318-1300.jar[+org/eclipse/jdt/core/*:+org/eclipse/jdt/core/compiler/*:+org/eclipse/jdt/core/dom/*:+org/eclipse/jdt/core/dom/rewrite/*:+org/eclipse/jdt/core/eval/*:+org/eclipse/jdt/core/formatter/*:+org/eclipse/jdt/core/jdom/*:+org/eclipse/jdt/core/search/*:+org/eclipse/jdt/core/util/*:~org/eclipse/jdt/internal/codeassist/*:~org/eclipse/jdt/internal/codeassist/complete/*:~org/eclipse/jdt/internal/codeassist/impl/*:~org/eclipse/jdt/internal/codeassist/select/*:~org/eclipse/jdt/internal/compiler/*:~org/eclipse/jdt/internal/compiler/ast/*:~org/eclipse/jdt/internal/compiler/batch/*:~org/eclipse/jdt/internal/compiler/classfmt/*:~org/eclipse/jdt/internal/compiler/codegen/*:~org/eclipse/jdt/internal/compiler/env/*:~org/eclipse/jdt/internal/compiler/flow/*:~org/eclipse/jdt/internal/compiler/impl/*:~org/eclipse/jdt/internal/compiler/lookup/*:~org/eclipse/jdt/internal/compiler/parser/*:~org/eclipse/jdt/internal/compiler/parser/diagnose/*:~org/eclipse/jdt/internal/compiler/problem/*:~org/eclipse/jdt/internal/compiler/util/*:~org/eclipse/jdt/internal/core/*:~org/eclipse/jdt/internal/core/builder/*:~org/eclipse/jdt/internal/core/dom/rewrite/*:~org/eclipse/jdt/internal/core/eval/*:~org/eclipse/jdt/internal/core/hierarchy/*:~org/eclipse/jdt/internal/core/index/*:~org/eclipse/jdt/internal/core/jdom/*:~org/eclipse/jdt/internal/core/search/*:~org/eclipse/jdt/internal/core/search/indexing/*:~org/eclipse/jdt/internal/core/search/matching/*:~org/eclipse/jdt/internal/core/search/processing/*:~org/eclipse/jdt/internal/core/util/*:~org/eclipse/jdt/internal/eval/*:~org/eclipse/jdt/internal/formatter/*:~org/eclipse/jdt/internal/formatter/align/*:~org/eclipse/jdt/internal/formatter/comment/*:~org/eclipse/jdt/internal/formatter/old/*:+META-INF/services/*:+org/eclipse/jdt/internal/compiler/tool/*:~org/eclipse/jdt/internal/compiler/apt/dispatch/*:~org/eclipse/jdt/internal/compiler/apt/model/*:~org/eclipse/jdt/internal/compiler/apt/util/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.jdt.compiler.apt_1.0.0.v20070318-2030.jar[+org/eclipse/jdt/core/*:+org/eclipse/jdt/core/compiler/*:+org/eclipse/jdt/core/dom/*:+org/eclipse/jdt/core/dom/rewrite/*:+org/eclipse/jdt/core/eval/*:+org/eclipse/jdt/core/formatter/*:+org/eclipse/jdt/core/jdom/*:+org/eclipse/jdt/core/search/*:+org/eclipse/jdt/core/util/*:~org/eclipse/jdt/internal/codeassist/*:~org/eclipse/jdt/internal/codeassist/complete/*:~org/eclipse/jdt/internal/codeassist/impl/*:~org/eclipse/jdt/internal/codeassist/select/*:~org/eclipse/jdt/internal/compiler/*:~org/eclipse/jdt/internal/compiler/ast/*:~org/eclipse/jdt/internal/compiler/batch/*:~org/eclipse/jdt/internal/compiler/classfmt/*:~org/eclipse/jdt/internal/compiler/codegen/*:~org/eclipse/jdt/internal/compiler/env/*:~org/eclipse/jdt/internal/compiler/flow/*:~org/eclipse/jdt/internal/compiler/impl/*:~org/eclipse/jdt/internal/compiler/lookup/*:~org/eclipse/jdt/internal/compiler/parser/*:~org/eclipse/jdt/internal/compiler/parser/diagnose/*:~org/eclipse/jdt/internal/compiler/problem/*:~org/eclipse/jdt/internal/compiler/util/*:~org/eclipse/jdt/internal/core/*:~org/eclipse/jdt/internal/core/builder/*:~org/eclipse/jdt/internal/core/dom/rewrite/*:~org/eclipse/jdt/internal/core/eval/*:~org/eclipse/jdt/internal/core/hierarchy/*:~org/eclipse/jdt/internal/core/index/*:~org/eclipse/jdt/internal/core/jdom/*:~org/eclipse/jdt/internal/core/search/*:~org/eclipse/jdt/internal/core/search/indexing/*:~org/eclipse/jdt/internal/core/search/matching/*:~org/eclipse/jdt/internal/core/search/processing/*:~org/eclipse/jdt/internal/core/util/*:~org/eclipse/jdt/internal/eval/*:~org/eclipse/jdt/internal/formatter/*:~org/eclipse/jdt/internal/formatter/align/*:~org/eclipse/jdt/internal/formatter/comment/*:~org/eclipse/jdt/internal/formatter/old/*:+META-INF/services/*:+org/eclipse/jdt/internal/compiler/tool/*:~org/eclipse/jdt/internal/compiler/apt/dispatch/*:~org/eclipse/jdt/internal/compiler/apt/model/*:~org/eclipse/jdt/internal/compiler/apt/util/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.team.core_3.2.100.I200703211300.jar[?**/*]:/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/javax.servlet.jsp_2.0.0.v200612120446.jar[?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.jdt.ui_3.3.0.v20070321-1800.jar[~org/eclipse/jdt/internal/corext/*:~org/eclipse/jdt/internal/corext/buildpath/*:~org/eclipse/jdt/internal/corext/callhierarchy/*:~org/eclipse/jdt/internal/corext/codemanipulation/*:~org/eclipse/jdt/internal/corext/dom/*:~org/eclipse/jdt/internal/corext/dom/fragments/*:~org/eclipse/jdt/internal/corext/fix/*:~org/eclipse/jdt/internal/corext/javadoc/*:~org/eclipse/jdt/internal/corext/refactoring/*:~org/eclipse/jdt/internal/corext/refactoring/base/*:~org/eclipse/jdt/internal/corext/refactoring/binary/*:~org/eclipse/jdt/internal/corext/refactoring/changes/*:~org/eclipse/jdt/internal/corext/refactoring/code/*:~org/eclipse/jdt/internal/corext/refactoring/code/flow/*:~org/eclipse/jdt/internal/corext/refactoring/delegates/*:~org/eclipse/jdt/internal/corext/refactoring/generics/*:~org/eclipse/jdt/internal/corext/refactoring/nls/*:~org/eclipse/jdt/internal/corext/refactoring/nls/changes/*:~org/eclipse/jdt/internal/corext/refactoring/participants/*:~org/eclipse/jdt/internal/corext/refactoring/rename/*:~org/eclipse/jdt/internal/corext/refactoring/reorg/*:~org/eclipse/jdt/internal/corext/refactoring/scripting/*:~org/eclipse/jdt/internal/corext/refactoring/sef/*:~org/eclipse/jdt/internal/corext/refactoring/structure/*:~org/eclipse/jdt/internal/corext/refactoring/structure/constraints/*:~org/eclipse/jdt/internal/corext/refactoring/surround/*:~org/eclipse/jdt/internal/corext/refactoring/tagging/*:~org/eclipse/jdt/internal/corext/refactoring/typeconstraints/*:~org/eclipse/jdt/internal/corext/refactoring/typeconstraints/types/*:~org/eclipse/jdt/internal/corext/refactoring/typeconstraints/typesets/*:~org/eclipse/jdt/internal/corext/refactoring/typeconstraints2/*:~org/eclipse/jdt/internal/corext/refactoring/util/*:~org/eclipse/jdt/internal/corext/template/java/*:~org/eclipse/jdt/internal/corext/util/*:~org/eclipse/jdt/internal/ui/*:~org/eclipse/jdt/internal/ui/actions/*:~org/eclipse/jdt/internal/ui/browsing/*:~org/eclipse/jdt/internal/ui/callhierarchy/*:~org/eclipse/jdt/internal/ui/commands/*:~org/eclipse/jdt/internal/ui/compare/*:~org/eclipse/jdt/internal/ui/dialogs/*:~org/eclipse/jdt/internal/ui/dnd/*:~org/eclipse/jdt/internal/ui/filters/*:~org/eclipse/jdt/internal/ui/fix/*:~org/eclipse/jdt/internal/ui/infoviews/*:~org/eclipse/jdt/internal/ui/jarimport/*:~org/eclipse/jdt/internal/ui/jarpackager/*:~org/eclipse/jdt/internal/ui/javadocexport/*:~org/eclipse/jdt/internal/ui/javaeditor/*:~org/eclipse/jdt/internal/ui/javaeditor/saveparticipant/*:~org/eclipse/jdt/internal/ui/javaeditor/selectionactions/*:~org/eclipse/jdt/internal/ui/model/*:~org/eclipse/jdt/internal/ui/navigator/*:~org/eclipse/jdt/internal/ui/packageview/*:~org/eclipse/jdt/internal/ui/preferences/*:~org/eclipse/jdt/internal/ui/preferences/cleanup/*:~org/eclipse/jdt/internal/ui/preferences/formatter/*:~org/eclipse/jdt/internal/ui/propertiesfileeditor/*:~org/eclipse/jdt/internal/ui/refactoring/*:~org/eclipse/jdt/internal/ui/refactoring/actions/*:~org/eclipse/jdt/internal/ui/refactoring/binary/*:~org/eclipse/jdt/internal/ui/refactoring/code/*:~org/eclipse/jdt/internal/ui/refactoring/contentassist/*:~org/eclipse/jdt/internal/ui/refactoring/nls/*:~org/eclipse/jdt/internal/ui/refactoring/nls/search/*:~org/eclipse/jdt/internal/ui/refactoring/reorg/*:~org/eclipse/jdt/internal/ui/refactoring/sef/*:~org/eclipse/jdt/internal/ui/search/*:~org/eclipse/jdt/internal/ui/text/*:~org/eclipse/jdt/internal/ui/text/comment/*:~org/eclipse/jdt/internal/ui/text/correction/*:~org/eclipse/jdt/internal/ui/text/folding/*:~org/eclipse/jdt/internal/ui/text/java/*:~org/eclipse/jdt/internal/ui/text/java/hover/*:~org/eclipse/jdt/internal/ui/text/javadoc/*:~org/eclipse/jdt/internal/ui/text/spelling/*:~org/eclipse/jdt/internal/ui/text/spelling/engine/*:~org/eclipse/jdt/internal/ui/text/template/contentassist/*:~org/eclipse/jdt/internal/ui/text/template/preferences/*:~org/eclipse/jdt/internal/ui/typehierarchy/*:~org/eclipse/jdt/internal/ui/util/*:~org/eclipse/jdt/internal/ui/viewsupport/*:~org/eclipse/jdt/internal/ui/wizards/*:~org/eclipse/jdt/internal/ui/wizards/buildpaths/*:~org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/*:~org/eclipse/jdt/internal/ui/wizards/dialogfields/*:~org/eclipse/jdt/internal/ui/workingsets/*:+org/eclipse/jdt/ui/*:+org/eclipse/jdt/ui/actions/*:+org/eclipse/jdt/ui/dialogs/*:+org/eclipse/jdt/ui/jarpackager/*:+org/eclipse/jdt/ui/refactoring/*:+org/eclipse/jdt/ui/search/*:+org/eclipse/jdt/ui/text/*:+org/eclipse/jdt/ui/text/folding/*:+org/eclipse/jdt/ui/text/java/*:+org/eclipse/jdt/ui/text/java/hover/*:+org/eclipse/jdt/ui/wizards/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.jdt.launching_3.2.100.v20070321.jar[?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.jdt.debug_3.2.100.v20070323/jdi.jar[+com/sun/jdi/*:+com/sun/jdi/connect/*:+com/sun/jdi/connect/spi/*:+com/sun/jdi/event/*:+com/sun/jdi/request/*:+org/eclipse/jdi/*:+org/eclipse/jdi/hcr/*:~org/eclipse/jdi/internal/*:~org/eclipse/jdi/internal/connect/*:~org/eclipse/jdi/internal/event/*:~org/eclipse/jdi/internal/jdwp/*:~org/eclipse/jdi/internal/request/*:~org/eclipse/jdi/internal/spy/*:+org/eclipse/jdt/debug/core/*:+org/eclipse/jdt/debug/eval/*:~org/eclipse/jdt/internal/debug/core/*:~org/eclipse/jdt/internal/debug/core/breakpoints/*:~org/eclipse/jdt/internal/debug/core/hcr/*:~org/eclipse/jdt/internal/debug/core/logicalstructures/*:~org/eclipse/jdt/internal/debug/core/model/*:~org/eclipse/jdt/internal/debug/eval/*:~org/eclipse/jdt/internal/debug/eval/ast/engine/*:~org/eclipse/jdt/internal/debug/eval/ast/instructions/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.jdt.debug_3.2.100.v20070323/jdimodel.jar[+com/sun/jdi/*:+com/sun/jdi/connect/*:+com/sun/jdi/connect/spi/*:+com/sun/jdi/event/*:+com/sun/jdi/request/*:+org/eclipse/jdi/*:+org/eclipse/jdi/hcr/*:~org/eclipse/jdi/internal/*:~org/eclipse/jdi/internal/connect/*:~org/eclipse/jdi/internal/event/*:~org/eclipse/jdi/internal/jdwp/*:~org/eclipse/jdi/internal/request/*:~org/eclipse/jdi/internal/spy/*:+org/eclipse/jdt/debug/core/*:+org/eclipse/jdt/debug/eval/*:~org/eclipse/jdt/internal/debug/core/*:~org/eclipse/jdt/internal/debug/core/breakpoints/*:~org/eclipse/jdt/internal/debug/core/hcr/*:~org/eclipse/jdt/internal/debug/core/logicalstructures/*:~org/eclipse/jdt/internal/debug/core/model/*:~org/eclipse/jdt/internal/debug/eval/*:~org/eclipse/jdt/internal/debug/eval/ast/engine/*:~org/eclipse/jdt/internal/debug/eval/ast/instructions/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.compare_3.3.0.I200703211300.jar[?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.team.ui_3.3.0.I200703211300.jar[?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.ui.navigator_3.2.100.I20070319-1300.jar[?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.ui.navigator.resources_3.2.100.I20070319-0010.jar[?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.ui.views.properties.tabbed_3.2.100.I20061213-1608.jar[?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.ltk.core.refactoring_3.3.0.v20070319-1800.jar[+org/eclipse/ltk/core/refactoring/*:+org/eclipse/ltk/core/refactoring/history/*:+org/eclipse/ltk/core/refactoring/model/*:+org/eclipse/ltk/core/refactoring/participants/*:~org/eclipse/ltk/internal/core/refactoring/*:~org/eclipse/ltk/internal/core/refactoring/history/*:?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.ltk.ui.refactoring_3.3.0.v20070319-1800.jar[?**/*]:/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.jdt.core.manipulation_1.1.0.v20070319-1800.jar[?**/*]:/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src" />
-        <argument value="-d" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/temp.folder/@dot.bin" />
-        <argument value="-verbose" />
-        <argument value="-proceedOnError" />
-        <argument value="-showversion" />
-        <argument value="-encoding" />
-        <argument value="ISO-8859-1" />
-        <argument value="-warn:-serial,raw,typeHiding,unchecked" />
-        <argument value="-log" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/temp.folder/@dot.bin.xml" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/css/ui/internal/properties/JSPedCSSPropertySource.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/css/ui/internal/registry/AdapterFactoryProviderJSPedCSS.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/css/ui/internal/views/properties/JSPedCSSPropertySheetConfiguration.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/StructuredTextViewerConfigurationJSP.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/IActionConstantsJSP.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/IActionDefinitionIdsJSP.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/JSPUIMessages.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/JSPUIPlugin.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/Logger.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/autoedit/AutoEditStrategyForTabs.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/autoedit/StructuredAutoEditStrategyJSP.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/breakpointproviders/AbstractBreakpointProvider.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/breakpointproviders/JavaBreakpointProvider.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/breakpointproviders/JavaScriptBreakpointProvider.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/breakpointproviders/JavaStratumBreakpointProvider.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/breakpointproviders/JavascriptLineBreakpoint.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/AutoImportProposal.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/BeanInfoProvider.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/CustomTemplateProposal.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/IBeanInfoProvider.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/IJavaPropertyDescriptor.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPCompletionProcessor.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPCompletionProposal.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPContentAssistProcessor.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPDummyContentAssistProcessor.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPELCompletionProcessor.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPELContentAssistProcessor.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPELProposalCollector.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPJavaContentAssistProcessor.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPPropertyContentAssistProcessor.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPProposalCollector.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPTaglibDirectiveContentAssistProcessor.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPTemplateCompletionProcessor.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPUseBeanContentAssistProcessor.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JavaParameterListValidator.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JavaTypeCompletionProposal.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JavaTypeFinder.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JavaTypeNameRequestor.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/NoRegionContentAssistProcessorForJSP.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/ReplaceNameTemplateContext.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentproperties/ui/JSPFContentSettingsPropertyPage.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentproperties/ui/ProjectJSPFContentSettingsPropertyPage.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/derived/SingleCharReader.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/editor/ActionContributorJSP.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/editor/IHelpContextIds.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/editor/JSPEditorPluginImageHelper.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/editor/JSPEditorPluginImages.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/editor/JSPSourceEditingTextTools.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/format/FormattingStrategyJSPJava.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/hyperlink/ExternalFileEditorInput.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/hyperlink/ExternalFileHyperlink.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/hyperlink/JSPJavaHyperlink.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/hyperlink/JSPJavaHyperlinkDetector.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/hyperlink/TaglibHyperlinkDetector.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/hyperlink/TaglibJarHyperlink.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/hyperlink/TaglibJarUriHyperlink.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/hyperlink/URLFileHyperlink.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/hyperlink/WorkspaceFileHyperlink.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/java/refactoring/BasicRefactorSearchRequestor.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/java/refactoring/JSPJavaSelectionProvider.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/java/refactoring/JSPMethodRenameChange.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/java/refactoring/JSPMethodRenameParticipant.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/java/refactoring/JSPMethodRenameRequestor.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/java/refactoring/JSPMoveElementActionDelegate.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/java/refactoring/JSPPackageRenameChange.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/java/refactoring/JSPPackageRenameParticipant.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/java/refactoring/JSPPackageRenameRequestor.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/java/refactoring/JSPRenameElementActionDelegate.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/java/refactoring/JSPTypeMoveChange.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/java/refactoring/JSPTypeMoveParticipant.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/java/refactoring/JSPTypeMoveRequestor.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/java/refactoring/JSPTypeRenameChange.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/java/refactoring/JSPTypeRenameParticipant.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/java/refactoring/JSPTypeRenameRequestor.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/java/search/BasicJSPSearchRequestor.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/java/search/JSPFindOccurrencesActionDelegate.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/java/search/JSPFindOccurrencesProcessor.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/java/search/JSPOccurrencesSearchResult.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/java/search/JSPSearchQuery.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/java/search/JSPSearchRequestor.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/java/search/JSPSingleFileSearchRequestor.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/java/search/ui/JSPMatchPresentation.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/java/search/ui/JSPQueryParticipant.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/preferences/JSPUIPreferenceInitializer.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/preferences/JSPUIPreferenceNames.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/preferences/ui/JSPColorPage.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/preferences/ui/JSPFilesPreferencePage.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/preferences/ui/JSPSourcePreferencePage.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/preferences/ui/JSPStyledTextColorPicker.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/preferences/ui/JSPSyntaxColoringPage.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/preferences/ui/JSPTemplatePreferencePage.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/projection/ProjectionAnnotationModelChanges.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/projection/ProjectionModelNodeAdapterFactoryHTML.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/projection/ProjectionModelNodeAdapterFactoryJSP.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/projection/ProjectionModelNodeAdapterHTML.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/projection/ProjectionModelNodeAdapterJSP.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/projection/ProjectionViewerInformation.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/projection/StructuredTextFoldingProviderJSP.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/registry/AdapterFactoryProviderForJSP.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/style/IStyleConstantsJSP.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/style/LineStyleProviderForJSP.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/style/java/IStyleConstantsJSPJava.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/style/java/JavaCodeScanner.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/style/java/JavaColorProvider.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/style/java/JavaWhitespaceDetector.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/style/java/JavaWordDetector.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/style/java/LineStyleProviderForJava.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/style/jspel/IStyleConstantsJSPEL.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/style/jspel/JSPELCodeScanner.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/style/jspel/JSPELColorProvider.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/style/jspel/JSPELWhitespaceDetector.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/style/jspel/JSPELWordDetector.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/style/jspel/LineStyleProviderForJSPEL.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/taginfo/HTMLPrinter.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/taginfo/JSPInformationProvider.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/taginfo/JSPJavaJavadocHoverProcessor.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/taginfo/JSPJavaJavadocInformationProvider.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/taginfo/JSPTagInfoHoverProcessor.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/taginfo/JavaWordFinder.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/templates/EncodingTemplateVariableResolverJSP.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/templates/TemplateContextTypeIdsJSP.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/templates/TemplateContextTypeJSP.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/text/JSPDocumentRegionEdgeMatcher.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/text/JavaCodeReader.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/text/JavaPairMatcher.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/validation/HTMLValidationReporter.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/validation/JSPContentSourceValidator.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/validation/LocalizedMessage.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/wizard/NewJSPFileWizardPage.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/wizard/NewJSPTemplatesWizardPage.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/wizard/NewJSPWizard.java" />
-        <argument
-            value="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/views/contentoutline/JSPContentOutlineConfiguration.java" />
-    </command_line>
-    <options>
-        <option
-            key="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode"
-            value="disabled" />
-        <option
-            key="org.eclipse.jdt.core.compiler.codegen.targetPlatform"
-            value="1.2" />
-        <option
-            key="org.eclipse.jdt.core.compiler.codegen.unusedLocal"
-            value="optimize out" />
-        <option
-            key="org.eclipse.jdt.core.compiler.compliance"
-            value="1.4" />
-        <option
-            key="org.eclipse.jdt.core.compiler.debug.lineNumber"
-            value="generate" />
-        <option
-            key="org.eclipse.jdt.core.compiler.debug.localVariable"
-            value="generate" />
-        <option
-            key="org.eclipse.jdt.core.compiler.debug.sourceFile"
-            value="generate" />
-        <option
-            key="org.eclipse.jdt.core.compiler.doc.comment.support"
-            value="disabled" />
-        <option
-            key="org.eclipse.jdt.core.compiler.generateClassFiles"
-            value="enabled" />
-        <option
-            key="org.eclipse.jdt.core.compiler.maxProblemPerUnit"
-            value="100" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.annotationSuperInterface"
-            value="warning" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.assertIdentifier"
-            value="warning" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.autoboxing"
-            value="ignore" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.deprecation"
-            value="ignore" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode"
-            value="disabled" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod"
-            value="disabled" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.discouragedReference"
-            value="warning" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.emptyStatement"
-            value="ignore" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.enumIdentifier"
-            value="warning" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.fallthroughCase"
-            value="ignore" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.fatalOptionalError"
-            value="enabled" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.fieldHiding"
-            value="ignore" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.finalParameterBound"
-            value="warning" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally"
-            value="warning" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.forbiddenReference"
-            value="warning" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock"
-            value="warning" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod"
-            value="warning" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch"
-            value="ignore" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.indirectStaticAccess"
-            value="ignore" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.invalidJavadoc"
-            value="ignore" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.invalidJavadocTags"
-            value="disabled" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef"
-            value="disabled" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef"
-            value="disabled" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility"
-            value="public" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.localVariableHiding"
-            value="ignore" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.methodWithConstructorName"
-            value="warning" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation"
-            value="ignore" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.missingJavadocComments"
-            value="ignore" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding"
-            value="disabled" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility"
-            value="public" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.missingJavadocTags"
-            value="ignore" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding"
-            value="disabled" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility"
-            value="public" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation"
-            value="ignore" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.missingSerialVersion"
-            value="ignore" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.noEffectAssignment"
-            value="warning" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion"
-            value="warning" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral"
-            value="ignore" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.nullReference"
-            value="ignore" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.overridingMethodWithoutSuperInvocation"
-            value="ignore" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod"
-            value="warning" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.parameterAssignment"
-            value="ignore" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment"
-            value="ignore" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.rawTypeReference"
-            value="ignore" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.specialParameterHidingField"
-            value="disabled" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.staticAccessReceiver"
-            value="warning" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.suppressWarnings"
-            value="enabled" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation"
-            value="ignore" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.typeParameterHiding"
-            value="ignore" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation"
-            value="ignore" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock"
-            value="ignore" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.unhandledWarningToken"
-            value="warning" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.unnecessaryElse"
-            value="ignore" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck"
-            value="ignore" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess"
-            value="ignore" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException"
-            value="ignore" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding"
-            value="disabled" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.unusedImport"
-            value="warning" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.unusedLabel"
-            value="warning" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.unusedLocal"
-            value="warning" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.unusedParameter"
-            value="ignore" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract"
-            value="disabled" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete"
-            value="disabled" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.unusedPrivateMember"
-            value="warning" />
-        <option
-            key="org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast"
-            value="warning" />
-        <option
-            key="org.eclipse.jdt.core.compiler.processAnnotations"
-            value="enabled" />
-        <option
-            key="org.eclipse.jdt.core.compiler.source"
-            value="1.3" />
-        <option
-            key="org.eclipse.jdt.core.compiler.taskCaseSensitive"
-            value="enabled" />
-        <option
-            key="org.eclipse.jdt.core.compiler.taskPriorities"
-            value="" />
-        <option
-            key="org.eclipse.jdt.core.compiler.taskTags"
-            value="" />
-        <option
-            key="org.eclipse.jdt.core.encoding"
-            value="ISO-8859-1" />
-    </options>
-    <classpaths>
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/apps/j2sdk1.4.2_11/jre/lib/rt.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/apps/j2sdk1.4.2_11/jre/lib/ext/ldapsec.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/apps/j2sdk1.4.2_11/jre/lib/ext/dnsns.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/apps/j2sdk1.4.2_11/jre/lib/ext/localedata.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/apps/j2sdk1.4.2_11/jre/lib/ext/sunjce_provider.jar" />
-        <classpath
-            id="FOLDER"
-            path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/temp.folder/@dot.bin/" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.ui.ide_3.3.0.I20070321-1300a.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/com.ibm.icu.base_3.6.0.20061215.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.core.resources_3.3.0.v20070316.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.core.resources.compatibility_3.2.0.v20070226.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.ant.core_3.1.200.v20070318.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.core.variables_3.1.100.v20070205.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.core.runtime_3.3.100.v20070319.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.osgi_3.3.0.v20070321.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.equinox.common_3.3.0.v20070318.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.core.jobs_3.3.0.v20070319.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.core.runtime.compatibility.registry_3.2.100.v20070316/runtime_registry_compatibility.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.equinox.registry_3.3.0.v20070318.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.equinox.preferences_3.2.100.v20070312.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.core.contenttype_3.2.100.v20070319.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.core.runtime.compatibility.auth_3.2.0.v20070202.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.equinox.app_1.0.0.v20070318.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.osgi.services_3.1.100.v20060918.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/javax.servlet_2.4.0.v200612120446.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.core.expressions_3.3.0.v20070319-1800.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.core.filesystem_1.1.0.v20070226.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.core.filesystem.linux.x86_1.1.0.v20070202.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.help_3.3.0.v20070316.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.ui_3.3.0.I20070322-1800.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.swt_3.3.0.v3333g.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.swt.gtk.linux.x86_3.3.0.v3333.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.jface_3.3.0.I20070321-1800.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.core.commands_3.3.0.I20070321-0010.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.ui.workbench_3.3.0.I20070322-1800.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.ui.workbench.compatibility_3.2.0.I20070319-0010/compatibility.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.jface.databinding_1.1.0.I20070319-1300.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.core.databinding_1.0.0.I20070322-0010.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.ui.views_3.2.100.I20070319-0010.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.update.configurator_3.2.100.v20070322.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.update.core_3.2.100.v20070322b.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.update.core.linux_3.2.0.v20060605.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.update.ui_3.2.100.v20070322a.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.ui.forms_3.3.0.v20070322.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.jface.text_3.3.0.v20070321-1800.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.text_3.3.0.v20070319-1800.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.ui.workbench.texteditor_3.3.0.v20070321-1300.jar" />
-        <classpath
-            id="FOLDER"
-            path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot/" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.debug.ui_3.3.0.v20070322a.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.ui.console_3.2.0.v20070212.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.debug.core_3.3.0.v20070323.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.ui.editors_3.3.0.v20070321-1800.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.core.filebuffers_3.3.0.v20070319-1800.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.search_3.3.0.v20070319-1800.jar" />
-        <classpath
-            id="FOLDER"
-            path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot/" />
-        <classpath
-            id="FOLDER"
-            path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.common.uriresolver/@dot/" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.emf.common_2.3.0.v200703291501.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/com.ibm.icu_3.6.0.20061215.jar" />
-        <classpath
-            id="FOLDER"
-            path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.validation/@dot/" />
-        <classpath
-            id="FOLDER"
-            path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.common.frameworks/@dot/" />
-        <classpath
-            id="FOLDER"
-            path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jem.util/@dot/" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.emf.ecore_2.3.0.v200703291501.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.emf.ecore.xmi_2.3.0.v200703291501.jar" />
-        <classpath
-            id="FOLDER"
-            path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.common.environment/@dot/" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.osgi.util_3.1.100.v20060918.jar" />
-        <classpath
-            id="FOLDER"
-            path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.common.project.facet.core/@dot/" />
-        <classpath
-            id="FOLDER"
-            path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.html.ui/@dot/" />
-        <classpath
-            id="FOLDER"
-            path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.ui/@dot/" />
-        <classpath
-            id="FOLDER"
-            path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot/" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.apache.xerces_2.8.0.v200702082200.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.w3c.dom_1.3.3.v200702082200.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.apache.xml.resolver_1.1.0.v200702082200.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.emf.ecore.edit_2.3.0.v200703291501.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.emf.edit_2.3.0.v200703291501.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.emf.ecore.change_2.3.0.v200703291501.jar" />
-        <classpath
-            id="FOLDER"
-            path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.common.emf/@dot/" />
-        <classpath
-            id="FOLDER"
-            path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.common.emfworkbench.integration/@dot/" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.xsd_2.3.0.v200703291501.jar" />
-        <classpath
-            id="FOLDER"
-            path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.common.core/@dot/" />
-        <classpath
-            id="FOLDER"
-            path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.common.ui/@dot/" />
-        <classpath
-            id="FOLDER"
-            path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.ui/@dot/" />
-        <classpath
-            id="FOLDER"
-            path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.core/@dot/" />
-        <classpath
-            id="FOLDER"
-            path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.html.core/@dot/" />
-        <classpath
-            id="FOLDER"
-            path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.common.modulecore/@dot/" />
-        <classpath
-            id="FOLDER"
-            path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.javascript.ui/@dot/" />
-        <classpath
-            id="FOLDER"
-            path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.javascript.core/@dot/" />
-        <classpath
-            id="FOLDER"
-            path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.core/@dot/" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.jdt.core_3.3.0.v_745.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.jdt.compiler.tool_1.0.0.v20070318-1300.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.jdt.compiler.apt_1.0.0.v20070318-2030.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.team.core_3.2.100.I200703211300.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/javax.servlet.jsp_2.0.0.v200612120446.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.jdt.ui_3.3.0.v20070321-1800.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.jdt.launching_3.2.100.v20070321.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.jdt.debug_3.2.100.v20070323/jdi.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.jdt.debug_3.2.100.v20070323/jdimodel.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.compare_3.3.0.I200703211300.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.team.ui_3.3.0.I200703211300.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.ui.navigator_3.2.100.I20070319-1300.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.ui.navigator.resources_3.2.100.I20070319-0010.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.ui.views.properties.tabbed_3.2.100.I20061213-1608.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.ltk.core.refactoring_3.3.0.v20070319-1800.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.ltk.ui.refactoring_3.3.0.v20070319-1800.jar" />
-        <classpath
-            id="JAR"
-            path="/home/shared/webtools/build-wtp-R2.0-S/eclipse/plugins/org.eclipse.jdt.core.manipulation_1.1.0.v20070319-1800.jar" />
-        <classpath
-            id="FOLDER"
-            path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/" />
-    </classpaths>
-    <sources>
-        <source
-            output="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/temp.folder/@dot.bin"
-            package="org/eclipse/jst/jsp/css/ui/internal/properties"
-            path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/css/ui/internal/properties/JSPedCSSPropertySource.java">
-            <problems
-                errors="0"
-                problems="6"
-                warnings="6">
-                <problem
-                    charEnd="838"
-                    charStart="776"
-                    id="DiscouragedReference"
-                    line="17"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type ICSSNode is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.core/@dot" />
-                    <source_context
-                        sourceEnd="69"
-                        sourceStart="7"
-                        value="import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.css.core.internal.provisional.document.ICSSNode" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="907"
-                    charStart="848"
-                    id="DiscouragedReference"
-                    line="18"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type CSSPropertySource is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.ui/@dot" />
-                    <source_context
-                        sourceEnd="66"
-                        sourceStart="7"
-                        value="import org.eclipse.wst.css.ui.internal.properties.CSSPropertySource;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.css.ui.internal.properties.CSSPropertySource" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="973"
-                    charStart="957"
-                    id="DiscouragedReference"
-                    line="22"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type CSSPropertySource is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.ui/@dot" />
-                    <source_context
-                        sourceEnd="60"
-                        sourceStart="44"
-                        value="public class JSPedCSSPropertySource extends CSSPropertySource {" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.css.ui.internal.properties.CSSPropertySource" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="1016"
-                    charStart="1009"
-                    id="DiscouragedReference"
-                    line="24"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type ICSSNode is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.core/@dot" />
-                    <source_context
-                        sourceEnd="37"
-                        sourceStart="30"
-                        value="public JSPedCSSPropertySource(ICSSNode target) {" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.css.core.internal.provisional.document.ICSSNode" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="1042"
-                    charStart="1030"
-                    id="DiscouragedReference"
-                    line="25"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The constructor CSSPropertySource(ICSSNode) is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.ui/@dot" />
-                    <source_context
-                        sourceEnd="12"
-                        sourceStart="0"
-                        value="super(target);" />
-                    <arguments>
-                        <argument value="CSSPropertySource(ICSSNode)" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="1617"
-                    charStart="1583"
-                    id="DiscouragedReference"
-                    line="38"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The method setPropertyValue(Object, Object) from the type CSSPropertySource is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.ui/@dot" />
-                    <source_context
-                        sourceEnd="34"
-                        sourceStart="0"
-                        value="super.setPropertyValue(name, value);" />
-                    <arguments>
-                        <argument
-                            value="setPropertyValue(Object, Object)" />
-                    </arguments>
-                </problem>
-            </problems>
-            <classfile
-                path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/temp.folder/@dot.bin/org/eclipse/jst/jsp/css/ui/internal/properties/JSPedCSSPropertySource.class" />
-        </source>
-        <source
-            output="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/temp.folder/@dot.bin"
-            package="org/eclipse/jst/jsp/css/ui/internal/registry"
-            path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/css/ui/internal/registry/AdapterFactoryProviderJSPedCSS.java">
-            <problems
-                errors="0"
-                problems="4"
-                warnings="4">
-                <problem
-                    charEnd="746"
-                    charStart="681"
-                    id="DiscouragedReference"
-                    line="14"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type AdapterFactoryProviderCSS is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.ui/@dot" />
-                    <source_context
-                        sourceEnd="72"
-                        sourceStart="7"
-                        value="import org.eclipse.wst.css.ui.internal.registry.AdapterFactoryProviderCSS;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.css.ui.internal.registry.AdapterFactoryProviderCSS" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="826"
-                    charStart="756"
-                    id="DiscouragedReference"
-                    line="15"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type IDocumentTypeHandler is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="77"
-                        sourceStart="7"
-                        value="import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IDocumentTypeHandler;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.core.internal.ltk.modelhandler.IDocumentTypeHandler" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="906"
-                    charStart="882"
-                    id="DiscouragedReference"
-                    line="17"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type AdapterFactoryProviderCSS is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.ui/@dot" />
-                    <source_context
-                        sourceEnd="76"
-                        sourceStart="52"
-                        value="public class AdapterFactoryProviderJSPedCSS extends AdapterFactoryProviderCSS {" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.css.ui.internal.registry.AdapterFactoryProviderCSS" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="953"
-                    charStart="934"
-                    id="DiscouragedReference"
-                    line="20"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type IDocumentTypeHandler is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="40"
-                        sourceStart="21"
-                        value="public boolean isFor(IDocumentTypeHandler contentTypeDescription) {" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.core.internal.ltk.modelhandler.IDocumentTypeHandler" />
-                    </arguments>
-                </problem>
-            </problems>
-            <classfile
-                path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/temp.folder/@dot.bin/org/eclipse/jst/jsp/css/ui/internal/registry/AdapterFactoryProviderJSPedCSS.class" />
-        </source>
-        <source
-            output="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/temp.folder/@dot.bin"
-            package="org/eclipse/jst/jsp/css/ui/internal/views/properties"
-            path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/css/ui/internal/views/properties/JSPedCSSPropertySheetConfiguration.java">
-            <problems
-                errors="0"
-                problems="30"
-                warnings="30">
-                <problem
-                    charEnd="1486"
-                    charStart="1424"
-                    id="DiscouragedReference"
-                    line="32"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type ICSSNode is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.core/@dot" />
-                    <source_context
-                        sourceEnd="69"
-                        sourceStart="7"
-                        value="import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.css.core.internal.provisional.document.ICSSNode" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="1553"
-                    charStart="1496"
-                    id="DiscouragedReference"
-                    line="33"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type INodeAdapter is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="64"
-                        sourceStart="7"
-                        value="import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.core.internal.provisional.INodeAdapter" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="1621"
-                    charStart="1563"
-                    id="DiscouragedReference"
-                    line="34"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type INodeNotifier is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="65"
-                        sourceStart="7"
-                        value="import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.core.internal.provisional.INodeNotifier" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="1750"
-                    charStart="1706"
-                    id="DiscouragedReference"
-                    line="36"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type XMLUIMessages is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.ui/@dot" />
-                    <source_context
-                        sourceEnd="51"
-                        sourceStart="7"
-                        value="import org.eclipse.wst.xml.ui.internal.XMLUIMessages;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.xml.ui.internal.XMLUIMessages" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="1907"
-                    charStart="1896"
-                    id="DiscouragedReference"
-                    line="39"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type INodeAdapter is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="67"
-                        sourceStart="56"
-                        value="private class CSSPropertySheetRefreshAdapter implements INodeAdapter {" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.core.internal.provisional.INodeAdapter" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="2022"
-                    charStart="2010"
-                    id="DiscouragedReference"
-                    line="44"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type INodeNotifier is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="38"
-                        sourceStart="26"
-                        value="public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.core.internal.provisional.INodeNotifier" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="2384"
-                    charStart="2377"
-                    id="DiscouragedReference"
-                    line="53"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type ICSSNode is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.core/@dot" />
-                    <source_context
-                        sourceEnd="15"
-                        sourceStart="8"
-                        value="private ICSSNode fSource = null;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.css.core.internal.provisional.document.ICSSNode" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="2581"
-                    charStart="2574"
-                    id="DiscouragedReference"
-                    line="60"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type ICSSNode is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.core/@dot" />
-                    <source_context
-                        sourceEnd="29"
-                        sourceStart="22"
-                        value="if (object instanceof ICSSNode) {" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.css.core.internal.provisional.document.ICSSNode" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="2608"
-                    charStart="2601"
-                    id="DiscouragedReference"
-                    line="61"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type ICSSNode is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.core/@dot" />
-                    <source_context
-                        sourceEnd="18"
-                        sourceStart="11"
-                        value="fSource = (ICSSNode)object;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.css.core.internal.provisional.document.ICSSNode" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="2995"
-                    charStart="2964"
-                    id="DiscouragedReference"
-                    line="78"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type XMLUIMessages is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.ui/@dot" />
-                    <source_context
-                        sourceEnd="37"
-                        sourceStart="6"
-                        value="super(XMLUIMessages.JFaceNodeAdapter_1);" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.xml.ui.internal.XMLUIMessages" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="2995"
-                    charStart="2978"
-                    id="DiscouragedReference"
-                    line="78"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The field JFaceNodeAdapter_1 from the type XMLUIMessages is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.ui/@dot" />
-                    <source_context
-                        sourceEnd="37"
-                        sourceStart="20"
-                        value="super(XMLUIMessages.JFaceNodeAdapter_1);" />
-                    <arguments>
-                        <argument value="JFaceNodeAdapter_1" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="3784"
-                    charStart="3773"
-                    id="DiscouragedReference"
-                    line="110"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type INodeAdapter is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="19"
-                        sourceStart="8"
-                        value="private INodeAdapter fRefreshAdapter = new CSSPropertySheetRefreshAdapter();" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.core.internal.provisional.INodeAdapter" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="3866"
-                    charStart="3852"
-                    id="DiscouragedReference"
-                    line="112"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type INodeNotifier is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="22"
-                        sourceStart="8"
-                        value="private INodeNotifier[] fSelectedNotifiers;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.core.internal.provisional.INodeNotifier" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="4351"
-                    charStart="4300"
-                    id="DiscouragedReference"
-                    line="126"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The method removeAdapter(INodeAdapter) from the type INodeNotifier is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="51"
-                        sourceStart="0"
-                        value="fSelectedNotifiers[i].removeAdapter(fRefreshAdapter);" />
-                    <arguments>
-                        <argument value="removeAdapter(INodeAdapter)" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="4837"
-                    charStart="4830"
-                    id="DiscouragedReference"
-                    line="136"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type ICSSNode is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.core/@dot" />
-                    <source_context
-                        sourceEnd="41"
-                        sourceStart="34"
-                        value="if (selectedObjects[i] instanceof ICSSNode) {" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.css.core.internal.provisional.document.ICSSNode" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="4854"
-                    charStart="4847"
-                    id="DiscouragedReference"
-                    line="137"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type ICSSNode is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.core/@dot" />
-                    <source_context
-                        sourceEnd="7"
-                        sourceStart="0"
-                        value="ICSSNode node = (ICSSNode) selectedObjects[i];" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.css.core.internal.provisional.document.ICSSNode" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="4871"
-                    charStart="4864"
-                    id="DiscouragedReference"
-                    line="137"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type ICSSNode is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.core/@dot" />
-                    <source_context
-                        sourceEnd="24"
-                        sourceStart="17"
-                        value="ICSSNode node = (ICSSNode) selectedObjects[i];" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.css.core.internal.provisional.document.ICSSNode" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="4923"
-                    charStart="4906"
-                    id="DiscouragedReference"
-                    line="138"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The method getNodeType() from the type ICSSNode is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.core/@dot" />
-                    <source_context
-                        sourceEnd="24"
-                        sourceStart="7"
-                        value="while (node.getNodeType() == ICSSNode.PRIMITIVEVALUE_NODE || node.getNodeType() == ICSSNode.STYLEDECLITEM_NODE) {" />
-                    <arguments>
-                        <argument value="getNodeType()" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="4955"
-                    charStart="4928"
-                    id="DiscouragedReference"
-                    line="138"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type ICSSNode is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.core/@dot" />
-                    <source_context
-                        sourceEnd="56"
-                        sourceStart="29"
-                        value="while (node.getNodeType() == ICSSNode.PRIMITIVEVALUE_NODE || node.getNodeType() == ICSSNode.STYLEDECLITEM_NODE) {" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.css.core.internal.provisional.document.ICSSNode" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="4955"
-                    charStart="4937"
-                    id="DiscouragedReference"
-                    line="138"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The field PRIMITIVEVALUE_NODE from the type ICSSNode is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.core/@dot" />
-                    <source_context
-                        sourceEnd="56"
-                        sourceStart="38"
-                        value="while (node.getNodeType() == ICSSNode.PRIMITIVEVALUE_NODE || node.getNodeType() == ICSSNode.STYLEDECLITEM_NODE) {" />
-                    <arguments>
-                        <argument value="PRIMITIVEVALUE_NODE" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="4977"
-                    charStart="4960"
-                    id="DiscouragedReference"
-                    line="138"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The method getNodeType() from the type ICSSNode is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.core/@dot" />
-                    <source_context
-                        sourceEnd="78"
-                        sourceStart="61"
-                        value="while (node.getNodeType() == ICSSNode.PRIMITIVEVALUE_NODE || node.getNodeType() == ICSSNode.STYLEDECLITEM_NODE) {" />
-                    <arguments>
-                        <argument value="getNodeType()" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="5008"
-                    charStart="4982"
-                    id="DiscouragedReference"
-                    line="138"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type ICSSNode is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.core/@dot" />
-                    <source_context
-                        sourceEnd="109"
-                        sourceStart="83"
-                        value="while (node.getNodeType() == ICSSNode.PRIMITIVEVALUE_NODE || node.getNodeType() == ICSSNode.STYLEDECLITEM_NODE) {" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.css.core.internal.provisional.document.ICSSNode" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="5008"
-                    charStart="4991"
-                    id="DiscouragedReference"
-                    line="138"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The field STYLEDECLITEM_NODE from the type ICSSNode is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.core/@dot" />
-                    <source_context
-                        sourceEnd="109"
-                        sourceStart="92"
-                        value="while (node.getNodeType() == ICSSNode.PRIMITIVEVALUE_NODE || node.getNodeType() == ICSSNode.STYLEDECLITEM_NODE) {" />
-                    <arguments>
-                        <argument value="STYLEDECLITEM_NODE" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="5045"
-                    charStart="5026"
-                    id="DiscouragedReference"
-                    line="139"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The method getParentNode() from the type ICSSNode is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.css.core/@dot" />
-                    <source_context
-                        sourceEnd="26"
-                        sourceStart="7"
-                        value="node = node.getParentNode();" />
-                    <arguments>
-                        <argument value="getParentNode()" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="5380"
-                    charStart="5368"
-                    id="DiscouragedReference"
-                    line="152"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type INodeNotifier is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="46"
-                        sourceStart="34"
-                        value="if (selectedObjects[i] instanceof INodeNotifier) {" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.core.internal.provisional.INodeNotifier" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="5503"
-                    charStart="5440"
-                    id="DiscouragedReference"
-                    line="154"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The method addAdapter(INodeAdapter) from the type INodeNotifier is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="63"
-                        sourceStart="0"
-                        value="((INodeNotifier) selectedObjects[i]).addAdapter(fRefreshAdapter);" />
-                    <arguments>
-                        <argument value="addAdapter(INodeAdapter)" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="5454"
-                    charStart="5442"
-                    id="DiscouragedReference"
-                    line="154"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type INodeNotifier is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="14"
-                        sourceStart="2"
-                        value="((INodeNotifier) selectedObjects[i]).addAdapter(fRefreshAdapter);" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.core.internal.provisional.INodeNotifier" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="5559"
-                    charStart="5545"
-                    id="DiscouragedReference"
-                    line="157"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type INodeNotifier is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="36"
-                        sourceStart="22"
-                        value="fSelectedNotifiers = (INodeNotifier[]) selectedNotifiers.toArray(new INodeNotifier[selectedNotifiers.size()]);" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.core.internal.provisional.INodeNotifier" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="5604"
-                    charStart="5592"
-                    id="DiscouragedReference"
-                    line="157"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type INodeNotifier is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="81"
-                        sourceStart="69"
-                        value="fSelectedNotifiers = (INodeNotifier[]) selectedNotifiers.toArray(new INodeNotifier[selectedNotifiers.size()]);" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.core.internal.provisional.INodeNotifier" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="6386"
-                    charStart="6335"
-                    id="DiscouragedReference"
-                    line="183"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The method removeAdapter(INodeAdapter) from the type INodeNotifier is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="51"
-                        sourceStart="0"
-                        value="fSelectedNotifiers[i].removeAdapter(fRefreshAdapter);" />
-                    <arguments>
-                        <argument value="removeAdapter(INodeAdapter)" />
-                    </arguments>
-                </problem>
-            </problems>
-            <classfile
-                path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/temp.folder/@dot.bin/org/eclipse/jst/jsp/css/ui/internal/views/properties/JSPedCSSPropertySheetConfiguration$CSSPropertySourceProvider.class" />
-            <classfile
-                path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/temp.folder/@dot.bin/org/eclipse/jst/jsp/css/ui/internal/views/properties/JSPedCSSPropertySheetConfiguration$CSSPropertySheetRefreshAdapter.class" />
-            <classfile
-                path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/temp.folder/@dot.bin/org/eclipse/jst/jsp/css/ui/internal/views/properties/JSPedCSSPropertySheetConfiguration$PropertiesRefreshJob.class" />
-            <classfile
-                path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/temp.folder/@dot.bin/org/eclipse/jst/jsp/css/ui/internal/views/properties/JSPedCSSPropertySheetConfiguration.class" />
-        </source>
-        <source
-            output="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/temp.folder/@dot.bin"
-            package="org/eclipse/jst/jsp/ui"
-            path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/StructuredTextViewerConfigurationJSP.java">
-            <problems
-                errors="0"
-                problems="48"
-                warnings="48">
-                <problem
-                    charEnd="3099"
-                    charStart="3035"
-                    id="DiscouragedReference"
-                    line="53"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type HTMLFormatProcessorImpl is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.html.core/@dot" />
-                    <source_context
-                        sourceEnd="71"
-                        sourceStart="7"
-                        value="import org.eclipse.wst.html.core.internal.format.HTMLFormatProcessorImpl;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.html.core.internal.format.HTMLFormatProcessorImpl" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="3187"
-                    charStart="3109"
-                    id="DiscouragedReference"
-                    line="54"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type ContentTypeIdForHTML is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.html.core/@dot" />
-                    <source_context
-                        sourceEnd="85"
-                        sourceStart="7"
-                        value="import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="3489"
-                    charStart="3447"
-                    id="DiscouragedReference"
-                    line="59"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type SSEUIPlugin is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="49"
-                        sourceStart="7"
-                        value="import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.ui.internal.SSEUIPlugin" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="3565"
-                    charStart="3499"
-                    id="DiscouragedReference"
-                    line="60"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type StructuredFormattingStrategy is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="73"
-                        sourceStart="7"
-                        value="import org.eclipse.wst.sse.ui.internal.format.StructuredFormattingStrategy;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.ui.internal.format.StructuredFormattingStrategy" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="3641"
-                    charStart="3575"
-                    id="DiscouragedReference"
-                    line="61"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type LineStyleProvider is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="73"
-                        sourceStart="7"
-                        value="import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="3706"
-                    charStart="3651"
-                    id="DiscouragedReference"
-                    line="62"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type TextHoverManager is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="62"
-                        sourceStart="7"
-                        value="import org.eclipse.wst.sse.ui.internal.taginfo.TextHoverManager;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.ui.internal.taginfo.TextHoverManager" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="3765"
-                    charStart="3716"
-                    id="DiscouragedReference"
-                    line="63"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type EditorUtility is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="56"
-                        sourceStart="7"
-                        value="import org.eclipse.wst.sse.ui.internal.util.EditorUtility;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.ui.internal.util.EditorUtility" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="3851"
-                    charStart="3775"
-                    id="DiscouragedReference"
-                    line="64"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type ContentTypeIdForXML is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot" />
-                    <source_context
-                        sourceEnd="83"
-                        sourceStart="7"
-                        value="import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="4050"
-                    charStart="3982"
-                    id="DiscouragedReference"
-                    line="67"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type JFaceNodeLabelProvider is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.ui/@dot" />
-                    <source_context
-                        sourceEnd="75"
-                        sourceStart="7"
-                        value="import org.eclipse.wst.xml.ui.internal.contentoutline.JFaceNodeLabelProvider;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.xml.ui.internal.contentoutline.JFaceNodeLabelProvider" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="4657"
-                    charStart="4641"
-                    id="DiscouragedReference"
-                    line="89"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type LineStyleProvider is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="24"
-                        sourceStart="8"
-                        value="private LineStyleProvider fLineStyleProviderForJava;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="4755"
-                    charStart="4739"
-                    id="DiscouragedReference"
-                    line="93"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type LineStyleProvider is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="24"
-                        sourceStart="8"
-                        value="private LineStyleProvider fLineStyleProviderForJSP;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="4852"
-                    charStart="4836"
-                    id="DiscouragedReference"
-                    line="97"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type LineStyleProvider is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="24"
-                        sourceStart="8"
-                        value="private LineStyleProvider fLineStyleProviderForJSPEL;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="11238"
-                    charStart="11176"
-                    id="DiscouragedReference"
-                    line="236"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The constructor StructuredFormattingStrategy(IStructuredFormatProcessor) is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="90"
-                        sourceStart="28"
-                        value="formatter.setMasterStrategy(new StructuredFormattingStrategy(new HTMLFormatProcessorImpl()));" />
-                    <arguments>
-                        <argument
-                            value="StructuredFormattingStrategy(IStructuredFormatProcessor)" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="11207"
-                    charStart="11180"
-                    id="DiscouragedReference"
-                    line="236"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type StructuredFormattingStrategy is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="59"
-                        sourceStart="32"
-                        value="formatter.setMasterStrategy(new StructuredFormattingStrategy(new HTMLFormatProcessorImpl()));" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.ui.internal.format.StructuredFormattingStrategy" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="11237"
-                    charStart="11209"
-                    id="DiscouragedReference"
-                    line="236"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The constructor HTMLFormatProcessorImpl() is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.html.core/@dot" />
-                    <source_context
-                        sourceEnd="89"
-                        sourceStart="61"
-                        value="formatter.setMasterStrategy(new StructuredFormattingStrategy(new HTMLFormatProcessorImpl()));" />
-                    <arguments>
-                        <argument value="HTMLFormatProcessorImpl()" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="11235"
-                    charStart="11213"
-                    id="DiscouragedReference"
-                    line="236"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type HTMLFormatProcessorImpl is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.html.core/@dot" />
-                    <source_context
-                        sourceEnd="87"
-                        sourceStart="65"
-                        value="formatter.setMasterStrategy(new StructuredFormattingStrategy(new HTMLFormatProcessorImpl()));" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.html.core.internal.format.HTMLFormatProcessorImpl" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="14924"
-                    charStart="14906"
-                    id="DiscouragedReference"
-                    line="321"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type LineStyleProvider is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="25"
-                        sourceStart="7"
-                        value="public LineStyleProvider[] getLineStyleProviders(ISourceViewer sourceViewer, String partitionType) {" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="15020"
-                    charStart="15002"
-                    id="DiscouragedReference"
-                    line="322"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type LineStyleProvider is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="18"
-                        sourceStart="0"
-                        value="LineStyleProvider[] providers = null;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="16170"
-                    charStart="16154"
-                    id="DiscouragedReference"
-                    line="337"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type LineStyleProvider is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="32"
-                        sourceStart="16"
-                        value="providers = new LineStyleProvider[]{getLineStyleProviderForJava()};" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="16306"
-                    charStart="16290"
-                    id="DiscouragedReference"
-                    line="340"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type LineStyleProvider is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="32"
-                        sourceStart="16"
-                        value="providers = new LineStyleProvider[]{getLineStyleProviderForJSPEL()};" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="16593"
-                    charStart="16577"
-                    id="DiscouragedReference"
-                    line="343"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type LineStyleProvider is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="32"
-                        sourceStart="16"
-                        value="providers = new LineStyleProvider[]{getLineStyleProviderForJSP()};" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="16682"
-                    charStart="16666"
-                    id="DiscouragedReference"
-                    line="349"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type LineStyleProvider is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="24"
-                        sourceStart="8"
-                        value="private LineStyleProvider getLineStyleProviderForJava() {" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="16891"
-                    charStart="16875"
-                    id="DiscouragedReference"
-                    line="356"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type LineStyleProvider is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="24"
-                        sourceStart="8"
-                        value="private LineStyleProvider getLineStyleProviderForJSP() {" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="17095"
-                    charStart="17079"
-                    id="DiscouragedReference"
-                    line="363"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type LineStyleProvider is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="24"
-                        sourceStart="8"
-                        value="private LineStyleProvider getLineStyleProviderForJSPEL() {" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="17461"
-                    charStart="17440"
-                    id="DiscouragedReference"
-                    line="372"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type JFaceNodeLabelProvider is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.ui/@dot" />
-                    <source_context
-                        sourceEnd="52"
-                        sourceStart="31"
-                        value="fStatusLineLabelProvider = new JFaceNodeLabelProvider() {" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.xml.ui.internal.contentoutline.JFaceNodeLabelProvider" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="17796"
-                    charStart="17778"
-                    id="DiscouragedReference"
-                    line="382"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The method getText(Object) from the type JFaceNodeLabelProvider is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.ui/@dot" />
-                    <source_context
-                        sourceEnd="30"
-                        sourceStart="12"
-                        value="s.insert(0, super.getText(node));" />
-                    <arguments>
-                        <argument value="getText(Object)" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="18703"
-                    charStart="18688"
-                    id="DiscouragedReference"
-                    line="408"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type TextHoverManager is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="15"
-                        sourceStart="0"
-                        value="TextHoverManager manager = SSEUIPlugin.getDefault().getTextHoverManager();" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.ui.internal.taginfo.TextHoverManager" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="18725"
-                    charStart="18715"
-                    id="DiscouragedReference"
-                    line="408"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type SSEUIPlugin is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="37"
-                        sourceStart="27"
-                        value="TextHoverManager manager = SSEUIPlugin.getDefault().getTextHoverManager();" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.ui.internal.SSEUIPlugin" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="18738"
-                    charStart="18715"
-                    id="DiscouragedReference"
-                    line="408"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The method getDefault() from the type SSEUIPlugin is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="50"
-                        sourceStart="27"
-                        value="TextHoverManager manager = SSEUIPlugin.getDefault().getTextHoverManager();" />
-                    <arguments>
-                        <argument value="getDefault()" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="18760"
-                    charStart="18715"
-                    id="DiscouragedReference"
-                    line="408"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The method getTextHoverManager() from the type SSEUIPlugin is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="72"
-                        sourceStart="27"
-                        value="TextHoverManager manager = SSEUIPlugin.getDefault().getTextHoverManager();" />
-                    <arguments>
-                        <argument value="getTextHoverManager()" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="18803"
-                    charStart="18766"
-                    id="DiscouragedReference"
-                    line="409"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type TextHoverManager is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="37"
-                        sourceStart="0"
-                        value="TextHoverManager.TextHoverDescriptor[] hoverDescs = manager.getTextHovers();" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.ui.internal.taginfo.TextHoverManager" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="18803"
-                    charStart="18766"
-                    id="DiscouragedReference"
-                    line="409"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type TextHoverManager.TextHoverDescriptor is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="37"
-                        sourceStart="0"
-                        value="TextHoverManager.TextHoverDescriptor[] hoverDescs = manager.getTextHovers();" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.ui.internal.taginfo.TextHoverManager.TextHoverDescriptor" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="18840"
-                    charStart="18818"
-                    id="DiscouragedReference"
-                    line="409"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The method getTextHovers() from the type TextHoverManager is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="74"
-                        sourceStart="52"
-                        value="TextHoverManager.TextHoverDescriptor[] hoverDescs = manager.getTextHovers();" />
-                    <arguments>
-                        <argument value="getTextHovers()" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="18941"
-                    charStart="18917"
-                    id="DiscouragedReference"
-                    line="412"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The method isEnabled() from the type TextHoverManager.TextHoverDescriptor is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="28"
-                        sourceStart="4"
-                        value="if (hoverDescs[i].isEnabled() &amp;&amp; EditorUtility.computeStateMask(hoverDescs[i].getModifierString()) == stateMask) {" />
-                    <arguments>
-                        <argument value="isEnabled()" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="18958"
-                    charStart="18946"
-                    id="DiscouragedReference"
-                    line="412"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type EditorUtility is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="45"
-                        sourceStart="33"
-                        value="if (hoverDescs[i].isEnabled() &amp;&amp; EditorUtility.computeStateMask(hoverDescs[i].getModifierString()) == stateMask) {" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.ui.internal.util.EditorUtility" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="19010"
-                    charStart="18946"
-                    id="DiscouragedReference"
-                    line="412"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The method computeStateMask(String) from the type EditorUtility is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="97"
-                        sourceStart="33"
-                        value="if (hoverDescs[i].isEnabled() &amp;&amp; EditorUtility.computeStateMask(hoverDescs[i].getModifierString()) == stateMask) {" />
-                    <arguments>
-                        <argument value="computeStateMask(String)" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="19009"
-                    charStart="18977"
-                    id="DiscouragedReference"
-                    line="412"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The method getModifierString() from the type TextHoverManager.TextHoverDescriptor is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="96"
-                        sourceStart="64"
-                        value="if (hoverDescs[i].isEnabled() &amp;&amp; EditorUtility.computeStateMask(hoverDescs[i].getModifierString()) == stateMask) {" />
-                    <arguments>
-                        <argument value="getModifierString()" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="19072"
-                    charStart="19052"
-                    id="DiscouragedReference"
-                    line="413"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The method getId() from the type TextHoverManager.TextHoverDescriptor is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="39"
-                        sourceStart="19"
-                        value="String hoverType = hoverDescs[i].getId();" />
-                    <arguments>
-                        <argument value="getId()" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="19117"
-                    charStart="19084"
-                    id="DiscouragedReference"
-                    line="414"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type TextHoverManager is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="37"
-                        sourceStart="4"
-                        value="if (TextHoverManager.COMBINATION_HOVER.equalsIgnoreCase(hoverType)) {" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.ui.internal.taginfo.TextHoverManager" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="19117"
-                    charStart="19101"
-                    id="DiscouragedReference"
-                    line="414"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The field COMBINATION_HOVER from the type TextHoverManager is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="37"
-                        sourceStart="21"
-                        value="if (TextHoverManager.COMBINATION_HOVER.equalsIgnoreCase(hoverType)) {" />
-                    <arguments>
-                        <argument value="COMBINATION_HOVER" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="19344"
-                    charStart="19285"
-                    id="DiscouragedReference"
-                    line="417"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The method createBestMatchHover(ITextHover) from the type TextHoverManager is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="67"
-                        sourceStart="8"
-                        value="hover = manager.createBestMatchHover(new JSPTagInfoHoverProcessor());" />
-                    <arguments>
-                        <argument
-                            value="createBestMatchHover(ITextHover)" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="19465"
-                    charStart="19402"
-                    id="DiscouragedReference"
-                    line="421"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The method createBestMatchHover(ITextHover) from the type TextHoverManager is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="71"
-                        sourceStart="8"
-                        value="hover = manager.createBestMatchHover(new JSPJavaJavadocHoverProcessor());" />
-                    <arguments>
-                        <argument
-                            value="createBestMatchHover(ITextHover)" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="19532"
-                    charStart="19497"
-                    id="DiscouragedReference"
-                    line="424"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type TextHoverManager is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="44"
-                        sourceStart="9"
-                        value="else if (TextHoverManager.DOCUMENTATION_HOVER.equalsIgnoreCase(hoverType)) {" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.ui.internal.taginfo.TextHoverManager" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="19532"
-                    charStart="19514"
-                    id="DiscouragedReference"
-                    line="424"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The field DOCUMENTATION_HOVER from the type TextHoverManager is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="44"
-                        sourceStart="26"
-                        value="else if (TextHoverManager.DOCUMENTATION_HOVER.equalsIgnoreCase(hoverType)) {" />
-                    <arguments>
-                        <argument value="DOCUMENTATION_HOVER" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="20665"
-                    charStart="20627"
-                    id="DiscouragedReference"
-                    line="458"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type ContentTypeIdForHTML is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.html.core/@dot" />
-                    <source_context
-                        sourceEnd="50"
-                        sourceStart="12"
-                        value="targets.put(ContentTypeIdForHTML.ContentTypeID_HTML, null);" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="20665"
-                    charStart="20648"
-                    id="DiscouragedReference"
-                    line="458"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The field ContentTypeID_HTML from the type ContentTypeIdForHTML is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.html.core/@dot" />
-                    <source_context
-                        sourceEnd="50"
-                        sourceStart="33"
-                        value="targets.put(ContentTypeIdForHTML.ContentTypeID_HTML, null);" />
-                    <arguments>
-                        <argument value="ContentTypeID_HTML" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="20725"
-                    charStart="20689"
-                    id="DiscouragedReference"
-                    line="459"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type ContentTypeIdForXML is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot" />
-                    <source_context
-                        sourceEnd="48"
-                        sourceStart="12"
-                        value="targets.put(ContentTypeIdForXML.ContentTypeID_XML, null);" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="20725"
-                    charStart="20709"
-                    id="DiscouragedReference"
-                    line="459"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The field ContentTypeID_XML from the type ContentTypeIdForXML is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot" />
-                    <source_context
-                        sourceEnd="48"
-                        sourceStart="32"
-                        value="targets.put(ContentTypeIdForXML.ContentTypeID_XML, null);" />
-                    <arguments>
-                        <argument value="ContentTypeID_XML" />
-                    </arguments>
-                </problem>
-            </problems>
-            <classfile
-                path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/temp.folder/@dot.bin/org/eclipse/jst/jsp/ui/StructuredTextViewerConfigurationJSP.class" />
-            <classfile
-                path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/temp.folder/@dot.bin/org/eclipse/jst/jsp/ui/StructuredTextViewerConfigurationJSP$1.class" />
-        </source>
-        <source
-            output="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/temp.folder/@dot.bin"
-            package="org/eclipse/jst/jsp/ui/internal"
-            path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/IActionConstantsJSP.java">
-            <classfile
-                path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/temp.folder/@dot.bin/org/eclipse/jst/jsp/ui/internal/IActionConstantsJSP.class" />
-        </source>
-        <source
-            output="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/temp.folder/@dot.bin"
-            package="org/eclipse/jst/jsp/ui/internal"
-            path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/IActionDefinitionIdsJSP.java">
-            <classfile
-                path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/temp.folder/@dot.bin/org/eclipse/jst/jsp/ui/internal/IActionDefinitionIdsJSP.class" />
-        </source>
-        <source
-            output="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/temp.folder/@dot.bin"
-            package="org/eclipse/jst/jsp/ui/internal"
-            path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/JSPUIMessages.java">
-            <classfile
-                path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/temp.folder/@dot.bin/org/eclipse/jst/jsp/ui/internal/JSPUIMessages.class" />
-        </source>
-        <source
-            output="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/temp.folder/@dot.bin"
-            package="org/eclipse/jst/jsp/ui/internal"
-            path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/JSPUIPlugin.java">
-            <problems
-                errors="0"
-                problems="5"
-                warnings="5">
-                <problem
-                    charEnd="1162"
-                    charStart="1088"
-                    id="DiscouragedReference"
-                    line="22"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type AdapterFactoryRegistry is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="81"
-                        sourceStart="7"
-                        value="import org.eclipse.wst.sse.ui.internal.provisional.registry.AdapterFactoryRegistry;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.ui.internal.provisional.registry.AdapterFactoryRegistry" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="1250"
-                    charStart="1172"
-                    id="DiscouragedReference"
-                    line="23"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type AdapterFactoryRegistryImpl is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="85"
-                        sourceStart="7"
-                        value="import org.eclipse.wst.sse.ui.internal.provisional.registry.AdapterFactoryRegistryImpl;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.ui.internal.provisional.registry.AdapterFactoryRegistryImpl" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="1939"
-                    charStart="1918"
-                    id="DiscouragedReference"
-                    line="56"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type AdapterFactoryRegistry is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="28"
-                        sourceStart="7"
-                        value="public AdapterFactoryRegistry getAdapterFactoryRegistry() {" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.ui.internal.provisional.registry.AdapterFactoryRegistry" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="2005"
-                    charStart="1980"
-                    id="DiscouragedReference"
-                    line="57"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type AdapterFactoryRegistryImpl is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="32"
-                        sourceStart="7"
-                        value="return AdapterFactoryRegistryImpl.getInstance();" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.ui.internal.provisional.registry.AdapterFactoryRegistryImpl" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="2019"
-                    charStart="1980"
-                    id="DiscouragedReference"
-                    line="57"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The method getInstance() from the type AdapterFactoryRegistryImpl is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="46"
-                        sourceStart="7"
-                        value="return AdapterFactoryRegistryImpl.getInstance();" />
-                    <arguments>
-                        <argument value="getInstance()" />
-                    </arguments>
-                </problem>
-            </problems>
-            <classfile
-                path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/temp.folder/@dot.bin/org/eclipse/jst/jsp/ui/internal/JSPUIPlugin.class" />
-        </source>
-        <source
-            output="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/temp.folder/@dot.bin"
-            package="org/eclipse/jst/jsp/ui/internal"
-            path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/Logger.java">
-            <classfile
-                path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/temp.folder/@dot.bin/org/eclipse/jst/jsp/ui/internal/Logger.class" />
-        </source>
-        <source
-            output="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/temp.folder/@dot.bin"
-            package="org/eclipse/jst/jsp/ui/internal/autoedit"
-            path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/autoedit/AutoEditStrategyForTabs.java">
-            <problems
-                errors="0"
-                problems="10"
-                warnings="10">
-                <problem
-                    charEnd="1421"
-                    charStart="1373"
-                    id="DiscouragedReference"
-                    line="31"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type HTMLCorePlugin is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.html.core/@dot" />
-                    <source_context
-                        sourceEnd="55"
-                        sourceStart="7"
-                        value="import org.eclipse.wst.html.core.internal.HTMLCorePlugin;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.html.core.internal.HTMLCorePlugin" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="1500"
-                    charStart="1431"
-                    id="DiscouragedReference"
-                    line="32"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type HTMLCorePreferenceNames is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.html.core/@dot" />
-                    <source_context
-                        sourceEnd="76"
-                        sourceStart="7"
-                        value="import org.eclipse.wst.html.core.internal.preferences.HTMLCorePreferenceNames;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.html.core.internal.preferences.HTMLCorePreferenceNames" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="6178"
-                    charStart="6165"
-                    id="DiscouragedReference"
-                    line="181"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type HTMLCorePlugin is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.html.core/@dot" />
-                    <source_context
-                        sourceEnd="39"
-                        sourceStart="26"
-                        value="Preferences preferences = HTMLCorePlugin.getDefault().getPluginPreferences();" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.html.core.internal.HTMLCorePlugin" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="6191"
-                    charStart="6165"
-                    id="DiscouragedReference"
-                    line="181"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The method getDefault() from the type HTMLCorePlugin is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.html.core/@dot" />
-                    <source_context
-                        sourceEnd="52"
-                        sourceStart="26"
-                        value="Preferences preferences = HTMLCorePlugin.getDefault().getPluginPreferences();" />
-                    <arguments>
-                        <argument value="getDefault()" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="6251"
-                    charStart="6223"
-                    id="DiscouragedReference"
-                    line="182"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type HTMLCorePreferenceNames is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.html.core/@dot" />
-                    <source_context
-                        sourceEnd="32"
-                        sourceStart="4"
-                        value="if (HTMLCorePreferenceNames.SPACE.equals(preferences.getString(HTMLCorePreferenceNames.INDENTATION_CHAR)))" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.html.core.internal.preferences.HTMLCorePreferenceNames" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="6251"
-                    charStart="6247"
-                    id="DiscouragedReference"
-                    line="182"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The field SPACE from the type HTMLCorePreferenceNames is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.html.core/@dot" />
-                    <source_context
-                        sourceEnd="32"
-                        sourceStart="28"
-                        value="if (HTMLCorePreferenceNames.SPACE.equals(preferences.getString(HTMLCorePreferenceNames.INDENTATION_CHAR)))" />
-                    <arguments>
-                        <argument value="SPACE" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="6321"
-                    charStart="6282"
-                    id="DiscouragedReference"
-                    line="182"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type HTMLCorePreferenceNames is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.html.core/@dot" />
-                    <source_context
-                        sourceEnd="102"
-                        sourceStart="63"
-                        value="if (HTMLCorePreferenceNames.SPACE.equals(preferences.getString(HTMLCorePreferenceNames.INDENTATION_CHAR)))" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.html.core.internal.preferences.HTMLCorePreferenceNames" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="6321"
-                    charStart="6306"
-                    id="DiscouragedReference"
-                    line="182"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The field INDENTATION_CHAR from the type HTMLCorePreferenceNames is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.html.core/@dot" />
-                    <source_context
-                        sourceEnd="102"
-                        sourceStart="87"
-                        value="if (HTMLCorePreferenceNames.SPACE.equals(preferences.getString(HTMLCorePreferenceNames.INDENTATION_CHAR)))" />
-                    <arguments>
-                        <argument value="INDENTATION_CHAR" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="6395"
-                    charStart="6356"
-                    id="DiscouragedReference"
-                    line="183"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type HTMLCorePreferenceNames is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.html.core/@dot" />
-                    <source_context
-                        sourceEnd="66"
-                        sourceStart="27"
-                        value="width = preferences.getInt(HTMLCorePreferenceNames.INDENTATION_SIZE);" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.html.core.internal.preferences.HTMLCorePreferenceNames" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="6395"
-                    charStart="6380"
-                    id="DiscouragedReference"
-                    line="183"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The field INDENTATION_SIZE from the type HTMLCorePreferenceNames is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.html.core/@dot" />
-                    <source_context
-                        sourceEnd="66"
-                        sourceStart="51"
-                        value="width = preferences.getInt(HTMLCorePreferenceNames.INDENTATION_SIZE);" />
-                    <arguments>
-                        <argument value="INDENTATION_SIZE" />
-                    </arguments>
-                </problem>
-            </problems>
-            <classfile
-                path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/temp.folder/@dot.bin/org/eclipse/jst/jsp/ui/internal/autoedit/AutoEditStrategyForTabs.class" />
-        </source>
-        <source
-            output="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/temp.folder/@dot.bin"
-            package="org/eclipse/jst/jsp/ui/internal/autoedit"
-            path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/autoedit/StructuredAutoEditStrategyJSP.java">
-            <problems
-                errors="0"
-                problems="13"
-                warnings="13">
-                <problem
-                    charEnd="1196"
-                    charStart="1135"
-                    id="DiscouragedReference"
-                    line="25"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type IStructuredModel is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="68"
-                        sourceStart="7"
-                        value="import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.core.internal.provisional.IStructuredModel" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="1268"
-                    charStart="1206"
-                    id="DiscouragedReference"
-                    line="26"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type IDOMNode is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot" />
-                    <source_context
-                        sourceEnd="69"
-                        sourceStart="7"
-                        value="import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="1653"
-                    charStart="1638"
-                    id="DiscouragedReference"
-                    line="34"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type IStructuredModel is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="15"
-                        sourceStart="0"
-                        value="IStructuredModel model = null;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.core.internal.provisional.IStructuredModel" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="1761"
-                    charStart="1688"
-                    id="DiscouragedReference"
-                    line="36"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The method getExistingModelForRead(IDocument) from the type IModelManager is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="81"
-                        sourceStart="8"
-                        value="model = StructuredModelManager.getModelManager().getExistingModelForRead(document);" />
-                    <arguments>
-                        <argument
-                            value="getExistingModelForRead(IDocument)" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="1917"
-                    charStart="1910"
-                    id="DiscouragedReference"
-                    line="42"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type IDOMNode is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot" />
-                    <source_context
-                        sourceEnd="7"
-                        sourceStart="0"
-                        value="IDOMNode node = (IDOMNode) model.getIndexedRegion(command.offset);" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="1934"
-                    charStart="1927"
-                    id="DiscouragedReference"
-                    line="42"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type IDOMNode is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot" />
-                    <source_context
-                        sourceEnd="24"
-                        sourceStart="17"
-                        value="IDOMNode node = (IDOMNode) model.getIndexedRegion(command.offset);" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="1974"
-                    charStart="1937"
-                    id="DiscouragedReference"
-                    line="42"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The method getIndexedRegion(int) from the type IStructuredModel is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="64"
-                        sourceStart="27"
-                        value="IDOMNode node = (IDOMNode) model.getIndexedRegion(command.offset);" />
-                    <arguments>
-                        <argument value="getIndexedRegion(int)" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="2050"
-                    charStart="2035"
-                    id="DiscouragedReference"
-                    line="43"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The method getSource() from the type IDOMNode is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot" />
-                    <source_context
-                        sourceEnd="67"
-                        sourceStart="52"
-                        value="if (prefixedWith(document, command.offset, &quot;&lt;&quot;) &amp;&amp; !node.getSource().endsWith(&quot;%&gt;&quot;)) { //$NON-NLS-1$ //$NON-NLS-2$" />
-                    <arguments>
-                        <argument value="getSource()" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="2335"
-                    charStart="2328"
-                    id="DiscouragedReference"
-                    line="51"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type IDOMNode is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot" />
-                    <source_context
-                        sourceEnd="7"
-                        sourceStart="0"
-                        value="IDOMNode node = (IDOMNode) model.getIndexedRegion(command.offset);" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="2352"
-                    charStart="2345"
-                    id="DiscouragedReference"
-                    line="51"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type IDOMNode is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot" />
-                    <source_context
-                        sourceEnd="24"
-                        sourceStart="17"
-                        value="IDOMNode node = (IDOMNode) model.getIndexedRegion(command.offset);" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="2392"
-                    charStart="2355"
-                    id="DiscouragedReference"
-                    line="51"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The method getIndexedRegion(int) from the type IStructuredModel is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="64"
-                        sourceStart="27"
-                        value="IDOMNode node = (IDOMNode) model.getIndexedRegion(command.offset);" />
-                    <arguments>
-                        <argument value="getIndexedRegion(int)" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="2554"
-                    charStart="2539"
-                    id="DiscouragedReference"
-                    line="53"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The method getSource() from the type IDOMNode is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot" />
-                    <source_context
-                        sourceEnd="16"
-                        sourceStart="1"
-                        value="!node.getSource().endsWith(&quot;}&quot;)) { //$NON-NLS-1$ //$NON-NLS-2$" />
-                    <arguments>
-                        <argument value="getSource()" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="2848"
-                    charStart="2826"
-                    id="DiscouragedReference"
-                    line="65"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The method releaseFromRead() from the type IStructuredModel is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="22"
-                        sourceStart="0"
-                        value="model.releaseFromRead();" />
-                    <arguments>
-                        <argument value="releaseFromRead()" />
-                    </arguments>
-                </problem>
-            </problems>
-            <classfile
-                path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/temp.folder/@dot.bin/org/eclipse/jst/jsp/ui/internal/autoedit/StructuredAutoEditStrategyJSP.class" />
-        </source>
-        <source
-            output="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/temp.folder/@dot.bin"
-            package="org/eclipse/jst/jsp/ui/internal/breakpointproviders"
-            path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/breakpointproviders/AbstractBreakpointProvider.java">
-            <problems
-                errors="0"
-                problems="61"
-                warnings="61">
-                <problem
-                    charEnd="1114"
-                    charStart="1053"
-                    id="DiscouragedReference"
-                    line="21"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type IStructuredModel is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="68"
-                        sourceStart="7"
-                        value="import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.core.internal.provisional.IStructuredModel" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="1182"
-                    charStart="1124"
-                    id="DiscouragedReference"
-                    line="22"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type IndexedRegion is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="65"
-                        sourceStart="7"
-                        value="import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.core.internal.provisional.IndexedRegion" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="1261"
-                    charStart="1192"
-                    id="DiscouragedReference"
-                    line="23"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type IStructuredDocument is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="76"
-                        sourceStart="7"
-                        value="import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="1346"
-                    charStart="1271"
-                    id="DiscouragedReference"
-                    line="24"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type IStructuredDocumentRegion is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="82"
-                        sourceStart="7"
-                        value="import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="1417"
-                    charStart="1356"
-                    id="DiscouragedReference"
-                    line="25"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type ITextRegion is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="68"
-                        sourceStart="7"
-                        value="import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="1498"
-                    charStart="1427"
-                    id="DiscouragedReference"
-                    line="26"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type ITextRegionCollection is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="78"
-                        sourceStart="7"
-                        value="import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionCollection;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionCollection" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="1573"
-                    charStart="1508"
-                    id="DiscouragedReference"
-                    line="27"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type ITextRegionList is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="72"
-                        sourceStart="7"
-                        value="import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="1660"
-                    charStart="1583"
-                    id="DiscouragedReference"
-                    line="28"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type ISourceEditingTextTools is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="84"
-                        sourceStart="7"
-                        value="import org.eclipse.wst.sse.ui.internal.provisional.extensions.ISourceEditingTextTools;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.ui.internal.provisional.extensions.ISourceEditingTextTools" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="1754"
-                    charStart="1670"
-                    id="DiscouragedReference"
-                    line="29"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type IBreakpointProvider is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="91"
-                        sourceStart="7"
-                        value="import org.eclipse.wst.sse.ui.internal.provisional.extensions.breakpoint.IBreakpointProvider;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.ui.internal.provisional.extensions.breakpoint.IBreakpointProvider" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="1830"
-                    charStart="1764"
-                    id="DiscouragedReference"
-                    line="30"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type CMElementDeclaration is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot" />
-                    <source_context
-                        sourceEnd="73"
-                        sourceStart="7"
-                        value="import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="1892"
-                    charStart="1840"
-                    id="DiscouragedReference"
-                    line="31"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type CMNode is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot" />
-                    <source_context
-                        sourceEnd="59"
-                        sourceStart="7"
-                        value="import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.xml.core.internal.contentmodel.CMNode" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="1969"
-                    charStart="1902"
-                    id="DiscouragedReference"
-                    line="32"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type ModelQuery is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot" />
-                    <source_context
-                        sourceEnd="74"
-                        sourceStart="7"
-                        value="import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="2037"
-                    charStart="1979"
-                    id="DiscouragedReference"
-                    line="33"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type ModelQueryUtil is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot" />
-                    <source_context
-                        sourceEnd="65"
-                        sourceStart="7"
-                        value="import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="2118"
-                    charStart="2047"
-                    id="DiscouragedReference"
-                    line="34"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type CMNodeWrapper is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot" />
-                    <source_context
-                        sourceEnd="78"
-                        sourceStart="7"
-                        value="import org.eclipse.wst.xml.core.internal.provisional.contentmodel.CMNodeWrapper;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.xml.core.internal.provisional.contentmodel.CMNodeWrapper" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="2194"
-                    charStart="2128"
-                    id="DiscouragedReference"
-                    line="35"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type IDOMDocument is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot" />
-                    <source_context
-                        sourceEnd="73"
-                        sourceStart="7"
-                        value="import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="2261"
-                    charStart="2204"
-                    id="DiscouragedReference"
-                    line="36"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type DOMRegionContext is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot" />
-                    <source_context
-                        sourceEnd="64"
-                        sourceStart="7"
-                        value="import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.xml.core.internal.regions.DOMRegionContext" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="2340"
-                    charStart="2271"
-                    id="DiscouragedReference"
-                    line="37"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type IDOMSourceEditingTextTools is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.ui/@dot" />
-                    <source_context
-                        sourceEnd="76"
-                        sourceStart="7"
-                        value="import org.eclipse.wst.xml.ui.internal.provisional.IDOMSourceEditingTextTools;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.xml.ui.internal.provisional.IDOMSourceEditingTextTools" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="2794"
-                    charStart="2776"
-                    id="DiscouragedReference"
-                    line="51"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type IBreakpointProvider is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="78"
-                        sourceStart="60"
-                        value="public abstract class AbstractBreakpointProvider implements IBreakpointProvider {" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.ui.internal.provisional.extensions.breakpoint.IBreakpointProvider" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="4921"
-                    charStart="4906"
-                    id="DiscouragedReference"
-                    line="107"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type IStructuredModel is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="57"
-                        sourceStart="42"
-                        value="private static int getValidRegionPosition(IStructuredModel model, ITextRegionCollection regionContainer, int startOffset, int endOffset) {" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.core.internal.provisional.IStructuredModel" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="4950"
-                    charStart="4930"
-                    id="DiscouragedReference"
-                    line="107"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type ITextRegionCollection is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="86"
-                        sourceStart="66"
-                        value="private static int getValidRegionPosition(IStructuredModel model, ITextRegionCollection regionContainer, int startOffset, int endOffset) {" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionCollection" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="5020"
-                    charStart="5006"
-                    id="DiscouragedReference"
-                    line="109"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type ITextRegionList is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="14"
-                        sourceStart="0"
-                        value="ITextRegionList regions = regionContainer.getRegions();" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="5059"
-                    charStart="5032"
-                    id="DiscouragedReference"
-                    line="109"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The method getRegions() from the type ITextRegionCollection is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="53"
-                        sourceStart="26"
-                        value="ITextRegionList regions = regionContainer.getRegions();" />
-                    <arguments>
-                        <argument value="getRegions()" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="5097"
-                    charStart="5084"
-                    id="DiscouragedReference"
-                    line="110"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The method size() from the type ITextRegionList is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="33"
-                        sourceStart="20"
-                        value="for (int i = 0; i &lt; regions.size(); i++) {" />
-                    <arguments>
-                        <argument value="size()" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="5120"
-                    charStart="5110"
-                    id="DiscouragedReference"
-                    line="111"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type ITextRegion is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="10"
-                        sourceStart="0"
-                        value="ITextRegion region = regions.get(i);" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="5144"
-                    charStart="5131"
-                    id="DiscouragedReference"
-                    line="111"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The method get(int) from the type ITextRegionList is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="34"
-                        sourceStart="21"
-                        value="ITextRegion region = regions.get(i);" />
-                    <arguments>
-                        <argument value="get(int)" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="5192"
-                    charStart="5172"
-                    id="DiscouragedReference"
-                    line="112"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type ITextRegionCollection is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="42"
-                        sourceStart="22"
-                        value="if (region instanceof ITextRegionCollection) {" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionCollection" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="5272"
-                    charStart="5252"
-                    id="DiscouragedReference"
-                    line="113"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type ITextRegionCollection is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="71"
-                        sourceStart="51"
-                        value="int validPosition = getValidRegionPosition(model, (ITextRegionCollection) region, startOffset, endOffset);" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionCollection" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="5511"
-                    charStart="5476"
-                    id="DiscouragedReference"
-                    line="119"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The method getEndOffset(ITextRegion) from the type ITextRegionCollection is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="39"
-                        sourceStart="4"
-                        value="if (regionContainer.getEndOffset(region) &gt; startOffset) {" />
-                    <arguments>
-                        <argument value="getEndOffset(ITextRegion)" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="5597"
-                    charStart="5560"
-                    id="DiscouragedReference"
-                    line="121"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The method getStartOffset(ITextRegion) from the type ITextRegionCollection is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="61"
-                        sourceStart="24"
-                        value="int regionStartOffset = regionContainer.getStartOffset(region);" />
-                    <arguments>
-                        <argument value="getStartOffset(ITextRegion)" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="5912"
-                    charStart="5897"
-                    id="DiscouragedReference"
-                    line="130"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The method getType() from the type ITextRegion is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="19"
-                        sourceStart="4"
-                        value="if (region.getType().equals(DOMJSPRegionContexts.JSP_CONTENT)) {" />
-                    <arguments>
-                        <argument value="getType()" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="6978"
-                    charStart="6963"
-                    id="DiscouragedReference"
-                    line="159"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The method getType() from the type ITextRegion is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="24"
-                        sourceStart="9"
-                        value="else if (region.getType().equals(DOMRegionContext.XML_TAG_NAME) &amp;&amp; (isCustomTagRegion(model.getIndexedRegion(regionStartOffset)) || regionContainer.getText(region).equals(JSP12Namespace.ElementName.USEBEAN) || regionContainer.getText(region).equals(JSP12Namespace.ElementName.GETPROPERTY) || regionContainer.getText(region).equals(JSP12Namespace.ElementName.SETPROPERTY))) {" />
-                    <arguments>
-                        <argument value="getType()" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="7015"
-                    charStart="6987"
-                    id="DiscouragedReference"
-                    line="159"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type DOMRegionContext is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot" />
-                    <source_context
-                        sourceEnd="61"
-                        sourceStart="33"
-                        value="else if (region.getType().equals(DOMRegionContext.XML_TAG_NAME) &amp;&amp; (isCustomTagRegion(model.getIndexedRegion(regionStartOffset)) || regionContainer.getText(region).equals(JSP12Namespace.ElementName.USEBEAN) || regionContainer.getText(region).equals(JSP12Namespace.ElementName.GETPROPERTY) || regionContainer.getText(region).equals(JSP12Namespace.ElementName.SETPROPERTY))) {" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.xml.core.internal.regions.DOMRegionContext" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="7015"
-                    charStart="7004"
-                    id="DiscouragedReference"
-                    line="159"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The field XML_TAG_NAME from the type DOMRegionContext is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot" />
-                    <source_context
-                        sourceEnd="61"
-                        sourceStart="50"
-                        value="else if (region.getType().equals(DOMRegionContext.XML_TAG_NAME) &amp;&amp; (isCustomTagRegion(model.getIndexedRegion(regionStartOffset)) || regionContainer.getText(region).equals(JSP12Namespace.ElementName.USEBEAN) || regionContainer.getText(region).equals(JSP12Namespace.ElementName.GETPROPERTY) || regionContainer.getText(region).equals(JSP12Namespace.ElementName.SETPROPERTY))) {" />
-                    <arguments>
-                        <argument value="XML_TAG_NAME" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="7080"
-                    charStart="7040"
-                    id="DiscouragedReference"
-                    line="159"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The method getIndexedRegion(int) from the type IStructuredModel is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="126"
-                        sourceStart="86"
-                        value="else if (region.getType().equals(DOMRegionContext.XML_TAG_NAME) &amp;&amp; (isCustomTagRegion(model.getIndexedRegion(regionStartOffset)) || regionContainer.getText(region).equals(JSP12Namespace.ElementName.USEBEAN) || regionContainer.getText(region).equals(JSP12Namespace.ElementName.GETPROPERTY) || regionContainer.getText(region).equals(JSP12Namespace.ElementName.SETPROPERTY))) {" />
-                    <arguments>
-                        <argument value="getIndexedRegion(int)" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="7116"
-                    charStart="7086"
-                    id="DiscouragedReference"
-                    line="159"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The method getText(ITextRegion) from the type ITextRegionCollection is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="162"
-                        sourceStart="132"
-                        value="else if (region.getType().equals(DOMRegionContext.XML_TAG_NAME) &amp;&amp; (isCustomTagRegion(model.getIndexedRegion(regionStartOffset)) || regionContainer.getText(region).equals(JSP12Namespace.ElementName.USEBEAN) || regionContainer.getText(region).equals(JSP12Namespace.ElementName.GETPROPERTY) || regionContainer.getText(region).equals(JSP12Namespace.ElementName.SETPROPERTY))) {" />
-                    <arguments>
-                        <argument value="getText(ITextRegion)" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="7194"
-                    charStart="7164"
-                    id="DiscouragedReference"
-                    line="159"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The method getText(ITextRegion) from the type ITextRegionCollection is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="240"
-                        sourceStart="210"
-                        value="else if (region.getType().equals(DOMRegionContext.XML_TAG_NAME) &amp;&amp; (isCustomTagRegion(model.getIndexedRegion(regionStartOffset)) || regionContainer.getText(region).equals(JSP12Namespace.ElementName.USEBEAN) || regionContainer.getText(region).equals(JSP12Namespace.ElementName.GETPROPERTY) || regionContainer.getText(region).equals(JSP12Namespace.ElementName.SETPROPERTY))) {" />
-                    <arguments>
-                        <argument value="getText(ITextRegion)" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="7276"
-                    charStart="7246"
-                    id="DiscouragedReference"
-                    line="159"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The method getText(ITextRegion) from the type ITextRegionCollection is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="322"
-                        sourceStart="292"
-                        value="else if (region.getType().equals(DOMRegionContext.XML_TAG_NAME) &amp;&amp; (isCustomTagRegion(model.getIndexedRegion(regionStartOffset)) || regionContainer.getText(region).equals(JSP12Namespace.ElementName.USEBEAN) || regionContainer.getText(region).equals(JSP12Namespace.ElementName.GETPROPERTY) || regionContainer.getText(region).equals(JSP12Namespace.ElementName.SETPROPERTY))) {" />
-                    <arguments>
-                        <argument value="getText(ITextRegion)" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="7665"
-                    charStart="7653"
-                    id="DiscouragedReference"
-                    line="171"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type IndexedRegion is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="12"
-                        sourceStart="0"
-                        value="IndexedRegion node = model.getIndexedRegion(regionStartOffset);" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.core.internal.provisional.IndexedRegion" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="7714"
-                    charStart="7674"
-                    id="DiscouragedReference"
-                    line="171"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The method getIndexedRegion(int) from the type IStructuredModel is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="61"
-                        sourceStart="21"
-                        value="IndexedRegion node = model.getIndexedRegion(regionStartOffset);" />
-                    <arguments>
-                        <argument value="getIndexedRegion(int)" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="8577"
-                    charStart="8565"
-                    id="DiscouragedReference"
-                    line="193"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type IndexedRegion is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="53"
-                        sourceStart="41"
-                        value="private static boolean isCustomTagRegion(IndexedRegion node) {" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.core.internal.provisional.IndexedRegion" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="8673"
-                    charStart="8664"
-                    id="DiscouragedReference"
-                    line="197"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type ModelQuery is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot" />
-                    <source_context
-                        sourceEnd="9"
-                        sourceStart="0"
-                        value="ModelQuery mq = ModelQueryUtil.getModelQuery(xmlElement.getOwnerDocument());" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="8693"
-                    charStart="8680"
-                    id="DiscouragedReference"
-                    line="197"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type ModelQueryUtil is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot" />
-                    <source_context
-                        sourceEnd="29"
-                        sourceStart="16"
-                        value="ModelQuery mq = ModelQueryUtil.getModelQuery(xmlElement.getOwnerDocument());" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="8738"
-                    charStart="8680"
-                    id="DiscouragedReference"
-                    line="197"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The method getModelQuery(Document) from the type ModelQueryUtil is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot" />
-                    <source_context
-                        sourceEnd="74"
-                        sourceStart="16"
-                        value="ModelQuery mq = ModelQueryUtil.getModelQuery(xmlElement.getOwnerDocument());" />
-                    <arguments>
-                        <argument value="getModelQuery(Document)" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="8763"
-                    charStart="8744"
-                    id="DiscouragedReference"
-                    line="198"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type CMElementDeclaration is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot" />
-                    <source_context
-                        sourceEnd="19"
-                        sourceStart="0"
-                        value="CMElementDeclaration decl = mq.getCMElementDeclaration(xmlElement);" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="8809"
-                    charStart="8772"
-                    id="DiscouragedReference"
-                    line="198"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The method getCMElementDeclaration(Element) from the type ModelQuery is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot" />
-                    <source_context
-                        sourceEnd="65"
-                        sourceStart="28"
-                        value="CMElementDeclaration decl = mq.getCMElementDeclaration(xmlElement);" />
-                    <arguments>
-                        <argument
-                            value="getCMElementDeclaration(Element)" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="8847"
-                    charStart="8835"
-                    id="DiscouragedReference"
-                    line="199"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type CMNodeWrapper is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot" />
-                    <source_context
-                        sourceEnd="32"
-                        sourceStart="20"
-                        value="if (decl instanceof CMNodeWrapper) {" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.xml.core.internal.provisional.contentmodel.CMNodeWrapper" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="8861"
-                    charStart="8856"
-                    id="DiscouragedReference"
-                    line="200"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type CMNode is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot" />
-                    <source_context
-                        sourceEnd="5"
-                        sourceStart="0"
-                        value="CMNode cmNode = ((CMNodeWrapper) decl).getOriginNode();" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.xml.core.internal.contentmodel.CMNode" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="8909"
-                    charStart="8872"
-                    id="DiscouragedReference"
-                    line="200"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The method getOriginNode() from the type CMNodeWrapper is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot" />
-                    <source_context
-                        sourceEnd="53"
-                        sourceStart="16"
-                        value="CMNode cmNode = ((CMNodeWrapper) decl).getOriginNode();" />
-                    <arguments>
-                        <argument value="getOriginNode()" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="8886"
-                    charStart="8874"
-                    id="DiscouragedReference"
-                    line="200"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type CMNodeWrapper is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot" />
-                    <source_context
-                        sourceEnd="30"
-                        sourceStart="18"
-                        value="CMNode cmNode = ((CMNodeWrapper) decl).getOriginNode();" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.xml.core.internal.provisional.contentmodel.CMNodeWrapper" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="9024"
-                    charStart="9002"
-                    id="DiscouragedReference"
-                    line="207"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type ISourceEditingTextTools is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="30"
-                        sourceStart="8"
-                        value="private ISourceEditingTextTools fSourceEditingTextTools;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.ui.internal.provisional.extensions.ISourceEditingTextTools" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="9329"
-                    charStart="9307"
-                    id="DiscouragedReference"
-                    line="218"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type ISourceEditingTextTools is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="29"
-                        sourceStart="7"
-                        value="public ISourceEditingTextTools getSourceEditingTextTools() {" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.ui.internal.provisional.extensions.ISourceEditingTextTools" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="9537"
-                    charStart="9512"
-                    id="DiscouragedReference"
-                    line="223"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type IDOMSourceEditingTextTools is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.ui/@dot" />
-                    <source_context
-                        sourceEnd="70"
-                        sourceStart="45"
-                        value="if (!(getSourceEditingTextTools() instanceof IDOMSourceEditingTextTools)) {" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.xml.ui.internal.provisional.IDOMSourceEditingTextTools" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="10289"
-                    charStart="10265"
-                    id="DiscouragedReference"
-                    line="248"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type IStructuredDocumentRegion is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="24"
-                        sourceStart="0"
-                        value="IStructuredDocumentRegion flatNode = ((IStructuredDocument) idoc).getRegionAtCharacterOffset(startOffset);" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="10369"
-                    charStart="10302"
-                    id="DiscouragedReference"
-                    line="248"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The method getRegionAtCharacterOffset(int) from the type IStructuredDocument is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="104"
-                        sourceStart="37"
-                        value="IStructuredDocumentRegion flatNode = ((IStructuredDocument) idoc).getRegionAtCharacterOffset(startOffset);" />
-                    <arguments>
-                        <argument
-                            value="getRegionAtCharacterOffset(int)" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="10322"
-                    charStart="10304"
-                    id="DiscouragedReference"
-                    line="248"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type IStructuredDocument is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="57"
-                        sourceStart="39"
-                        value="IStructuredDocumentRegion flatNode = ((IStructuredDocument) idoc).getRegionAtCharacterOffset(startOffset);" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="10648"
-                    charStart="10546"
-                    id="DiscouragedReference"
-                    line="252"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The method getModel() from the type IDOMNode is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot" />
-                    <source_context
-                        sourceEnd="145"
-                        sourceStart="43"
-                        value="int validPosition = getValidRegionPosition(((IDOMDocument) ((IDOMSourceEditingTextTools) getSourceEditingTextTools()).getDOMDocument()).getModel(), flatNode, startOffset, endOffset);" />
-                    <arguments>
-                        <argument value="getModel()" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="10559"
-                    charStart="10548"
-                    id="DiscouragedReference"
-                    line="252"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type IDOMDocument is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.core/@dot" />
-                    <source_context
-                        sourceEnd="56"
-                        sourceStart="45"
-                        value="int validPosition = getValidRegionPosition(((IDOMDocument) ((IDOMSourceEditingTextTools) getSourceEditingTextTools()).getDOMDocument()).getModel(), flatNode, startOffset, endOffset);" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="10636"
-                    charStart="10562"
-                    id="DiscouragedReference"
-                    line="252"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The method getDOMDocument() from the type IDOMSourceEditingTextTools is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.ui/@dot" />
-                    <source_context
-                        sourceEnd="133"
-                        sourceStart="59"
-                        value="int validPosition = getValidRegionPosition(((IDOMDocument) ((IDOMSourceEditingTextTools) getSourceEditingTextTools()).getDOMDocument()).getModel(), flatNode, startOffset, endOffset);" />
-                    <arguments>
-                        <argument value="getDOMDocument()" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="10589"
-                    charStart="10564"
-                    id="DiscouragedReference"
-                    line="252"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type IDOMSourceEditingTextTools is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.ui/@dot" />
-                    <source_context
-                        sourceEnd="86"
-                        sourceStart="61"
-                        value="int validPosition = getValidRegionPosition(((IDOMDocument) ((IDOMSourceEditingTextTools) getSourceEditingTextTools()).getDOMDocument()).getModel(), flatNode, startOffset, endOffset);" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.xml.ui.internal.provisional.IDOMSourceEditingTextTools" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="10839"
-                    charStart="10822"
-                    id="DiscouragedReference"
-                    line="260"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The method getNext() from the type IStructuredDocumentRegion is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="28"
-                        sourceStart="11"
-                        value="flatNode = flatNode.getNext();" />
-                    <arguments>
-                        <argument value="getNext()" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="10938"
-                    charStart="10916"
-                    id="DiscouragedReference"
-                    line="265"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type ISourceEditingTextTools is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.ui/@dot" />
-                    <source_context
-                        sourceEnd="60"
-                        sourceStart="38"
-                        value="public void setSourceEditingTextTools(ISourceEditingTextTools sourceEditingTextTools) {" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.ui.internal.provisional.extensions.ISourceEditingTextTools" />
-                    </arguments>
-                </problem>
-            </problems>
-            <classfile
-                path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/temp.folder/@dot.bin/org/eclipse/jst/jsp/ui/internal/breakpointproviders/AbstractBreakpointProvider.class" />
-        </source>
-        <source
-            output="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/temp.folder/@dot.bin"
-            package="org/eclipse/jst/jsp/ui/internal/breakpointproviders"
-            path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/breakpointproviders/JavaBreakpointProvider.java">
-            <problems
-                errors="0"
-                problems="4"
-                warnings="4">
-                <problem
-                    charEnd="1158"
-                    charStart="1089"
-                    id="DiscouragedReference"
-                    line="24"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type IDOMSourceEditingTextTools is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.ui/@dot" />
-                    <source_context
-                        sourceEnd="76"
-                        sourceStart="7"
-                        value="import org.eclipse.wst.xml.ui.internal.provisional.IDOMSourceEditingTextTools;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.xml.ui.internal.provisional.IDOMSourceEditingTextTools" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="2815"
-                    charStart="2790"
-                    id="DiscouragedReference"
-                    line="76"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type IDOMSourceEditingTextTools is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.ui/@dot" />
-                    <source_context
-                        sourceEnd="68"
-                        sourceStart="43"
-                        value="if (getSourceEditingTextTools() instanceof IDOMSourceEditingTextTools) {" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.xml.ui.internal.provisional.IDOMSourceEditingTextTools" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="2903"
-                    charStart="2829"
-                    id="DiscouragedReference"
-                    line="77"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The method getDOMDocument() from the type IDOMSourceEditingTextTools is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.ui/@dot" />
-                    <source_context
-                        sourceEnd="80"
-                        sourceStart="6"
-                        value="doc = ((IDOMSourceEditingTextTools) getSourceEditingTextTools()).getDOMDocument();" />
-                    <arguments>
-                        <argument value="getDOMDocument()" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="2856"
-                    charStart="2831"
-                    id="DiscouragedReference"
-                    line="77"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type IDOMSourceEditingTextTools is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.xml.ui/@dot" />
-                    <source_context
-                        sourceEnd="33"
-                        sourceStart="8"
-                        value="doc = ((IDOMSourceEditingTextTools) getSourceEditingTextTools()).getDOMDocument();" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.xml.ui.internal.provisional.IDOMSourceEditingTextTools" />
-                    </arguments>
-                </problem>
-            </problems>
-            <classfile
-                path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/temp.folder/@dot.bin/org/eclipse/jst/jsp/ui/internal/breakpointproviders/JavaBreakpointProvider.class" />
-        </source>
-        <source
-            output="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/temp.folder/@dot.bin"
-            package="org/eclipse/jst/jsp/ui/internal/breakpointproviders"
-            path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/breakpointproviders/JavaScriptBreakpointProvider.java">
-            <classfile
-                path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/temp.folder/@dot.bin/org/eclipse/jst/jsp/ui/internal/breakpointproviders/JavaScriptBreakpointProvider.class" />
-        </source>
-        <source
-            output="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/temp.folder/@dot.bin"
-            package="org/eclipse/jst/jsp/ui/internal/wizard"
-            path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/wizard/NewJSPWizard.java">
-            <problems
-                errors="0"
-                problems="3"
-                warnings="3">
-                <problem
-                    charEnd="1578"
-                    charStart="1507"
-                    id="DiscouragedReference"
-                    line="34"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type CommonEncodingPreferenceNames is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="78"
-                        sourceStart="7"
-                        value="import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames;" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="3962"
-                    charStart="3919"
-                    id="DiscouragedReference"
-                    line="99"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The type CommonEncodingPreferenceNames is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="81"
-                        sourceStart="38"
-                        value="String charSet = preference.getString(CommonEncodingPreferenceNames.OUTPUT_CODESET);" />
-                    <arguments>
-                        <argument
-                            value="org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames" />
-                    </arguments>
-                </problem>
-                <problem
-                    charEnd="3962"
-                    charStart="3949"
-                    id="DiscouragedReference"
-                    line="99"
-                    severity="WARNING">
-                    <message
-                        value="Discouraged access: The field OUTPUT_CODESET from the type CommonEncodingPreferenceNames is not accessible due to restriction on classpath entry /home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.wst.sse.core/@dot" />
-                    <source_context
-                        sourceEnd="81"
-                        sourceStart="68"
-                        value="String charSet = preference.getString(CommonEncodingPreferenceNames.OUTPUT_CODESET);" />
-                    <arguments>
-                        <argument value="OUTPUT_CODESET" />
-                    </arguments>
-                </problem>
-            </problems>
-            <classfile
-                path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/temp.folder/@dot.bin/org/eclipse/jst/jsp/ui/internal/wizard/NewJSPWizard$1.class" />
-            <classfile
-                path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/temp.folder/@dot.bin/org/eclipse/jst/jsp/ui/internal/wizard/NewJSPWizard.class" />
-        </source>
-        <source
-            output="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/temp.folder/@dot.bin"
-            package="org/eclipse/jst/jsp/ui/views/contentoutline"
-            path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/views/contentoutline/JSPContentOutlineConfiguration.java">
-            <classfile
-                path="/home/shared/webtools/build-wtp-R2.0-S/workdir/plugins/org.eclipse.jst.jsp.ui/temp.folder/@dot.bin/org/eclipse/jst/jsp/ui/views/contentoutline/JSPContentOutlineConfiguration.class" />
-        </source>
-    </sources>
-    <stats>
-        <problem_summary
-            errors="0"
-            problems="1826"
-            tasks="0"
-            warnings="1826" />
-        <number_of_classfiles value="179" />
-    </stats>
-</compiler>
diff --git a/releng.wtpbuilder/distribution/wtp.site/publish.xml b/releng.wtpbuilder/distribution/wtp.site/publish.xml
deleted file mode 100644
index e9210f2..0000000
--- a/releng.wtpbuilder/distribution/wtp.site/publish.xml
+++ /dev/null
@@ -1,767 +0,0 @@
-<project
-    name="Publish Build"
-    default="default"
-    basedir=".">
-    <!--
-        Properties that must be passed to this script: buildDirectory:
-        Path to perform the build in. (A working directory) buildType:
-        Type of build (nightly, integration etc.) buildId: Build name
-        buildLabel: <buildType>-<buildName>-<timestamp>
-    -->
-    <property
-        environment="env"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be provided to publish"/>
-    <fail
-        unless="buildLabel"
-        message="buildLabel must be provided to publish"/>
-    <fail
-        unless="wtp.builder.home"
-        message="wtp.builder.home must be provided to publish"/>
-    <fail
-        unless="build.distribution"
-        message="build.distribution must be provided to publish"/>
-    <property
-        name="resultDir"
-        value="${buildDirectory}/${buildLabel}"/>
-    <!--name of generated index page-->
-    <property
-        name="indexFileName"
-        value="index.php"/>
-    <property
-        name="templateDir"
-        value="${wtp.builder.home}/distribution/${build.distribution}.site"/>
-    <property
-        name="resultingIndex"
-        value="${resultDir}/${indexFileName}"/>
-    <echo
-        level="debug"
-        message="resultDir: ${resultDir}"/>
-    <echo
-        level="debug"
-        message="templateDir: ${templateDir}"/>
-    <echo
-        level="debug"
-        message="resultingIndex: ${resultingIndex}"/>
-	
-	
-	        <property name="env.DEP_DIR" value="" />
-	        
-	        <property
-	            name="dependency.properties"
-	            value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-
-	       <available 
-	          file="${dependency.properties}" 
-	          property="dependency.properties.exists"/>
-	       <fail 
-	          message="dependency file not found: ${dependency.properties}" 
-	          unless="dependency.properties.exists"/>
-	
-	        <echo message="dependency file: ${dependency.properties}" />
-	        <property file="${dependency.properties}" />
-	
-	
-    <target
-        name="default">
-        <copy
-            overwrite="true"
-            file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/${indexTemplateFilename}"
-            tofile="${resultingIndex}"/>
-        <antcall
-            target="countFiles"/>
-        <antcall
-            target="generateCompileIndex"/>
-        <antcall
-            target="generateJUnitTestsIndex"/>
-        <antcall
-            target="getStaticFiles"/>
-    </target>
-    <target
-        name="generateCompileIndex">
-        <!--
-            <taskdef name="indexResults"
-            classname="org.eclipse.wtp.releng.tools.ResultsSummaryGenerator"
-            />
-        -->
-        <!--
-            isBuildTested: true|false should JUnit plugin test results
-            be used to generate index page dropTokenList: comma
-            separated list of strings which should be replaced by the
-            fileName attribute settings in the testManifest.xml.
-            xmlDirectoryName: path to directory containing JUnit plugin
-            test results in xml format (see doc is org.eclipse.test).
-            dropDirectoryName: path to directory containing the result
-            of the build. testResultsTemplateFileName: path to template
-            file used to generate page with links to JUnit test results
-            testResultsHtmlFileName: name of file which will be
-            generated with links to JUnit test results dropHtmlFileName:
-            name of generated index page hrefTestResultsTargetPath:
-            relative path from index page to directory containing JUnit
-            html test results hrefCompileLogsTargetPath: relative path
-            from index page directory containing compilelogs
-            testManifestFileName: name of xml file containing
-            descriptions of zip types and log files
-        -->
-       <!-- for this distribution, dependencies come from releng. 
-             assume no subdirectory, if not otherwise set (bug 285383).
-        -->
-        <property name="env.DEP_DIR" value="" />
-        
-        <property
-            name="dependency.properties"
-            value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-
-       <available 
-          file="${dependency.properties}" 
-          property="dependency.properties.exists"/>
-       <fail 
-          message="dependency file not found: ${dependency.properties}" 
-          unless="dependency.properties.exists"/>
-    	
-        <!-- create tables of test plugin compiles first -->
-        <antcall
-            target="generateTestCompileOutput">
-            <param
-                name="outputDirectory"
-                value="${resultDir}/testcompilelogs"/>
-        </antcall>
-
-        <!-- create table of code plugins compiles -->
-        <antcall
-            target="generateCompileOutput">
-            <param
-                name="outputDirectory"
-                value="${resultDir}/compilelogs"/>
-        </antcall>
-        <tstamp>
-            <format
-                property="TODAY"
-                pattern="MMMM d, yyyy"/>
-        </tstamp>
-
-        <!--  Insert Build Type descriptor  -->
-        <antcall
-            target="${buildType}"/>
-        <antcall
-            target="writeData"/>
-        <!--
-            Update timestamp on file to permit overwrite through Ant
-            copy task
-        -->
-        <touch
-            file="${resultingIndex}"/>
-    </target>
-    <target
-        name="generateTestCompileOutput"
-        depends="checkIfCompileLogs"
-        if="doCompileLogs">
-        <summarizeResults
-            isBuildTested="false"
-            includeAll="true"
-            dropTokenList="${dropTokenList}"
-            xmlDirectoryName=""
-            dropDirectoryName="${resultDir}"
-            testResultsTemplateFileName="${templateDir}/templateFiles/testCompileResults.php.template"
-            testResultsHtmlFileName="testCompileResults.php"
-            hrefTestResultsTargetPath=""
-            hrefCompileLogsTargetPath="testcompilelogs"
-            compileLogsDirectoryName="${outputDirectory}"/>
-        <antcall
-            target="compilerXMLToHTML"/>
-    </target>
-    <target
-        name="generateCompileOutput"
-        depends="checkIfCompileLogs"
-        if="doCompileLogs">
-        <summarizeResults
-            isBuildTested="false"
-            includeAll="true"
-            dropTokenList="${dropTokenList}"
-            xmlDirectoryName=""
-            dropDirectoryName="${resultDir}"
-            testResultsTemplateFileName="${templateDir}/templateFiles/compileResults.php.template"
-            testResultsHtmlFileName="compileResults.php"
-            hrefTestResultsTargetPath="testResults/html"
-            hrefCompileLogsTargetPath="compilelogs"
-            compileLogsDirectoryName="${outputDirectory}"/>
-        <antcall
-            target="compilerXMLToHTML"/>
-    </target>
-    <target
-        name="compilerXMLToHTML">
-        <xslt
-            basedir="${outputDirectory}"
-            destdir="${outputDirectory}"
-            includes="**/*.xml"
-            scanincludeddirectories="true"
-            style="compilerXMLOutputToHTML.xsl"
-            force="true"/>
-    </target>
-    <target
-        name="generateJUnitTestsIndex"
-        depends="checkIfTested"
-        if="doTests">
-        <!--
-            isBuildTested: true|false should JUnit plugin test results
-            be used to generate index page dropTokenList: comma
-            separated list of strings which should be replaced by the
-            fileName attribute settings in the testManifest.xml.
-            xmlDirectoryName: path to directory containing JUnit plugin
-            test results in xml format (see doc is org.eclipse.test).
-            dropDirectoryName: path to directory containing the result
-            of the build. testResultsTemplateFileName: path to template
-            file used to generate page with links to JUnit test results
-            testResultsHtmlFileName: name of file which will be
-            generated with links to JUnit test results dropHtmlFileName:
-            name of generated index page hrefTestResultsTargetPath:
-            relative path from index page to directory containing JUnit
-            html test results hrefCompileLogsTargetPath: relative path
-            from index page directory containing compilelogs
-            testManifestFileName: name of xml file containing
-            descriptions of zip types and log files
-        -->
-       <!-- for this distribution, dependencies come from releng. 
-             assume no subdirectory, if not otherwise set (bug 285383).
-        -->
-        <property name="env.DEP_DIR" value="" />
-        
-        <property
-            name="dependency.properties"
-            value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>    
-    	
-    	    <available 
-    	       file="${dependency.properties}" 
-    	       property="dependency.properties.exists"/>
-    	    <fail 
-    	       message="dependency file not found: ${dependency.properties}" 
-    	       unless="dependency.properties.exists"/>
-    	       	
-        <property
-            file="${dependencies.properties}"/>
-
-        <!-- create table of test plugin compiles first -->
-        <!-- set isBuildTested to true for the "compile only" results -->
-        <summarizeResults
-            isBuildTested="true"
-            dropTokenList="${dropTokenList}"
-            dropDirectoryName="${resultDir}"
-            xmlDirectoryName="${resultDir}/testResults/xml"
-            testResultsTemplateFileName="${templateDir}/templateFiles/testResults.php.template"
-            testResultsHtmlFileName="testResults.php"
-            hrefTestResultsTargetPath="testResults/html"
-            compileLogsDirectoryName=""/>
-        <tstamp>
-            <format
-                property="TODAY"
-                pattern="MMMM d, yyyy"/>
-        </tstamp>
-
-        <!--  Insert Build Type descriptor  -->
-        <antcall
-            target="${buildType}"/>
-        <antcall
-            target="writeData"/>
-        <!--
-            Update timestamp on file to permit overwrite through Ant
-            copy task
-        -->
-        <touch
-            file="${resultingIndex}"/>
-    </target>
-    <target
-        name="getStaticFiles">
-        <!--get static files required in the buildLabel directory-->
-        <copy
-            todir="${resultDir}">
-            <fileset
-                dir="${templateDir}/staticDropFiles"/>
-        </copy>
-
-        <!--copy buildnotes from plugin directories-->
-        <mkdir
-            dir="${resultDir}/buildnotes"/>
-        <copy
-            todir="${resultDir}/buildnotes"
-            flatten="true">
-            <fileset
-                dir="${buildDirectory}/plugins"
-                includes="**/buildnotes_*.html"/>
-            <fileset
-                dir="${buildDirectory}/features"
-                includes="**/buildnotes_*.html"/>
-        </copy>
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/full/logIndex.php"/>
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/testLogs/logIndex.php"/>
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/testSysErrorLogs/logIndex.php"/>
-    </target>
-    <target
-        name="updateSite">
-
-
-        <!-- get our authored, tokenized site.xml file -->
-        <copy
-            file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/siteWTP.xml"
-            tofile="${buildDirectory}/${buildLabel}/updateSite/site.xml"
-            overwrite="true"
-            failonerror="true"/>
-        <!--
-            get the ${buildDirectory}/finalPluginsVersions.properties,
-            and read as properties
-        -->
-        <!-- substitute property value for tokens -->
-        <replace
-            file="${buildDirectory}/${buildLabel}/updateSite/site.xml"
-            propertyfile="${buildDirectory}/finalFeaturesVersions.properties">
-            <replacefilter
-                token="@org.eclipse.wst@"
-                property="org.eclipse.wst"/>
-            <replacefilter
-                token="@org.eclipse.wst.sdk@"
-                property="org.eclipse.wst.sdk"/>
-            <replacefilter
-                token="@org.eclipse.jst@"
-                property="org.eclipse.jst"/>
-            <replacefilter
-                token="@org.eclipse.jst.sdk@"
-                property="org.eclipse.jst.sdk"/>
-            <replacefilter
-                token="@org.eclipse.jpt.feature@"
-                property="org.eclipse.jpt.feature"/>
-            <replacefilter
-                token="@org.eclipse.jpt_sdk.feature@"
-                property="org.eclipse.jpt_sdk.feature"/>
-        </replace>
-    </target>
-    <target
-        name="countFiles">
-        <!--
-            files.count is a file that should exist in the drop
-            directory with a count of the zip files in the same
-            directory. It is required to generate a link to the build on
-            the downloads page.
-        -->
-        <countBuildFiles
-            sourceDirectory="${resultDir}"
-            filterString=".zip,.tar.gz"
-            outputFile="${resultDir}/files.count"/>
-    </target>
-
-    <!--Build type descriptors-->
-    <target
-        name="I">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Integration"/>
-    </target>
-    <target
-        name="S">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Stable"/>
-    </target>
-    <target
-        name="N">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Nightly"/>
-    </target>
-    <target
-        name="M">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Maintenance"/>
-    </target>
-    <target
-        name="R">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Release"/>
-    </target>
-    <target
-        name="T">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Test"/>
-    </target>
-    <target
-        name="P">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Patches"/>
-    </target>
-    <target
-        name="checkIfTested">
-        <echo
-            level="debug"
-            message="isBuildTested: ${isBuildTested}"/>
-        <condition
-            property="doTests">
-            <equals
-                arg1="${isBuildTested}"
-                arg2="true"
-                trim="true"
-                casesensitive="false"/>
-        </condition>
-    </target>
-    <target
-        name="checkIfCompileLogs">
-        <condition
-            property="doCompileLogs">
-            <available
-                file="${outputDirectory}"/>
-        </condition>
-        <echo
-            message="doCompileLogs: ${doCompileLogs)   outputDirectory: ${outputDirectory}"/>
-    </target>
-    <target
-        name="writeData">
-        <!--  Insert Build Date  -->
-        <replace
-            file="${resultingIndex}"
-            token="@date@"
-            value="${TODAY}"/>
-
-        <!--  Insert Build Name  -->
-        <replace
-            file="${resultingIndex}"
-            token="@build@"
-            value="${buildLabel}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@buildBranch@"
-            value="${buildBranch}"/>
-
-        <!--  Insert PreRequsites  -->
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseFile@"
-            value="${eclipse.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseURL@"
-            value="${eclipse.url}/${eclipse.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseBuildURL@"
-            value="${eclipse.url}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilelinux@"
-            value="${eclipse.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilewindows@"
-            value="${eclipse.file.win32-win32-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilemacos@"
-            value="${eclipse.file.macosx-carbon-ppc}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseBuildHome@"
-            value="${eclipse.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipse.mirror.prefixuri@"
-            value="${eclipse.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipse.fspath.prefix@"
-            value="${eclipse.fspath.prefix}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@testURL@"
-            value="${eclipseTestFramework.url}/${eclipseTestFramework.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@testFile@"
-            value="${eclipseTestFramework.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfFile@"
-            value="${emf.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfURL@"
-            value="${emf.url}/${emf.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfBuildHome@"
-            value="${emf.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emf.mirror.prefixuri@"
-            value="${emf.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfName@"
-            value="${emf.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfDescription@"
-            value="${emf.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsourceFile@"
-            value="${emfsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsourceURL@"
-            value="${emfsourcedoc.url}/${emfsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsourceBuildHome@"
-            value="${emfsourcedoc.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsource.mirror.prefixuri@"
-            value="${emfsourcedoc.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsourceName@"
-            value="${emfsourcedoc.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsourceDescription@"
-            value="${emfsourcedoc.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdFile@"
-            value="${emfxsd.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdURL@"
-            value="${emfxsd.url}/${emfxsd.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdBuildHome@"
-            value="${emfxsd.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsd.mirror.prefixuri@"
-            value="${emfxsd.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdName@"
-            value="${emfxsd.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdDescription@"
-            value="${emfxsd.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsourceFile@"
-            value="${emfxsdsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsourceURL@"
-            value="${emfxsdsourcedoc.url}/${emfxsdsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsourceBuildHome@"
-            value="${emfxsdsourcedoc.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsource.mirror.prefixuri@"
-            value="${emfxsdsourcedoc.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsourceName@"
-            value="${emfxsdsourcedoc.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsourceDescription@"
-            value="${emfxsdsourcedoc.description}"/>
-    	
-    	
-    	        <replace
-    	            file="${resultingIndex}"
-    	            token="@emfvalidationFile@"
-    	            value="${emfvalidation.file}"/>
-    	        <replace
-    	            file="${resultingIndex}"
-    	            token="@emfvalidationURL@"
-    	            value="${emfvalidation.url}/${emfvalidation.file}"/>
-    	        <replace
-    	            file="${resultingIndex}"
-    	            token="@emfvalidationBuildHome@"
-    	            value="${emfvalidation.build.home}"/>
-    	        <replace
-    	            file="${resultingIndex}"
-    	            token="@emfvalidation.mirror.prefixuri@"
-    	            value="${emfvalidation.mirror.prefixuri}"/>
-    	        <replace
-    	            file="${resultingIndex}"
-    	            token="@emfvalidationName@"
-    	            value="${emfvalidation.name}"/>
-    	        <replace
-    	            file="${resultingIndex}"
-    	            token="@emfvalidationDescription@"
-    	            value="${emfvalidation.description}"/>
-    	        <replace
-    	            file="${resultingIndex}"
-    	            token="@emfvalidationsourceFile@"
-    	            value="${emfvalidationsourcedoc.file}"/>
-    	        <replace
-    	            file="${resultingIndex}"
-    	            token="@emfvalidationsourceURL@"
-    	            value="${emfvalidationsourcedoc.url}/${emfvalidationsourcedoc.file}"/>
-    	        <replace
-    	            file="${resultingIndex}"
-    	            token="@emfvalidationsourceBuildHome@"
-    	            value="${emfvalidationsourcedoc.build.home}"/>
-    	        <replace
-    	            file="${resultingIndex}"
-    	            token="@emfvalidationsource.mirror.prefixuri@"
-    	            value="${emfvalidationsourcedoc.mirror.prefixuri}"/>
-    	        <replace
-    	            file="${resultingIndex}"
-    	            token="@emfvalidationsourceName@"
-    	            value="${emfvalidationsourcedoc.name}"/>
-    	        <replace
-    	            file="${resultingIndex}"
-    	            token="@emfvalidationsourceDescription@"
-    	            value="${emfvalidationsourcedoc.description}"/>
-
-    	
-        <replace
-            file="${resultingIndex}"
-            token="@wstFile@"
-            value="${wst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstURL@"
-            value="${wst.url}/${wst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstBuildHome@"
-            value="${wst.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wst.mirror.prefixuri@"
-            value="${wst.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefFile@"
-            value="${gef.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefURL@"
-            value="${gef.url}/${gef.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefBuildHome@"
-            value="${gef.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gef.mirror.prefixuri@"
-            value="${gef.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipserelengFile@"
-            value="${eclipsereleng.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipserelengURL@"
-            value="${eclipsereleng.url}/${eclipsereleng.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipFile@"
-            value="${orbitthirdpartyzip.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipURL@"
-            value="${orbitthirdpartyzip.url}/${orbitthirdpartyzip.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipBuildHome@"
-            value="${orbitthirdpartyzip.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzip.mirror.prefixuri@"
-            value="${orbitthirdpartyzip.mirror.prefixuri}"/>
-
-
-        <!-- no longer used. Post 1.5.5 -->
-        <replace
-            file="${resultingIndex}"
-            token="@jemFile@"
-            value="${jem.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jemURL@"
-            value="${jem.url}/${jem.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jemBuildHome@"
-            value="${jem.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jem.mirror.prefixuri@"
-            value="${jem.mirror.prefixuri}"/>
-        <!--
-            these token/s should not exist in maintenance stream, but do
-            no harm done, so in the interests of keeping builder streams
-            in sync, we'll leave them here as place hold
-        -->
-        <replace
-            file="${resultingIndex}"
-            token="@dtpFile@"
-            value="${dtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtpURL@"
-            value="${dtp.url}/${dtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtpBuildHome@"
-            value="${dtp.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtp.mirror.prefixuri@"
-            value="${dtp.mirror.prefixuri}"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/FAIL.gif b/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/FAIL.gif
deleted file mode 100644
index 28bba66..0000000
--- a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/FAIL.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/OK.gif b/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/OK.gif
deleted file mode 100644
index 689e523..0000000
--- a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/OK.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/access_err.gif b/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/access_err.gif
deleted file mode 100644
index 4f0748a..0000000
--- a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/access_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/access_warn.gif b/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/access_warn.gif
deleted file mode 100644
index 8386e3e..0000000
--- a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/access_warn.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/buildNotes.php b/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/buildNotes.php
deleted file mode 100644
index ee71585..0000000
--- a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/buildNotes.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<html>
-<head>
-<?php
-        $parts = explode("/", getcwd());
-        $parts2 = explode("-", $parts[count($parts) - 1]);
-        $buildName = $parts2[1];
-
-        echo "<title>Build Notes for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" type="text/css">
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Build Notes</font></b> </p>
-
-<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">
-           Build Notes for <?php echo "$buildName"; ?></font></b></td>
-  </tr>
-</table>
-<table border="0">
-
-<?php
-        $hasNotes = false;
-        $aDirectory = dir("buildnotes");
-        while ($anEntry = $aDirectory->read()) {
-                if ($anEntry != "." && $anEntry != "..") {
-                        $parts = explode("_", $anEntry);
-                        $baseName = $parts[1];
-                        $parts = explode(".", $baseName);
-                        $component = $parts[0];
-                        $line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
-                        echo "<tr>";
-                        echo "$line";
-                        echo "</tr>";
-                        $hasNotes = true;
-                }
-        }
-	$aDirectory.closedir();
-        if (!$hasNotes) {
-                echo "<br>There are no build notes for this build.";
-        }
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/compile_err.gif b/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/compile_err.gif
deleted file mode 100644
index c2bfdd6..0000000
--- a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/compile_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/compile_warn.gif b/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/compile_warn.gif
deleted file mode 100644
index cf4fdf9..0000000
--- a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/compile_warn.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/componentxmls.php b/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/componentxmls.php
deleted file mode 100644
index 73c5443..0000000
--- a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/componentxmls.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<html>
-<head>
-<?php
-  function find_component_xml($directory)
-  {
-    $count = 0;
-    $dir = dir($directory);
-    while ($anEntry = $dir->read())
-    {
-      if ($anEntry != "." && $anEntry != "..")
-      {
-        $anEntry = $directory."/".$anEntry;
-        if (stristr($anEntry, '.source') === FALSE)
-        {
-          if (is_dir($anEntry))
-          {
-            find_component_xml($anEntry);
-          }
-          else
-          {
-            echo "<tr><td><a href=\"$anEntry\">";
-            echo substr($anEntry, 22);
-            echo "</a></td>";
-          }
-        }
-      }
-    }
-  }
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" type="text/css">
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">component.xml</font></b> </p>
-
-<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">
-	   component.xml files for <?php echo "$buildType $buildName"; ?></font></b></td>
-  </tr>
-</table>
-
-<table border="1" width="100%">
-  <tr>
-    <th>component.xml</th>
-  </tr>
-<?php
-  find_component_xml("apitools/componentxmls");
-?>
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/consoleLogs.php b/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/consoleLogs.php
deleted file mode 100644
index c9f8634..0000000
--- a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/consoleLogs.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<html>
-<head>
-<?php
-        $parts = explode("/", getcwd());
-        $parts2 = explode("-", $parts[count($parts) - 1]);
-        $buildName = $parts2[1];
-
-        echo "<title>Test Console Output for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" type="text/css">
-<title>Console Logs from Running JUnit Plug-in Tests</title></head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b> </p>
-
-<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">Console
-      output from running JUnit plugin tests for
-      <?php echo "$buildName"; ?>
-      </font></b></td>
-  </tr>
-</table>
-<table border="0">
-
-<?php
-                $rootDir = "testResults/consolelogs";
-        $hasNotes = false;
-        $aDirectory = dir($rootDir);
-        $index = 0;
-        $dirindex = 0;
-        while ($anEntry = $aDirectory->read()) {
-                if ($anEntry != "." && $anEntry != "..") {
-                        if (is_file("$rootDir/$anEntry")) {
-                                $entries[$index] = $anEntry;
-                                $index++;
-                        } else if (is_dir("$rootDir/$anEntry")) {
-                                $direntries[$dirindex] = $anEntry;
-                                $dirindex++;
-                        }
-                }
-        }
-        $aDirectory->close();
-
-
-        sort($entries);
-        sort($direntries);
-
-        for ($i = 0; $i < $dirindex; $i++) {
-                $anEntry = $direntries[$i];
-                $line = "<td><a href=\"testResults/consolelogs/$anEntry/logIndex.php\">$anEntry</a></td>";
-                echo "<tr>";
-                echo "$line";
-                echo "</tr>";
-        }
-        for ($i = 0; $i < $index; $i++) {
-                $anEntry = $entries[$i];
-                $logsize = filesize("testResults/consolelogs/$anEntry");
-
-
-                $level = 0;
-                if ($logsize > 20000) {
-                        $level = 2;
-                }
-                else if ($logsize > 2000) {
-                        $level = 1;
-                }
-
-                if ($level == 0) {
-                        $line = "<td><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-                }
-                else if ($level == 1) {
-                        $line = "<td><em><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-                } else if ($level == 2) {
-                        $line = "<td><strong><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-                }
-
-
-                echo "<tr>";
-                echo "$line";
-                echo "</tr>";
-                $hasNotes = true;
-        }
-
-        if (!$hasNotes) {
-                echo "<br>There are no test logs for this build.";
-        }
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/download.php b/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/download.php
deleted file mode 100644
index cfeab0a..0000000
--- a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/download.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<html>
-<head>
-<title>Eclipse WTP Download Click Through</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" type="text/css">
-<?php
-	$parts = explode("-", $dropFile);
-	$clickFile = "clickThroughs/";
-	for ($i =0; $i<count($parts); $i++) {
-		if ($i != 2) {
-			$clickFile = $clickFile.$parts[$i];
-		    if ($i < count($parts) - 1) {
-        	    $clickFile = $clickFile."-";
-            }
- 		}
-	}
-	$clickFile = $clickFile.".txt";
-
-	if (file_exists($clickFile)) {
-		$fileHandle = fopen($clickFile, "r");
-		while (!feof($fileHandle)) {
-			$aLine = fgets($fileHandle, 4096);
-			$result = $result.$aLine;
-		}
-		fclose($fileHandle);
-	} else {
-		echo '<META HTTP-EQUIV="Refresh" CONTENT="0;URL='.$dropFile.'">';
-		echo '<b><font size "+4">Downloading: '.$dropFile.'</font></b>';
-		echo '<BR>';
-		echo '<BR>';
-		echo 'If your download does not begin automatically click <a href="'.$dropFile.'">here</a>.';
-	}
-?>
-</head>
-
-<body bgcolor="#FFFFFF" text="#000000">
-  <?php
-	if (file_exists($clickFile)) {
-	 echo '<p><b><font size="+4">Important Notes<BR>';
-	 echo $dropFile;
-	 echo '</font></b></font></p>
-	<p>It is very important to read the following notes in order to run this version 
-	  of Eclipse. Once you have read the notes you can click on the Download link 
-	  to download the drop.</p>
-	';
-	  echo '<textarea name="textfield" cols="80" rows="20" wrap="PHYSICAL">'.$result;
-	  echo '</textarea>';
-	  echo '<BR>';
-	  echo '<BR>';
-	  echo '<a href="'.$dropFile.'">Download</a>';
-	}
-?>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/junit_err.gif b/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/junit_err.gif
deleted file mode 100644
index 1b7ff9d..0000000
--- a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/junit_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/logIndex.php b/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/logIndex.php
deleted file mode 100644
index 0b36334..0000000
--- a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/logIndex.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<html>
-<head>
-<?php
-
-function endsWith( $str, $sub ) {
-
-   return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub );
-}
-
-        $parts = explode("/", getcwd());
-        $parts2 = explode("-", $parts[count($parts) - 1]);
-        $buildName = $parts2[1];
-
-        echo "<title>Test Console Output for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" type="text/css">
-<title>Console Logs from Running JUnit Plug-in Tests</title></head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b> </p>
-
-<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">Console
-      output from running JUnit plugin tests for
-      <?php echo "$buildName"; ?>
-      </font></b></td>
-  </tr>
-</table>
-<table border="0">
-
-<?php
-        $hasNotes = false;
-        $aDirectory = dir(".");
-        $index = 0;
-        while ($anEntry = $aDirectory->read()) {
-                if ($anEntry != "." && $anEntry != ".." && !endsWith(__FILE__, $anEntry)) {
-                        $entries[$index] = $anEntry;
-                        $index++;
-                }
-        }
-        aDirectory.closedir();
-
-
-        sort($entries);
-
-        for ($i = 0; $i < $index; $i++) {
-                $anEntry = $entries[$i];
-                $logsize = filesize("$anEntry");
-
-
-                $level = 0;
-                if ($logsize > 20000) {
-                        $level = 2;
-                }
-                else if ($logsize > 2000) {
-                        $level = 1;
-                }
-
-                if ($level == 0) {
-                        $line = "<td><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-                }
-                else if ($level == 1) {
-                        $line = "<td><em><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-                } else if ($level == 2) {
-                        $line = "<td><strong><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-                }
-
-
-                echo "<tr>";
-                echo "$line";
-                echo "</tr>";
-                $hasNotes = true;
-        }
-
-        if (!$hasNotes) {
-                echo "<br>There are no test logs for this build.";
-        }
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/miscUtil.php b/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/miscUtil.php
deleted file mode 100644
index 8f26eb4..0000000
--- a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/miscUtil.php
+++ /dev/null
@@ -1,214 +0,0 @@
-<?php
-
-// todo: unsure if can handle filenames that are URLs?
-// handy constant to compute file size in megabytes
-
-function fileSizeInMegs($filename) {
-	$onemeg=1024*1024;
-	$zipfilesize=filesize($filename);
-	$zipfilesize=round($zipfilesize/$onemeg, 0);
-	return $zipfilesize;
-}
-
-function fileSizeForDisplay($filename) {
-	$onekilo=1024;
-	$onemeg=$onekilo * $onekilo;
-	$criteria = 3 * $onemeg;
-	$scaleChar = "M";
-	$zipfilesize=filesize($filename);
-	if ($zipfilesize > $criteria) {
-		$zipfilesize=round($zipfilesize/$onemeg, 0);
-		$scaleChar = "M";
-	}
-	else {
-		$zipfilesize=round($zipfilesize/$onekilo, 0);
-		$scaleChar = "K";
-	}
-	$result =  "(" . $zipfilesize . $scaleChar . ")";
-	return $result;
-}
-
-
-function displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription) {
-	echo "<td align=\"right\" valign=\"top\" width=\"30%\">";
-	echo "<a href=\"$downloadprefix$filename\">" . $fileShortDescription . "</a>";
-	echo "</td><td align=\"right\" valign=\"top\" width=\"3%\">";
-	echo $zipfilesize;
-	echo "</td>";
-	echo "<td align=\"right\" valign=\"top\" width=\"2%\">";
-	echo "[<a href=\"checksum/$filename.md5\">md5</a>]";
-	echo "</td>";
-}
-
-function resourceExist($url, $mirrorPrefixuri, $prereqfilename, $eclipseFSpathPrefix)
-{
-	$result = false;
-
-	$allowURLopen = ini_get('allow_url_fopen');
-
-	if ($allowURLopen && stream_last_modified($url)) {
-		$result = true;
-	}
-	else {
-		// TODO: for now, we'll do a raw check on the whole file name, since enable_url_open
-		// is off. better would be to check if we are on build.eclipse.org or download.eclipse.org?
-    $wholePath = trim($eclipseFSpathPrefix) . "/" . trim($mirrorPrefixuri) . "/" . trim($prereqfilename);
-    if (file_exists($wholePath)) {
-    	$result = true;
-    }
-	}
-	return $result;
-}
-
-function stream_last_modified($url)
-{
-	if (function_exists('version_compare') && version_compare(phpversion(), '4.3.0') > 0)
-	{
-		if (!($fp = @fopen($url, 'r')))
-		return NULL;
-
-		$meta = stream_get_meta_data($fp);
-		for ($j = 0; isset($meta['wrapper_data'][$j]); $j++)
-		{
-			if (strstr(strtolower($meta['wrapper_data'][$j]), 'last-modified'))
-			{
-				$modtime = substr($meta['wrapper_data'][$j], 15);
-				break;
-			}
-		}
-		fclose($fp);
-	}
-	else
-	{
-		$parts = parse_url($url);
-		$host  = $parts['host'];
-		$path  = $parts['path'];
-
-		if (!($fp = @fsockopen($host, 80)))
-		return NULL;
-
-		$req = "HEAD $path HTTP/1.0\r\nUser-Agent: PHP/".phpversion()."\r\nHost: $host:80\r\nAccept: */*\r\n\r\n";
-		fputs($fp, $req);
-
-		while (!feof($fp))
-		{
-			$str = fgets($fp, 4096);
-			if (strstr(strtolower($str), 'last-modified'))
-			{
-				$modtime = substr($str, 15);
-				break;
-			}
-		}
-		fclose($fp);
-	}
-	return isset($modtime) ? strtotime($modtime) : time();
-}
-
-function isMirrored($uriToCheck) {
-	global $debugScript;
-	global $debugFunctions;
-	$localuri = $uriToCheck;
-
-	$debugMirrorList = false;
-	if ($debugScript) {
-		echo "uriToCheck: " . $localuri . "<br />";
-	}
-
-	$xmlcount = 0;
-
-	/* This method true and accurate method of parsing mirror results
-	 * may be expensive, and would
-	 * likely cause artificially high counts of "downloads".
-	 * Could maybe use if somehow only checked once ever 5 minutes or something.
-
-
-	 // turn off warnings, as sometimes HTML is returned, which causes lots of warnings
-	 $holdLevel = error_reporting(E_ERROR);
-	 $mirrorsxml=simplexml_load_file(rawurlencode($localuri) . urlencode("&format=xml"));
-	 error_reporting($holdLevel);
-
-
-	 if ($mirrorsxml) {
-	 if ($debugFunctions) {
-	 echo "root node: " . $mirrorsxml->getName() . "<br />";
-	 }
-	 if (strcmp($mirrorsxml->getName(), "mirrors") == 0) {
-	 foreach ($mirrorsxml->children() as $mirror) {
-	 if (strcmp($mirror->getName(),"mirror") == 0) {
-	 $xmlcount=$xmlcount+1;
-	 }
-	 if ($debugMirrorList) {
-	 print_r($mirror);
-	 echo "<br />";
-	 }
-	 }
-	 }
-	 if ($debugFunctions) {
-	 echo "Mirror count: " . $xmlcount . "<br />";
-	 }
-	 }
-	 */
-	/*
-	 * Use simple heuristic based on pattern
-	 * in the URI ... if it contains "/downloads/" then assume it's mirrored
-	 */
-	if (strpos($uriToCheck, "webtools/downloads/") > 0) {
-		$xmlcount = 1;
-	}
-	return ($xmlcount > 0);
-
-}
-
-// TODO: replace with Phoenix variables
-function getPlatform () {
-	global $debugScript;
-	global $debugFunctions;
-	// getBrowser is expensive, so cache the data
-	static $browser;
-	$platform = "unknown";
-
-
-	if(ini_get("browscap")) {
-		if(!isset($browser)){
-			$browser = get_browser(null, true);
-		}
-
-		if ($browser) {
-			$rawPlatform = $browser['platform'];
-			if ($debugFunctions) {
-				echo "browser platfrom: " . $rawPlatform . "<br />" ;
-			}
-
-			if ($debugFunctions) {
-				$browserKeys = array_keys($browser);
-				foreach ($browserKeys as $key) {
-					echo $key . ": " . $browser[$key] . "<br />";
-				}
-			}
-		}
-		if (strpos($rawPlatform, "Win") === 0) {
-			$platform="windows";
-		} else if (strpos($rawPlatform, "Linux") === 0) {
-			$platform="linux";
-		} else if (strpos($rawPlatform, "Mac") === 0) {
-			$platform="mac";
-		}
-	}
-	return $platform;
-}
-
-function getPrereqReferenceOrName($eclipseMirrorScript, $mirrorPrefixuri, $prerequrl, $prereqfilename, $eclipseFSpathPrefix) {
-	// todo: we really only need "if exists" so could make a bit more efficient
-	// I tried "file_exists" but is didn't seem to work on my test server
-	// For these pre-reqs, we assume if they exist, they are mirrored. This is true
-	// 99% of the time.
-
-	if (resourceExist($prerequrl, $mirrorPrefixuri, $prereqfilename, $eclipseFSpathPrefix)) {
-		$reflink="<a href=\"" . $eclipseMirrorScript . $mirrorPrefixuri . "/" . $prereqfilename . "\">" . $prereqfilename . "</a>";
-	} else {
-		$reflink=$prereqfilename;
-	}
-	return $reflink;
-}
-
-?>
diff --git a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/pending.gif b/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/pending.gif
deleted file mode 100644
index 66db2a6..0000000
--- a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/pending.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/pending1.gif b/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/pending1.gif
deleted file mode 100644
index 1b2ea6e..0000000
--- a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/pending1.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/pii.php b/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/pii.php
deleted file mode 100644
index e3ed59b..0000000
--- a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/pii.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<html>
-<head>
-<?php
-  function write_unused_property($directory)
-  {
-    $count = 0;
-    $dir = dir($directory);
-    while ($anEntry = $dir->read())
-    {
-      if ($anEntry != "." && $anEntry != "..")
-      {
-        $anEntry = $directory."/".$anEntry;
-        if (is_dir($anEntry))
-        {
-          write_unused_property($anEntry);
-        }
-        else
-        {
-          echo "<tr><td><a href=\"$anEntry\">";
-          echo substr($anEntry, 16);
-          echo "</a></td>";
-          $lines = file($anEntry);
-          $count = count($lines);
-          echo "<td>$count</td></tr>";
-        }
-      }
-    }
-  }
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" type="text/css">
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Unused property messages</font></b> </p>
-
-<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">
-	   Unused property messages for <?php echo "$buildType $buildName"; ?></font></b></td>
-  </tr>
-</table>
-
-<table border="1">
-  <tr>
-    <th>Properties file</th>
-    <th>Unused strings</th>
-  </tr>
-<?php
-  write_unused_property("piitools");
-?>
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/report2.php b/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/report2.php
deleted file mode 100644
index 52d2284..0000000
--- a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/report2.php
+++ /dev/null
@@ -1,45 +0,0 @@
-
-        <?php
-
-function parse_testResults($filename)
-{
-        $junitFailures = 0;
-        if (is_file($filename)) {
-                $handle = @fopen($filename, "r");
-                if ($handle)
-                {
-                        $size = filesize($filename);
-                        $content = fread($handle, $size);
-                        fclose($handle);
-                        $junitStart = strpos($content, "Errors &amp; Failures");
-                        $junitEnd = strpos($content, "</table>", $junitStart);
-                        $junitInfo = substr($content, $junitStart, $junitEnd - $junitStart);
-                        $start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">");
-                        while ($start !== false)
-                        {
-                                $start += 29;
-                                $stop = strpos($junitInfo, "</font></b></td>", $start);
-                                if ($stop !== false)
-                                {
-                                        $result = substr($junitInfo, $start, $stop - $start);
-                                        if (is_numeric($result))
-                                        {
-                                                $junitFailures += $result;
-                                        }
-                                        else if (strcmp($result, "DNF") == 0)
-                                        {
-                                                $junitFailures++;
-                                        }
-                                }
-                                $start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">", $stop);
-                        }
-                        $results = array($junitFailures);
-                        return $results;
-                }
-        }
-}
-
-
-?>
-
-
diff --git a/releng.wtpbuilder/distribution/wtp.site/templateFiles/compileResults.php.template b/releng.wtpbuilder/distribution/wtp.site/templateFiles/compileResults.php.template
deleted file mode 100644
index f785771..0000000
--- a/releng.wtpbuilder/distribution/wtp.site/templateFiles/compileResults.php.template
+++ /dev/null
@@ -1,76 +0,0 @@
-<html>
-<head>
-
-<?php
-        $parts = explode("/", getcwd());
-        $parts2 = explode("-", $parts[count($parts) - 1]);
-        $buildName = $parts2[1];
-
-        echo "<title>Compile Logs: Code Bundles for $buildName</title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2%;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-}
-</style>
-</head>
-<body>
-
-<?php
-        echo "<h1>Compile Logs: Code Bundles for $buildName</h1>";
-?>
-
-
-<table id=tabledata align = "center" width="75%" border="1">
-  <tr>
-    <td class="bold" align="center">Compile Logs</td>
-    <td class="bold" align="center">Compile Errors</td>
-    <td class="bold" align="center">Compiler Warnings</td>
-    <td class="bold" align="center">Access Violations</td>
-    <td class="bold" align="center">Access Warnings</td>
-  </tr>
-
-  %compilelogs%
-
-</table>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template.php
deleted file mode 100644
index 20c836f..0000000
--- a/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template.php
+++ /dev/null
@@ -1,966 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<?php
-
-//ini_set("display_errors", "true");
-//error_reporting (E_ALL);
-
-
-$buildBranch="@buildBranch@";
-$build="@build@";
-$type="@type@";
-$builddate="@date@";
-
-$eclipseMirrorPrefixuri="@eclipse.mirror.prefixuri@";
-$eclipseFSpathPrefix="@eclipse.fspath.prefix@";
-
-$eclipsefilelinux="@eclipsefilelinux@";
-$eclipsefilewindows="@eclipsefilewindows@";
-$eclipsefilemacosx="@eclipsefilemacos@";
-
-$eclipseURL="@eclipseURL@";
-$eclipseFile="@eclipseFile@";
-$eclipseBuildURL="@eclipseBuildURL@";
-$eclipseBuildHome="@eclipseBuildHome@";
-$testURL="@testURL@";
-$testFile="@testFile@";
-
-$wstURL="@wstURL@";
-$wstFile="@wstFile@";
-$wstMirrorPrefixuri="@wst.mirror.prefixuri@";
-$wstBuildHome="@wstBuildHome@";
-
-
-$gefURL="@gefURL@";
-$gefFile="@gefFile@";
-$gefMirrorPrefixuri="@gef.mirror.prefixuri@";
-$gefBuildHome="@gefBuildHome@";
-
-$emfURL="@emfURL@";
-$emfFile="@emfFile@";
-$emfMirrorPrefixuri="@emf.mirror.prefixuri@";
-$emfBuildHome="@emfBuildHome@";
-$emfName="@emfName@";
-$emfDescription="@emfDescription@";
-
-$emfsourceURL="@emfsourceURL@";
-$emfsourceFile="@emfsourceFile@";
-$emfsourceMirrorPrefixuri="@emfsource.mirror.prefixuri@";
-$emfsourceBuildHome="@emfsourceBuildHome@";
-$emfsourceName="@emfsourceName@";
-$emfsourceDescription="@emfsourceDescription@";
-
-$emfxsdURL="@emfxsdURL@";
-$emfxsdFile="@emfxsdFile@";
-$emfxsdMirrorPrefixuri="@emfxsd.mirror.prefixuri@";
-$emfxsdBuildHome="@emfxsdBuildHome@";
-$emfxsdName="@emfxsdName@";
-$emfxsdDescription="@emfxsdDescription@";
-
-$emfxsdsourceURL="@emfxsdsourceURL@";
-$emfxsdsourceFile="@emfxsdsourceFile@";
-$emfxsdsourceMirrorPrefixuri="@emfxsdsource.mirror.prefixuri@";
-$emfxsdsourceBuildHome="@emfxsdsourceBuildHome@";
-$emfxsdsourceName="@emfxsdsourceName@";
-$emfxsdsourceDescription="@emfxsdsourceDescription@";
-
-$emfvalidationURL="@emfvalidationURL@";
-$emfvalidationFile="@emfvalidationFile@";
-$emfvalidationMirrorPrefixuri="@emfvalidation.mirror.prefixuri@";
-$emfvalidationBuildHome="@emfvalidationBuildHome@";
-$emfvalidationName="@emfvalidationName@";
-$emfvalidationDescription="@emfvalidationDescription@";
-
-$emfvalidationsourceURL="@emfvalidationsourceURL@";
-$emfvalidationsourceFile="@emfvalidationsourceFile@";
-$emfvalidationsourceMirrorPrefixuri="@emfvalidationsource.mirror.prefixuri@";
-$emfvalidationsourceBuildHome="@emfvalidationsourceBuildHome@";
-$emfvalidationsourceName="@emfvalidationsourceName@";
-$emfvalidationsourceDescription="@emfvalidationsourceDescription@";
-
-$dtpURL="@dtpURL@";
-$dtpFile="@dtpFile@";
-$dtpMirrorPrefixuri="@dtp.mirror.prefixuri@";
-$dtpBuildHome="@dtpBuildHome@";
-
-
-$eclipserelengFile="@eclipserelengFile@";
-$eclipserelengURL="@eclipserelengURL@";
-$orbitthirdpartyzipFile="@orbitthirdpartyzipFile@";
-$orbitthirdpartyzipURL="@orbitthirdpartyzipURL@";
-$orbitthirdpartyzipBuildHome="@orbitthirdpartyzipBuildHome@";
-$orbitthirdpartyzipMirrorPrefixuri="@orbitthirdpartyzip.mirror.prefixuri@";
-
-
-
-
-include("miscUtil.php");
-
-
-
-
-
-$debugScript = false;
-$debugFunctions = false;
-
-$defaultMirrorScript="";
-$defaultWTPMirrorPrefix="./";
-
-$eclipseMirrorScript="http://www.eclipse.org/downloads/download.php?file=";
-
-// TODO: improve so this hard coding isn't required.
-// This depends on the declare script changing webtools/committers to webtools/downloads
-// And, the logic is such that if it is not mirrored, this URI is not used at all, just
-// a relative reference only
-$eclipseWTPMirrorPrefix="/webtools/committers/drops/$buildBranch/$build/";
-
-
-$mirrorScript=$defaultMirrorScript;
-$downloadprefix=$defaultWTPMirrorPrefix;
-
-
-$keytestMirrorString=$eclipseMirrorScript . "$eclipseWTPMirrorPrefix/wtp-sdk-$build.zip";
-if (isMirrored($keytestMirrorString) ) {
-	$mirrorScript=$eclipseMirrorScript;
-	$downloadprefix="${mirrorScript}${eclipseWTPMirrorPrefix}";
-}
-
-if ($debugScript)  {
-	echo "inferred platform: " . getPlatform();
-}
-
-
-// our summary results handling requires php 5 (for simple xml file loading)
-// so, if not php 5, just don't display any summary results
-// This was found to be required, since some mirror our whole site (e.g. IBM)
-// and not all mirrors use PHP 5
-$displayTestSummary=false;
-if (phpversion() >= 5) {
-
-	$displayTestSummary=true;
-	// expecting grandTotalErrors and grandTotalTests
-	$filename = "unitTestsSummary.xml";
-	if (file_exists($filename)) {
-		$prefix = "unitTests_";
-		$unitTestsSummary = simplexml_load_file($filename);
-		foreach ($unitTestsSummary->summaryItem as $summaryItem) {
-			$name = $summaryItem->name;
-			$value = $summaryItem->value;
-			$code= "\$" . $prefix . $name . " = " . $value . ";";
-			//echo "<br />code: " . $code;
-			eval($code);
-		}
-	}
-
-	$filename = "compilelogsSummary.xml";
-	$prefix = "code_";
-	$compileSummary = simplexml_load_file($filename);
-	foreach ($compileSummary->summaryItem as $summaryItem) {
-		$name = $summaryItem->name;
-		$value = $summaryItem->value;
-		$code= "\$" . $prefix . $name . " = " . $value . ";";
-		//echo "<br />code: " . $code;
-		eval($code);
-	}
-
-	$filename = "testcompilelogsSummary.xml";
-	$prefix = "test_";
-	$compileSummary = simplexml_load_file($filename);
-	foreach ($compileSummary->summaryItem as $summaryItem) {
-		$name = $summaryItem->name;
-		$value = $summaryItem->value;
-		$code= "\$" . $prefix . $name . " = " . $value . ";";
-		//echo "<br />code: " . $code;
-		eval($code);
-	}
-}
-
-function displayRepoFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription) {
-	echo "<td align=\"right\" valign=\"top\" width=\"10%\">";
-	echo "<a href=\"$downloadprefix$filename\">" . $fileShortDescription . "</a>";
-	echo "</td><td align=\"right\" valign=\"top\" width=\"3%\">";
-	echo $zipfilesize;
-	echo "</td>";
-}
-
-$incubating="@incubating@";
-
-
-
-if (isset($incubating) && ($incubating == "true")) {
-	echo '<title>WTP Incubator Downloads</title>';
-}
-else {
-	echo '<title>WTP Downloads</title>';
-}
-
-?>
-
-
-</head>
-
-<body>
-
-<?php
-
-// tiny banner to remind when looking at "local" machine results
-$serverName = $_SERVER["SERVER_NAME"];
-
-if (!stristr($serverName, "eclipse.org") && !stristr($serverName,"you.are.at.eclipsecon.org")) {
-	echo '<center>
-          <p>
-          Reminder: this is <font color="#FF0000">' . 
-	$serverName .
-    '</font>
-          See also 
-          <a href="http://download.eclipse.org/webtools/downloads" target="_top">the live public Eclipse site</a>.
-          </p>
-          <hr />
-          </center>';
-
-}
-?>
-<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH="100%">
-	<tr>
-		<td ALIGN=left><font face="'Bitstream Vera',Helvetica,Arial" size="+2"><b><?php echo "$type";?>
-		Build: <?php echo "$build";?></b></font></td>
-	
-	
-	<tr>
-		<td><font size="-1"><?php echo "$builddate";?></font></td>
-	</tr>
-	<tr>
-		<td>
-		<p>The Eclipse Web Tools Platform Project provides tools for Web
-		Development, and is a platform for adopters making add-on tools for
-		Web Development.</p>
-		</td>
-	</tr>
-</table>
-
-<!-- ***********  Required Prerequisites **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-	<tr>
-		<td align="left" valign="top" bgcolor="#0080C0"><font
-			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">All-in-one
-		Packages</font></td>
-	</tr>
-	<tr>
-		<td>
-		<p>For most uses, we recommend web-developers download the
-		"all-in-one" package, <a href="http://www.eclipse.org/downloads/">Eclipse
-		IDE for Java EE Developers</a>, from the main Eclipse download site.</p>
-		</td>
-	</tr>
-</table>
-
-
-<!-- ***********  Required Prerequisites **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-	<tr>
-		<td align="left" valign="top" bgcolor="#0080C0"><font
-			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Prerequisites
-		and Handy Extras</font></td>
-	</tr>
-	<tr>
-		<td>
-		<p>These are the prerequisites to build or run these packages. All are
-		not necessarily required, but instead some subset. Also listed are
-		some frequently needed links for committer-required packages when
-		creating new development environments, or targets to run against.</p>
-		<p>Note that WTP requires Java 5 or higher (and, for some things,
-		actually requires a JDK rather than only a JRE) even though many other
-		<a href="http://www.eclipse.org/downloads/">Eclipse Projects</a> can
-		run with <a href="http://www.eclipse.org/downloads/moreinfo/jre.php">other
-		JRE levels</a>.</p>
-		<p></p>
-		</td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=1 cellpadding=1 width="90%" align="center">
-			<tr valign="top">
-				<td width="10%"></td>
-				<td width="55%">Eclipse Platform (Platform, JDT)</td>
-				<?php
-				//customize page depending on user's browser/platform, if we can detect it
-				$usersPlatform = getPlatform();
-				// assume windows by default, since likely most frequent, even for cases where
-				// platform is "unknown". I've noticed Opera reports 'unknown' :(
-				$recommendedFile=$eclipsefilewindows;
-				if (strcmp($usersPlatform,"linux")== 0) {
-					$recommendedFile=$eclipsefilelinux;
-				} else if (strcmp($usersPlatform,"mac") == 0) {
-					$recommendedFile=$eclipsefilemacosx;
-				}
-				?>
-				<td align="right" width="35%"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $eclipseBuildURL . "\">appropriate platform</a>";
-				echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td><?php echo "$emfName $emfDescription" ?></td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfMirrorPrefixuri, $emfURL, $emfFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $emfBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-			<tr valign="top">
-				<td width="10%"></td>
-				<td><?php echo "$emfxsdName $emfxsdDescription" ?></td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdMirrorPrefixuri, $emfxsdURL, $emfxsdFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $emfxsdBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td><?php echo "$emfvalidationName $emfvalidationDescription" ?></td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfvalidationMirrorPrefixuri, $emfvalidationURL, $emfvalidationFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $emfvalidationBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>Graphical Editing Framework (GEF)</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $gefMirrorPrefixuri, $gefURL, $gefFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $gefBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>Data Tools Platform (DTP) (required only for EJB or JPT
-				development)</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $dtpMirrorPrefixuri, $dtpURL, $dtpFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $dtpBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-			<tr valign="middle">
-				<td colspan="3">
-				<hr />
-				</td>
-			</tr>
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td><?php echo "$emfsourceName $emfsourceDescription" ?></td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfsourceMirrorPrefixuri, $emfsourceURL, $emfsourceFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $emfsourceBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td><?php echo "$emfxsdsourceName $emfxsdsourceDescription" ?></td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdsourceMirrorPrefixuri, $emfxsdsourceURL, $emfxsdsourceFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $emfxsdsourceBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td><?php echo "$emfvalidationsourceName $emfvalidationsourceDescription" ?></td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfvalidationsourceMirrorPrefixuri, $emfvalidationsourceURL, $emfvalidationsourceFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $emfvalidationsourceBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>Eclipse Test Framework (required only for Automated JUnit tests)</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $testURL, $testFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>Eclipse releng tool (required only for committers to more easily
-				"release" code to a build)</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipserelengURL, $eclipserelengFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>Third Party code from Orbit. Not required and is currently much
-				more than needed for WTP, but some committers like using to create a
-				PDE target.</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $orbitthirdpartyzipMirrorPrefixuri, $orbitthirdpartyzipURL, $orbitthirdpartyzipFile,$eclipseFSpathPrefix);
-				echo " or <a href=\"" . $orbitthirdpartyzipBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-		</table>
-		</td>
-	</tr>
-</table>
-
-<!-- ***********  WTP **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-	<tr>
-		<td align=left valign=top colspan="5" bgcolor="#0080C0"><font
-			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF"> Web Tools
-		Platform</font></td>
-	</tr>
-
-	<tr>
-		<td align="left" valign="top" colspan="5">
-		<p>The WTP zip files includes the features and plugins from the WST,
-		JST (including JSF), and JPT projects.</p>
-		</td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
-
-
-			<tr>
-				<td align="left" valign="top" width="10%"><b>Web App Developers:</b></td>
-				<td align="left" valign="top" width="55%">
-				<p>This non-SDK package is for most users. It includes the runnable
-				code and end-user documentation for those using the tools to develop
-				web applications.</p>
-				</td>
-				<?php
-
-				$zipfilename="wtp-$build";
-
-				$filename=$zipfilename.".zip";
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription="wtp";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-				?>
-			</tr>
-
-
-
-			<tr>
-				<td align="left" valign="top" width="10%"><b>Tool Developers:</b></td>
-
-				<td align="left" valign="top">
-				<p>The SDK package includes source code and developer documentation
-				for those using WTP as a platform to build more tools, as well as
-				everything that is in the non-SDK version.</p>
-
-				<?php
-
-				$zipfilename="wtp-sdk-$build";
-
-				$filename=$zipfilename.".zip";
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription="wtp-sdk";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-
-				?>
-			
-			</tr>
-
-			<tr>
-
-				<td align="left" valign="top" width="10%"></td>
-				<td align="left" valign="top">
-				<p>The Automated Test zip contains the unit tests.</p>
-				<?php
-
-				$zipfilename="wtp-tests-$build";
-
-				$filename=$zipfilename.".zip";
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription="wtp-tests";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-
-				?>
-			
-			</tr>
-		</table>
-		</td>
-	
-	
-	<tr>
-
-</table>
-
-
-<!-- ***********  WST **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-	<tr>
-		<td align=left valign=top colspan="5" bgcolor="#0080C0"><font
-			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF"> Web Standard
-		Tools</font></td>
-	</tr>
-
-	<tr>
-		<td align="left" valign="top" colspan="5">
-		<p>These zip files includes the features and plugins for (non-Java)
-		Web Development.</p>
-		<p>Note: you only need this zip file(s) if you want to use only this
-		function. If you download the WTP zip file, it is already included
-		there.</p>
-		</td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
-
-
-			<tr>
-				<td align="left" valign="top" width="10%"><b>Tool Developers:</b></td>
-
-				<td align="left" valign="top">
-				<p>The SDK package includes source code and developer documentation
-				for those using WST as a platform to build more tools, as well as
-				everything that is in the non-SDK version.</p>
-
-				<?php
-
-				$zipfilename="wtp-wst-sdk-$build";
-
-				$filename=$zipfilename.".zip";
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription="wtp-wst-sdk";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-				?>
-			
-			</tr>
-
-			<tr>
-
-				<td align="left" valign="top" width="10%"></td>
-				<td align="left" valign="top">
-				<p>The Automated Test zip contains the unit tests.</p>
-				<?php
-
-				$zipfilename="wtp-wst-Automated-Tests-$build";
-
-				$filename=$zipfilename.".zip";
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription="wtp-wst-Automated-Tests";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-
-				?>
-			
-			</tr>
-
-		</table>
-		</td>
-	
-	
-	<tr>
-
-</table>
-
-				<?php
-
-				$bellwether_zipfilename="wtp-common-fproj-".$build.".zip";
-				if (file_exists($bellwether_zipfilename)) {
-					// if-then-include section
-					// include this whole section if (and only if) the bellwether file exists.
-					// For example, it may not exist on builds for "old" streams.
-					?>
-
-<!-- ***********  Faceted Project Framework **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-	<tr>
-		<td align=left valign=top colspan="5" bgcolor="#0080C0"><font
-			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Faceted
-		Project Framework</font></td>
-	</tr>
-
-	<tr>
-		<td align="left" valign="top" colspan="5">
-		<p>The Faceted Project Framework allows creation of modular projects
-		in Eclipse so that the user can easily add and remove functionality.
-		All WTP projects leverage this framework, but it can also be used
-		independent of WTP.</p>
-		<p>The JDT Enablement component extends the Faceted Project Framework
-		to integrate with Java Development Tools. The component includes the
-		Java facet, modeling of the JVM-based runtimes and tools for
-		simplifying Java library management for facet authors.</p>
-		<p>Note: you only need this zip file(s) if you want to use only this
-		function. If you download the WTP (or WST) zip file, it is already
-		included there.</p>
-		</td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
-
-
-			<tr>
-				<td align="left" valign="top" width="10%"><b>Framework</b></td>
-				<td align="left" valign="top">
-				<p>Runtime</p>
-				</td>
-				<?php
-
-				$zipfilename="wtp-common-fproj-$build";
-
-				$filename=$zipfilename.".zip";
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription="wtp-common-fproj";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-
-				?>
-			</tr>
-
-			<tr>
-				<td align="left" valign="top" width="10%"><b>&nbsp;</b></td>
-				<td align="left" valign="top">
-				<p>SDK</p>
-				</td>
-				<?php
-
-				$zipfilename="wtp-common-fproj-sdk-$build";
-
-				$filename=$zipfilename.".zip";
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription="wtp-common-fproj-sdk";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-
-				?>
-			</tr>
-
-			<tr>
-				<td align="left" valign="top" width="10%"><b>JDT Enablement</b></td>
-				<td align="left" valign="top">
-				<p>Runtime</p>
-				</td>
-				<?php
-
-				$zipfilename="wtp-common-fproj-enablement-jdt-$build";
-
-				$filename=$zipfilename.".zip";
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription="wtp-common-fproj-enablement-jdt";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-
-				?>
-			</tr>
-
-			<tr>
-				<td align="left" valign="top" width="10%"><b>&nbsp;</b></td>
-				<td align="left" valign="top">
-				<p>SDK</p>
-				</td>
-				<?php
-
-				$zipfilename="wtp-common-fproj-enablement-jdt-sdk-$build";
-
-				$filename=$zipfilename.".zip";
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription="wtp-common-fproj-enablement-jdt-sdk";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-
-				?>
-			</tr>
-
-		</table>
-		</td>
-	
-	
-	<tr>
-
-</table>
-
-				<?php
-				// end the if-then-include section
-				}
-				?>
-
-
-<!-- ***********  Build Status **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-	<tr>
-		<td align=left valign=top bgcolor="#0080C0"><font
-			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Status, tests
-		and other interesting details</font></td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
-
-			<tr>
-				<td><a href="buildNotes.php">Build notes</a> <br />
-				<a href="directory.txt">map files</a> <br />
-				<?php
-
-				if ($displayTestSummary) {
-
-
-					if (isset($unitTests_grandTotalErrors)) {
-						$errorColor="green";
-						if ($unitTests_grandTotalErrors > 0) {
-							$errorColor="red";
-						}
-						echo "<a href=\"testResults.php\">Unit test results</a>&nbsp;";
-						echo "<img src=\"junit_err.gif\"/><font color=\"" . $errorColor . "\">" . $unitTests_grandTotalErrors . "</font>&nbsp;&nbsp;Total: " . $unitTests_grandTotalTests;
-					}
-					else {
-						// we hardly ever "pend" anymore ... abscense usually signifies no tests or a build error.
-						echo "<br /><font color=\"orange\">Unit tests don't exists, are pending, or there's a build error.</font>";
-						//&nbsp;&nbsp;<img src=\"pending.gif\"/>";
-					}
-
-					echo "<br />";
-					echo "<a href=\"compileResults.php\">Compile logs: Code Bundles</a>";
-
-					echo "&nbsp;&nbsp;($code_totalBundles)&nbsp;&nbsp;";
-					echo "<img src=\"compile_err.gif\"/><font color=red>$code_totalErrors</font>&nbsp;";
-					echo "<img src=\"compile_warn.gif\"/><font color=orange>$code_totalWarnings</font>&nbsp;";
-					echo "<img src=\"access_err.gif\"/><font color=red>$code_totalforbiddenAccessWarningCount</font>&nbsp;";
-					echo "<img src=\"access_warn.gif\"/><font color=orange>$code_totaldiscouragedAccessWarningCount</font>&nbsp;";
-
-					echo "<br />";
-					echo "<a href=\"testCompileResults.php\">Compile logs: Test Bundles</a>";
-
-					echo "&nbsp;&nbsp;($test_totalBundles)&nbsp;&nbsp;";
-					echo "<img src=\"compile_err.gif\"/><font color=red>$test_totalErrors</font>&nbsp;";
-					echo "<img src=\"compile_warn.gif\"/><font color=orange>$test_totalWarnings</font>&nbsp;";
-					echo "<img src=\"access_err.gif\"/><font color=red>$test_totalforbiddenAccessWarningCount</font>&nbsp;";
-					echo "<img src=\"access_warn.gif\"/><font color=orange>$test_totaldiscouragedAccessWarningCount</font>&nbsp;";
-				}
-
-				?> <br />
-
-				<?php
-				if (file_exists("versioningReportName.php")) {
-					include "versioningReportName.php";
-					$fname="${versionReportFilename}.html";
-					if (file_exists($fname)) {
-						echo "<br /> <a href='$fname'>Versioning Information</a>";
-					}
-}
-?> <?php
-echo "<br />";
-if (file_exists("./apiresults/api-progress.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-progress.html\">API Progress Report</a>";
-}
-if (file_exists("./apiresults/api-info-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-info-summary.html\">APIs Defined by Each Component</a>";
-}
-if (file_exists("./apiresults/api-ref-compatibility.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-ref-compatibility.html\">Adopter Breakage Report</a>";
-}
-if (file_exists("./apiresults/api-violation-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-violation-summary.html\">API Violations</a>";
-}
-if (file_exists("./apiresults/component-api-violation-all.html"))
-{
-	echo "<br /> <a href=\"apiresults/component-api-violation-all.html\">Non-API dependencies</a>";
-}
-if (file_exists("./apiresults/api-tc-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-tc-summary.html\">API Test Coverage</a>";
-}
-if (file_exists("./apiresults/api-javadoc-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-javadoc-summary.html\">API Javadoc Coverage</a>";
-}
-if (file_exists("./apiresults/api-tc-summary.html"))
-{
-	echo "<br /><br /> <a href=\"apiresults/full_test_coverage/api-tc-summary.html\">Test Coverage for All Classes and Methods</a>";
-}
-?> <?php
-if (file_exists("./perfresults/graph/performance.php"))
-{
-	echo "<br />";
-	echo "<br /> <a href=\"perfresults/graph/performance.php\">Performance Results</a>";
-	echo "<br />";
-}
-?></td>
-			</tr>
-		</table>
-		</td>
-	</tr>
-</table>
-
-<?php
-
-$bellwether_name="repos";
-if (file_exists($bellwether_name)) {
-	// if-then-include section
-	// include this whole section if (and only if) the bellwether file exists.
-	// For example, it may not exist on builds for "old" streams.
-	?>
-
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-	<tr>
-		<td align=left valign=top colspan="2" bgcolor="#0080C0"><font
-			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF"> Web Tools
-		Platform zipped P2 repositories</font></td>
-	</tr>
-
-
-	<tr>
-		<td>
-		<table border=0 cellspacing=2 cellpadding=2 width="40%" align="left">
-
-
-		<?php
-
-
-		$zipfilename="repos/dali-buildrepo-$build";
-
-		$filename=$zipfilename.".zip";
-		if (file_exists($filename)) {
-			echo "<tr>";
-			$zipfilesize=fileSizeForDisplay($filename);
-			$fileShortDescription="dali";
-			displayRepoFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-
-			echo "</tr>";
-		}
-
-		$zipfilename="repos/dali-sdk-buildrepo-$build";
-
-		$filename=$zipfilename.".zip";
-			
-		if (file_exists($filename)) {
-			echo "<tr>";
-			$zipfilesize=fileSizeForDisplay($filename);
-			$fileShortDescription="dali-sdk";
-			displayRepoFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-
-			echo "</tr>";
-		}
-		$zipfilename="repos/dali.tests-buildrepo-$build";
-
-		$filename=$zipfilename.".zip";
-		if (file_exists($filename)) {
-			echo "<tr>";
-			$zipfilesize=fileSizeForDisplay($filename);
-			$fileShortDescription="dali.tests";
-			displayRepoFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-
-			echo "</tr>";
-		}
-
-		$zipfilename="repos/jst-buildrepo-$build";
-
-		$filename=$zipfilename.".zip";
-		if (file_exists($filename)) {
-			$zipfilesize=fileSizeForDisplay($filename);
-			$fileShortDescription="jst";
-			displayRepoFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-
-			echo "</tr>";
-		}
-			
-		$zipfilename="repos/jst-sdk-buildrepo-$build";
-
-		$filename=$zipfilename.".zip";
-		if (file_exists($filename)) {
-			$zipfilesize=fileSizeForDisplay($filename);
-			$fileShortDescription="jst-sdk";
-			displayRepoFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-
-			echo "</tr>";
-		}
-			
-		$zipfilename="repos/jst.tests-buildrepo-$build";
-
-		$filename=$zipfilename.".zip";
-		if (file_exists($filename)) {
-			$zipfilesize=fileSizeForDisplay($filename);
-			$fileShortDescription="jst.tests";
-			displayRepoFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-
-			echo "</tr>";
-		}
-			
-		$zipfilename="repos/wst-buildrepo-$build";
-
-		$filename=$zipfilename.".zip";
-		if (file_exists($filename)) {
-			$zipfilesize=fileSizeForDisplay($filename);
-			$fileShortDescription="wst";
-			displayRepoFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-
-			echo "</tr>";
-		}
-			
-		$zipfilename="repos/wst-sdk-buildrepo-$build";
-
-		$filename=$zipfilename.".zip";
-		if (file_exists($filename)) {
-			$zipfilesize=fileSizeForDisplay($filename);
-			$fileShortDescription="wst-sdk";
-			displayRepoFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-
-			echo "</tr>";
-		}
-			
-		$zipfilename="repos/wst.tests-buildrepo-$build";
-
-		$filename=$zipfilename.".zip";
-		if (file_exists($filename)) {
-			$zipfilesize=fileSizeForDisplay($filename);
-			$fileShortDescription="wst.tests";
-			displayRepoFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-
-			echo "</tr>";
-		}
-
-		?>
-		</table>
-	
-	</tr>
-</table>
-
-		<?php } ?>
-
-
-<!-- footer -->
-<center>
-<hr>
-<p>All downloads are provided under the terms and conditions of the <a
-	href="http://www.eclipse.org/legal/notice.html">Eclipse.org Software
-User Agreement</a> unless otherwise specified.</p>
-
-<p>If you have problems downloading the drops, contact the <font
-	face="'Bitstream Vera',Helvetica,Arial" size="-1"><a
-	href="mailto:webmaster@eclipse.org">webmaster</a></font>.</p>
-
-</center>
-<!-- end footer -->
-
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/wtp.site/templateFiles/performance.template b/releng.wtpbuilder/distribution/wtp.site/templateFiles/performance.template
deleted file mode 100644
index f8abfbc..0000000
--- a/releng.wtpbuilder/distribution/wtp.site/templateFiles/performance.template
+++ /dev/null
@@ -1,62 +0,0 @@
-<P>
-  <A NAME="unit"></A>
-  * Missing reference data. Build used for comparison specified in ending parenthesis.
-  <BR>green: faster, less memory
-  <BR>red: slower, more memory
-  <BR>x axis: difference between current value and baseline value as percentage
-  <BR>
-</P>
-
-<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 grouped by scenario prefix
-    </font></b></td>
-  </tr>
-</table>
-
-<?php
-  $dir = dir(".");
-  while ($anEntry = $dir->read())
-  {
-    if ($anEntry != "global.php" && substr($anEntry, strlen($anEntry) - 4) == ".php")
-    {
-      echo "<a href=\"$anEntry\">$anEntry</a><br>";
-    }
-  }
-?>
-
-<table border=0 cellspacing=5 cellpadding=2 width="100%" >
-  <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 JUnit test results for <?php echo "$buildType $buildName"; ?>
-    </font></b></td>
-  </tr>
-</table>
-
-<font color="#FFFFFF" face="Arial,Helvetica">
-<table border=1" width="100%">
-  <tr>
-    <td width="100%"><b>Tests Performed</b></td>
-  </tr>
-  <?php
-    $xmlDir = dir("../xml");
-    while ($xmlEntry = $xmlDir->read())
-    {
-      if ($xmlEntry != "." && $xmlEntry != "..")
-      {
-        $htmlEntry = substr($xmlEntry, 0, strlen($xmlEntry) - 3) . "html";
-        echo "<tr>";
-        echo "<td><a href=\"../html/$htmlEntry\">$htmlEntry</a></td>";
-        echo "</tr>";
-      }
-    }
-  ?>
-</table>
-</html>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtp.site/templateFiles/siteEnablingFeatures.xml b/releng.wtpbuilder/distribution/wtp.site/templateFiles/siteEnablingFeatures.xml
deleted file mode 100644
index e4ace4d..0000000
--- a/releng.wtpbuilder/distribution/wtp.site/templateFiles/siteEnablingFeatures.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-
-    <description>
-        The update site contains the enabling features.
-    </description>
-
-
-
-
-
-
-
-    <category-def
-        name="Enabling Features"
-        label="Enabling Features">
-        <description>
-            This category contains features used by several projects
-            that enable some functionality, but which by themselves are
-            not very interesting.
-        </description>
-    </category-def>
-
-
-
-</site>
diff --git a/releng.wtpbuilder/distribution/wtp.site/templateFiles/siteWTP.xml b/releng.wtpbuilder/distribution/wtp.site/templateFiles/siteWTP.xml
deleted file mode 100644
index e3a86fa..0000000
--- a/releng.wtpbuilder/distribution/wtp.site/templateFiles/siteWTP.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site
-    pack200="true"
-    mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/webtools/testUpdates/site.xml&amp;format=xml"
-    digestURL="http://download.eclipse.org/webtools/testUpdates/">
-
-    <description
-        url="http://download.eclipse.org/webtools/declaredUpdates/index.html">
-        The update site contains the features of the of Eclipse Web
-        Tools Project (WTP)
-    </description>
-
-    <feature
-        url="features/org.eclipse.wst_@org.eclipse.wst@.jar"
-        id="org.eclipse.wst"
-        version="@org.eclipse.wst@">
-        <category name="Web Tools Platform (WTP)" />
-    </feature>
-
-    <feature
-        url="features/org.eclipse.wst.sdk_@org.eclipse.wst.sdk@.jar"
-        id="org.eclipse.wst.sdk"
-        version="@org.eclipse.wst.sdk@">
-        <category name="Web Tools Platform (WTP)" />
-    </feature>
-
-    <feature
-        url="features/org.eclipse.jst_@org.eclipse.jst@.jar"
-        id="org.eclipse.jst"
-        version="@org.eclipse.jst@">
-        <category name="Web Tools Platform (WTP)" />
-    </feature>
-
-    <feature
-        url="features/org.eclipse.jst.sdk_@org.eclipse.jst.sdk@.jar"
-        id="org.eclipse.jst.sdk"
-        version="@org.eclipse.jst.sdk@">
-        <category name="Web Tools Platform (WTP)" />
-    </feature>
-
-
-
-
-    <feature
-        url="features/org.eclipse.jpt.feature_@org.eclipse.jpt.feature@.jar"
-        id="org.eclipse.jpt.feature"
-        version="@org.eclipse.jpt.feature@">
-        <category name="Web Tools Platform (WTP)" />
-    </feature>
-
-    <feature
-        url="features/org.eclipse.jpt_sdk.feature_@org.eclipse.jpt_sdk.feature@.jar"
-        id="org.eclipse.jpt_sdk.feature"
-        version="@org.eclipse.jpt_sdk.feature@">
-        <category name="Web Tools Platform (WTP)" />
-    </feature>
-
-
-    <category-def
-        name="Web Tools Platform (WTP)"
-        label="Web Tools Platform (WTP)">
-        <description>
-            This category contains the features of the Eclipse Web Tools
-            Project (WTP).
-        </description>
-    </category-def>
-
-
-</site>
diff --git a/releng.wtpbuilder/distribution/wtp.site/templateFiles/testCompileResults.php.template b/releng.wtpbuilder/distribution/wtp.site/templateFiles/testCompileResults.php.template
deleted file mode 100644
index 42d6f65..0000000
--- a/releng.wtpbuilder/distribution/wtp.site/templateFiles/testCompileResults.php.template
+++ /dev/null
@@ -1,76 +0,0 @@
-<html>
-<head>
-
-<?php
-        $parts = explode("/", getcwd());
-        $parts2 = explode("-", $parts[count($parts) - 1]);
-        $buildName = $parts2[1];
-
-        echo "<title>Compile Logs: Test Bundles for $buildName</title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2em;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:Bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-}
-</style>
-</head>
-<body>
-
-<?php
-        echo "<h1>Compile Logs: Test Bundles for $buildName</h1>";
-?>
-
-
-<table id=tabledata align = "center" width="75%" border="1">
-  <tr>
-    <td class="bold" align="center">Compile Logs</td>
-    <td class="bold" align="center">Compile Errors</td>
-    <td class="bold" align="center">Compiler Warnings</td>
-    <td class="bold" align="center">Access Violations</td>
-    <td class="bold" align="center">Access Warnings</td>
-  </tr>
-
-  %compilelogs%
-
-</table>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/wtp.site/templateFiles/testResults.php.template b/releng.wtpbuilder/distribution/wtp.site/templateFiles/testResults.php.template
deleted file mode 100644
index 99c9c9a..0000000
--- a/releng.wtpbuilder/distribution/wtp.site/templateFiles/testResults.php.template
+++ /dev/null
@@ -1,119 +0,0 @@
-<html>
-<head>
-
-<?php
-	$parts = explode("/", getcwd());
-	$parts2 = explode("-", $parts[count($parts) - 1]);
-	$buildName = $parts2[1];
-	
-	echo "<title>Test Results for $buildName </title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2em;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:Bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-
-}
-</style>
-
-
-</head>
-<body>
-<p><b><font face="Verdana" size="+3">Test Results</font></b> </p>
-
-<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">
-    Unit Test Results for <?php echo "$buildName"; ?> on Various Platforms and JRE</font></b></td>
-  </tr>
-</table>
-
-<?php
-if (file_exists("testResults"))
-{
-$dir = dir("testResults");
-while ($anEntry = $dir->read())
-{
-  if ($anEntry != "." && $anEntry != ".." && $anEntry != "consolelogs" && $anEntry != "html" && $anEntry != "xml")
-  {
-    $link = "testResults/".$anEntry."/results/index.php";
-    echo "<p><a href=\"$link\">$anEntry</a></p>";
-  }
-}
-}
-?>
-
-<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">Unit 
-      Test Results for <?php echo "$buildName"; ?> </font></b></td>
-  </tr>
-</table>
-
-<table id=tableunittestdata align = "center" width="75%" border="1">
-  <tr> 
-    <td class="bold" align="center" width="70%">Test Suite</td>
-    <td class="bold" align="center" width="15%">Errors &amp; Failures</td>
-    <td class="bold" align="center" width="15%">Total Tests</td>
-    <td class="bold" align="center" width="15%">Total Time (s)</td>
-  </tr>
-  
-  
-  %testresults%
-  
-</table>
-<p></p>
-<br>
-<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"> 
-      Console output logs 
-      <?php echo "$buildName"; ?>
-      </font></b></td>
-  </tr>
-</table>
-<br>
-These <a href="consoleLogs.php">logs</a> contain the console output captured while 
-running the JUnit automated tests. <br>
-<br>
-
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/wtp.site/transformReportToHTML.xml b/releng.wtpbuilder/distribution/wtp.site/transformReportToHTML.xml
deleted file mode 100644
index 032979a..0000000
--- a/releng.wtpbuilder/distribution/wtp.site/transformReportToHTML.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-    name="xsl-conversion"
-    default="main"
-    basedir=".">
-
-    <target
-        name="main"
-        description="example.bin.xml to produce example.html">
-      <xslt
-          destdir="${resultDir}/compilelogs"
-          scanincludeddirectories="true"
-          style="compilerXMLOutputToHTML.xsl"
-          force="true" >
-            <fileset dir="${resultDir}/compilelogs" includes="**/*.bin.xml" />
-            <mapper  type="glob" from="*.xml" to="*.html"/>
-      </xslt>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtp.tests/build.xml b/releng.wtpbuilder/distribution/wtp.tests/build.xml
deleted file mode 100644
index ba7ad2b..0000000
--- a/releng.wtpbuilder/distribution/wtp.tests/build.xml
+++ /dev/null
@@ -1,395 +0,0 @@
-<project
-    name="Build specific targets and properties"
-    default="runTest">
-    <!--
-        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"/>
-    <fail
-        message="testRoot must be set for this task"
-        unless="testRoot"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-    <!--
-        typcially already set, but in case of standalone tests, may not
-        be
-    -->
-    <property
-        name="buildLabel"
-        value="${buildType}-${buildId}-${timestamp}"/>
-
-
-    <!-- 
-      Steps to do after the build is done. 
-    -->
-    <target
-        name="test">
-        <dirname
-            file="${ant.file}"
-            property="currentDirectory"/>
-        <ant
-            antfile="${ant.file}"
-            target="runTest"
-            dir="${currentDirectory}"/>
-    </target>
-
-    <!-- 
-        Steps to do to test the build results
-    -->
-    <target
-        name="runTest">
-        <dirname
-            file="${ant.file}"
-            property="test.component.dir"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-        <property
-            file="${buildDirectory}/label.properties"/>
-        <property
-            file="${wtp.builder.home}/build.properties"/>
-        <fail
-            message="testRoot must be set for this task"
-            unless="testRoot"/>
-        <mkdir
-            dir="${testRoot}"/>
-
-        <!-- if results already exist, delete them -->
-        <delete
-            dir="${testRoot}/results"
-            failOnError="false"/>
-        <mkdir
-            dir="${testRoot}/results"/>
-        <mkdir
-            dir="${testRoot}/results/consolelogs"/>
-        <copy
-            todir="${testRoot}"
-            overwrite="true">
-            <fileset
-                dir="${test.component.dir}/testScripts"/>
-        </copy>
-        <echo
-            message="BASEOS: ${env.BASEOS}   BASEWS: ${env.BASEWS}   BASEARCH: ${env.BASEARCH} "/>
-        <!--
-            for this distribution, dependencies come from releng. Assume
-            no subdirectory, if not otherwise set (bug 285383).
-        -->
-        <property
-            name="env.DEP_DIR"
-            value=""/>
-        <property
-            name="dependency.properties"
-            value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-        <available
-            file="${dependency.properties}"
-            property="dependency.properties.exists"/>
-        <fail
-            message="dependency file not found: ${dependency.properties}"
-            unless="dependency.properties.exists"/>
-        <ant
-            antfile="${test.component.dir}/testdependency.xml"
-            target="get">
-            <property
-                name="base.install.dir"
-                value="${testRoot}"/>
-        </ant>
-        <antcall
-            target="unzipTests"/>
-        <antcall
-            target="runTestEclipse">
-            <param
-                name="testTarget"
-                value="all"/>
-        </antcall>
-        <antcall
-            target="postRunTestEclipse">
-            <param
-                name="testTarget"
-                value="all"/>
-        </antcall>
-    </target>
-    <target
-        name="unzipTests">
-        <!--
-            unzip the builds and junit tests we use 'unzip' here, so we
-            can continue on error, if desired. (such as if zip was not
-            created, due to other failures or options).
-        -->
-        <exec
-            dir="${buildDirectory}/${buildLabel}"
-            executable="unzip"
-            failonerror="false">
-            <arg
-                line="-o -qq wtp-sdk-${buildLabel}.zip -d ${testRoot}${dropinsFolder}"/>
-        </exec>
-        <exec
-            dir="${buildDirectory}/${buildLabel}"
-            executable="unzip"
-            failonerror="false">
-            <arg
-                line="-o -qq wtp-wst-Automated-Tests-${buildLabel}.zip -d ${testRoot}${dropinsFolder}"/>
-        </exec>
-        <exec
-            dir="${buildDirectory}/${buildLabel}"
-            executable="unzip"
-            failonerror="false">
-            <arg
-                line="-o -qq wtp-jst-Automated-Tests-${buildLabel}.zip -d ${testRoot}${dropinsFolder}"/>
-        </exec>
-        <exec
-            dir="${buildDirectory}/${buildLabel}"
-            executable="unzip"
-            failonerror="false">
-            <arg
-                line="-o -qq wtp-jpt-sdk-${buildLabel}.zip -d ${testRoot}${dropinsFolder}"/>
-        </exec>
-        <exec
-            dir="${buildDirectory}/${buildLabel}"
-            executable="unzip"
-            failonerror="false">
-            <arg
-                line="-o -qq wtp-jpt-Automated-Tests-${buildLabel}.zip -d ${testRoot}${dropinsFolder}"/>
-        </exec>
-    </target>
-    <!--
-        time out may need to be set/adjust for api or performance tests?
-        This testTimeLimit is the whole, overall limit on tests. There's
-        a shorter one for individual suites. some common values, of
-        milliseconds to more recognizable units: 
-        14400000: 4 hours
-        7200000: 2 hours 
-        3600000: 1 hour  
-        1800000: 30 minutes 
-        600000: 10 minutes
-    -->
-    <property
-        name="testTimeLimit"
-        value="14400000"/>
-    <property
-        name="testFailOnError"
-        value="false"/>
-    <target
-        name="runTestEclipse"
-        description="Run our JUnit's within an instance of antRunner">
-        <property
-            name="test-vm"
-            value="${env.JAVA_6_HOME}/bin/java"/>
-        <property
-            name="plugin-path"
-            value="${testRoot}${dropinsFolder}/eclipse/plugins"/>
-        <property
-            name="vmargs"
-            value="-Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH}  -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm}  -Dperf.buildId=${buildType}${date}-${time}"/>
-        <!--
-            set path to eclipse folder. If local folder, use '.';
-            otherwise, use c:\path\to\eclipse or /path/to/eclipse/
-        -->
-        <property
-            name="eclipse.home"
-            value="${testRoot}"/>
-        <echo
-            message="testTarget: ${testTarget}"/>
-        <!--
-            can not pass in empty values in jvmargs so if not testBundle
-            specified, we'll pass a junk (unused) value
-        -->
-        <condition
-            property="testBundleParam"
-            value="-DtestBundle=${testBundle}"
-            else="-Dunused=nouse">
-            <isset
-                property="testBundle"/>
-        </condition>
-        <echo
-            message="Running junits"/>
-        <!--
-            If there is not exactly one launcher in the stack, we'd best
-            fail fast, since we are not expecting that, and may indicate
-            an installation that would produce unpredictable results
-        -->
-        <!--
-            requires ant 1.7, and at this point, we're running 1.6 from
-            eclipse ... <condition property="expectedNumberOfLaunchers">
-            <resourcecount when="equal" count="1" > <fileset
-            dir="${testRoot}/eclipse/plugins"> <include
-            name="org.eclipse.equinox.launcher_*.jar" /> </fileset>
-            </resourcecount> </condition> <fail message="Did not find
-            expected number of launcher jars. Check installation."
-            unless="expectedNumberOfLaunchers" />
-        -->
-        <!--
-            Remember: using -debug for org.eclipse.ant.core.antRunner
-            produces ant debug info to be output ... which is a TON of
-            stuff
-        -->
-        <java
-            taskname="unit-test-masterprocess"
-            fork="true"
-            resultProperty="wtpmasterjunitresult"
-            failonerror="false"
-            timeout="${testTimeLimit}"
-            dir="${testRoot}/eclipse"
-            jvm="${env.JAVA_6_HOME}/bin/java"
-            classname="org.eclipse.equinox.launcher.Main">
-            <classpath>
-                <fileset
-                    dir="${testRoot}/eclipse/plugins">
-                    <include
-                        name="org.eclipse.equinox.launcher_*.jar"/>
-                </fileset>
-            </classpath>
-            <jvmarg
-                value="-Xverify"/>
-            <jvmarg
-                value="-Dosgi.ws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dosgi.os=${env.BASEOS}"/>
-            <jvmarg
-                value="-Dosgi.arch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-Dws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dos=${env.BASEOS}"/>
-            <jvmarg
-                value="-Darch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-Dnoclean=true"/>
-            <jvmarg
-                value="-DbuildBranch=${buildBranch}"/>
-            <jvmarg
-                value="-DbuildType=${buildType}"/>
-            <jvmarg
-                value="-DbuildId=${buildId}"/>
-            <jvmarg
-                value="-Dprojectname=${projectname}"/>
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <jvmarg
-                value="${testBundleParam}"/>
-            <arg
-                value="-nosplash"/>
-            <arg
-                value="-consolelog"/>
-            <arg
-                value="-data"/>
-            <arg
-                value="${testRoot}/overallTestWorkspace"/>
-            <arg
-                value="-application"/>
-            <arg
-                value="org.eclipse.ant.core.antRunner"/>
-            <arg
-                value="-verbose"/>
-            <arg
-                value="-logger"/>
-            <arg
-                value="org.apache.tools.ant.DefaultLogger"/>
-            <arg
-                value="-file"/>
-            <arg
-                value="${testRoot}/test.xml"/>
-            <arg
-                value="${testTarget}"/>
-
-            <!--  make sure our forked env has a DISPLAY -->
-            <env
-                key="DISPLAY"
-                value="${env.DISPLAY}"/>
-            <redirector
-                output="${testRoot}/results/fullOutput.txt"
-                error="${testRoot}/results/fullErrorLog.txt"/>
-            <jvmarg
-                value="-Dbuild.home=${env.BUILD_HOME}"/>
-            <jvmarg
-                value="-DbuildDirectory=${buildDirectory}"/>
-            <jvmarg
-                value="-DbuildLabel=${buildLabel}"/>
-            <jvmarg
-                value="-DbaseLocation=${baseLocation}"/>
-            <jvmarg
-                value="-DtestRoot=${testRoot}"/>
-            <jvmarg
-                value="-DtestDir=${testRoot}"/>
-            <jvmarg
-                value="-Dperf.buildId=${buildType}${date}-${time}"/>
-            <jvmarg
-                value="-DeclipseBuilderDirectory=${pde.builder.path}"/>
-            <jvmarg
-                value="-DbuildLabel=${buildLabel}"/>
-            <jvmarg
-                value="-Dplugin-path=${plugin-path}"/>
-            <!-- IBM_JAVA_OPTIONS contains JIT work arounds for bug 284441 -->
-            <env
-                key="IBM_JAVA_OPTIONS"
-                value="-Xjit:{org/eclipse/wst/html/core/internal/contenttype/HTMLHeadTokenizer.primGetNextToken()Ljava/lang/String;}(disableLookahead),{org/eclipse/jst/jsp/core/internal/parser/internal/JSPTokenizer.primGetNextToken()Ljava/lang/String;}(disableLookahead)"/>
-        </java>
-        <echo
-            message="wtpmasterjunitresult ${wtpmasterjunitresult}"/>
-    </target>
-    <target
-        name="postRunTestEclipse">
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/consolelogs/testLogs"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results">
-                <include
-                    name="*output.txt"/>
-            </fileset>
-        </copy>
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/consolelogs/testSysErrorLogs"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results">
-                <include
-                    name="*error.txt"/>
-            </fileset>
-        </copy>
-        <copy
-            file="${testRoot}/results/fullOutput.txt"
-            toDir="${buildDirectory}/${buildLabel}/testResults/consolelogs/full"
-            overwrite="true"
-            failonerror="false">
-        </copy>
-        <copy
-            file="${testRoot}/results/fullErrorLog.txt"
-            toDir="${buildDirectory}/${buildLabel}/testResults/consolelogs/full"
-            overwrite="true"
-            failonerror="false">
-        </copy>
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/xml"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results/xml">
-                <include
-                    name="*.xml"/>
-            </fileset>
-        </copy>
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/html"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results/html">
-                <include
-                    name="*.html"/>
-            </fileset>
-        </copy>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtp.tests/templateFiles/index.php b/releng.wtpbuilder/distribution/wtp.tests/templateFiles/index.php
deleted file mode 100644
index a42c883..0000000
--- a/releng.wtpbuilder/distribution/wtp.tests/templateFiles/index.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<html>
-<head>
-
-<?php
-$parts = explode("/", realpath(".."));
-$label = $parts[count($parts) - 1];
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-</head>
-<body>
-<p><b><font face="Verdana" size="+3">Test Results</font></b></p>
-<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">Unit Test Results for <?php echo "$label"; ?>
-		</font></b></td>
-	</tr>
-</table>
-<p></p>
-<table border="0">
-</table>
-
-<table width="77%" border="1">
-	<tr>
-		<td width="81%"><b>Tests Performed</b></td>
-		<td width="19%"><b>Errors &amp; Failures</b></td>
-	</tr>
-
-	<?
-	$dir = dir("html");
-	while ($anEntry = $dir->read())
-	{
-		if ($anEntry != "." && $anEntry != "..")
-		{
-			$link = "html/".$anEntry;
-			$xml = "xml/".substr($anEntry, 0, strlen($anEntry)-4)."xml";
-			$count = 0;
-			$fileHandle = fopen($xml, "r");
-			while (!feof($fileHandle))
-			{
-				$aLine = fgets($fileHandle, 4096); // Length parameter only optional after 4.2.0
-				$count = $count + substr_count($aLine, '<error');
-			}
-			fclose($fileHandle);
-			if ($count > 0)
-			{
-				echo "<tr><td><a href=\"$link\"><b><font color=\"red\">";
-				echo "$anEntry";
-				echo "</font></b></a></td>";
-				echo "<td><b><font color=\"red\">$count</font></b></td></tr>";
-			}
-			else
-			{
-				echo "<tr><td><a href=\"$link\">";
-				echo "$anEntry";
-				echo "</a></td>";
-				echo "<td>$count</td></tr>";
-			}
-		}
-	}
-	?>
-
-</table>
-<p></p>
-<br>
-<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"> Console output logs <?php echo "$label"; ?>
-		</font></b></td>
-	</tr>
-</table>
-<br>
-These
-<a href="consolelogs/wtptestlog.txt">logs</a>
-contain the console output captured while running the JUnit automated
-tests.
-<br>
-<br>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/wtp.tests/testScripts/JUNIT.XSL b/releng.wtpbuilder/distribution/wtp.tests/testScripts/JUNIT.XSL
deleted file mode 100644
index 9cdd80e..0000000
--- a/releng.wtpbuilder/distribution/wtp.tests/testScripts/JUNIT.XSL
+++ /dev/null
@@ -1,703 +0,0 @@
-<xsl:stylesheet
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="1.0">
-    <xsl:output
-        method="html"
-        indent="yes"/>
-    <xsl:decimal-format
-        decimal-separator="."
-        grouping-separator=","/>
-    <xsl:template
-        match="testsuites">
-        <HTML>
-            <HEAD>
-                <style
-                    type="text/css"> body { font:normal 68%
-                    verdana,arial,helvetica; color:#000000; } table tr
-                    td, table tr th { font-size: 68%; } table.details tr
-                    th{ font-weight: bold; text-align:left;
-                    background:#a6caf0; } table.details tr td{
-                    background:#eeeee0; } p { line-height:1.5em;
-                    margin-top:0.5em; margin-bottom:1.0em; } h1 {
-                    margin: 0px 0px 5px; font: 165%
-                    verdana,arial,helvetica } h2 { margin-top: 1em;
-                    margin-bottom: 0.5em; font: bold 125%
-                    verdana,arial,helvetica } h3 { margin-bottom: 0.5em;
-                    font: bold 115% verdana,arial,helvetica } h4 {
-                    margin-bottom: 0.5em; font: bold 100%
-                    verdana,arial,helvetica } h5 { margin-bottom: 0.5em;
-                    font: bold 100% verdana,arial,helvetica } h6 {
-                    margin-bottom: 0.5em; font: bold 100%
-                    verdana,arial,helvetica } .Error { font-weight:bold;
-                    color:red; } .Failure { font-weight:bold;
-                    color:purple; } .Properties { text-align:right; } </style>
-                <script
-                    language="JavaScript">
-                    var TestCases = new Array(); var cur;
-                    <xsl:for-each
-                        select="./testsuite">
-                        <xsl:apply-templates
-                            select="properties"/>
-                    </xsl:for-each>
-                </script>
-                <script
-                    language="JavaScript"><![CDATA[
-        function displayProperties (name) {
-          var win = window.open('','JUnitSystemProperties','scrollbars=1,resizable=1');
-          var doc = win.document.open();
-          doc.write("<html><head><title>Properties of " + name + "</title>");
-          doc.write("<style>")
-          doc.write("body {font:normal 68% verdana,arial,helvetica;	color:#000000; }");
-          doc.write("table tr td, table tr th { font-size: 68%; }");
-          doc.write("table.properties { border-collapse:collapse; border-left:solid 1 #cccccc; border-top:solid 1 #cccccc; padding:5px; }");
-          doc.write("table.properties th { text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#eeeeee; }");
-          doc.write("table.properties td { font:normal; text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#fffffff; }");
-          doc.write("h3 { margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica }");
-          doc.write("</style>");
-          doc.write("</head><body>");
-          doc.write("<h3>Properties of " + name + "</h3>");
-          doc.write("<div align=\"right\"><a href=\"javascript:window.close();\">Close</a></div>");
-          doc.write("<table class='properties'>");
-          doc.write("<tr><th>Name</th><th>Value</th></tr>");
-          for (prop in TestCases[name]) {
-            doc.write("<tr><th>" + prop + "</th><td>" + TestCases[name][prop] + "</td></tr>");
-          }
-          doc.write("</table>");
-          doc.write("</body></html>");
-          doc.close();
-          win.focus();
-        }
-      ]]>
-                </script>
-            </HEAD>
-            <body>
-                <a
-                    name="top"></a>
-                <xsl:call-template
-                    name="pageHeader"/>
-
-                <!-- Summary part -->
-                <xsl:call-template
-                    name="summary"/>
-                <hr
-                    size="1"
-                    width="95%"
-                    align="left"/>
-
-                <!-- Package List part -->
-                <xsl:call-template
-                    name="packagelist"/>
-                <hr
-                    size="1"
-                    width="95%"
-                    align="left"/>
-
-                <!-- For each package create its part -->
-                <xsl:call-template
-                    name="packages"/>
-                <hr
-                    size="1"
-                    width="95%"
-                    align="left"/>
-
-                <!-- For each class create the  part -->
-                <xsl:call-template
-                    name="classes"/>
-            </body>
-        </HTML>
-    </xsl:template>
-    <!--
-        ==================================================================
-    -->
-    <!--
-        Write a list of all packages with an hyperlink to the anchor of
-    -->
-    <!--
-        of the package name.
-    -->
-    <!--
-        ==================================================================
-    -->
-    <xsl:template
-        name="packagelist">
-        <h2>Packages</h2>
-        Note: package statistics are not computed recursively, they only
-        sum up all of its testsuites numbers.
-        <table
-            class="details"
-            border="0"
-            cellpadding="5"
-            cellspacing="2"
-            width="95%">
-            <xsl:call-template
-                name="testsuite.test.header"/>
-            <!-- list all packages recursively -->
-            <xsl:for-each
-                select="./testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
-                <xsl:sort
-                    select="@package"/>
-                <xsl:variable
-                    name="testsuites-in-package"
-                    select="/testsuites/testsuite[./@package = current()/@package]"/>
-                <xsl:variable
-                    name="testCount"
-                    select="sum($testsuites-in-package/@tests)"/>
-                <xsl:variable
-                    name="errorCount"
-                    select="sum($testsuites-in-package/@errors)"/>
-                <xsl:variable
-                    name="failureCount"
-                    select="sum($testsuites-in-package/@failures)"/>
-                <xsl:variable
-                    name="timeCount"
-                    select="sum($testsuites-in-package/@time)"/>
-
-                <!-- write a summary for the package -->
-                <tr
-                    valign="top">
-                    <!-- set a nice color depending if there is an error/failure -->
-                    <xsl:attribute
-                        name="class">
-						<xsl:choose>
-							<xsl:when
-                        test="$failureCount &gt; 0">Failure</xsl:when>
-							<xsl:when
-                        test="$errorCount &gt; 0">Error</xsl:when>
-						</xsl:choose>
-					</xsl:attribute>
-                    <td>
-                        <a
-                            href="#{@package}">
-                            <xsl:value-of
-                                select="@package"/>
-                        </a>
-                    </td>
-                    <td>
-                        <xsl:value-of
-                            select="$testCount"/>
-                    </td>
-                    <td>
-                        <xsl:value-of
-                            select="$errorCount"/>
-                    </td>
-                    <td>
-                        <xsl:value-of
-                            select="$failureCount"/>
-                    </td>
-                    <td>
-                        <xsl:call-template
-                            name="display-time">
-                            <xsl:with-param
-                                name="value"
-                                select="$timeCount"/>
-                        </xsl:call-template>
-                    </td>
-                </tr>
-            </xsl:for-each>
-        </table>
-    </xsl:template>
-    <!--
-        ==================================================================
-    -->
-    <!--
-        Write a package level report
-    -->
-    <!--
-        It creates a table with values from the document:
-    -->
-    <!--
-        Name | Tests | Errors | Failures | Time
-    -->
-    <!--
-        ==================================================================
-    -->
-    <xsl:template
-        name="packages">
-        <!-- create an anchor to this package name -->
-        <xsl:for-each
-            select="/testsuites/testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
-            <xsl:sort
-                select="@package"/>
-            <a
-                name="{@package}"></a>
-            <h3>
-                Package
-                <xsl:value-of
-                    select="@package"/>
-            </h3>
-            <table
-                class="details"
-                border="0"
-                cellpadding="5"
-                cellspacing="2"
-                width="95%">
-                <xsl:call-template
-                    name="testsuite.test.header"/>
-
-                <!-- match the testsuites of this package -->
-                <xsl:apply-templates
-                    select="/testsuites/testsuite[./@package = current()/@package]"
-                    mode="print.test"/>
-            </table>
-            <a
-                href="#top">Back to top</a>
-            <p/>
-            <p/>
-        </xsl:for-each>
-    </xsl:template>
-    <xsl:template
-        name="classes">
-        <xsl:for-each
-            select="testsuite">
-            <xsl:sort
-                select="@name"/>
-            <!-- create an anchor to this class name -->
-            <a
-                name="{@name}"></a>
-            <h3>
-                TestCase
-                <xsl:value-of
-                    select="@name"/>
-            </h3>
-            <table
-                class="details"
-                border="0"
-                cellpadding="5"
-                cellspacing="2"
-                width="95%">
-                <xsl:call-template
-                    name="testcase.test.header"/>
-                <!--
-                    test can even not be started at all (failure to load
-                    the class) so report the error directly
-                -->
-                <xsl:if
-                    test="./error">
-                    <tr
-                        class="Error">
-                        <td
-                            colspan="4">
-                            <xsl:apply-templates
-                                select="./error"/>
-                        </td>
-                    </tr>
-                </xsl:if>
-                <xsl:apply-templates
-                    select="./testcase"
-                    mode="print.test"/>
-            </table>
-            <div
-                class="Properties">
-                <a>
-                    <xsl:attribute
-                        name="href">javascript:displayProperties('<xsl:value-of
-                        select="@package"/>.<xsl:value-of
-                        select="@name"/>');</xsl:attribute>
-                    Properties &gt;&gt;
-                </a>
-            </div>
-            <p/>
-            <a
-                href="#top">Back to top</a>
-        </xsl:for-each>
-    </xsl:template>
-    <xsl:template
-        name="summary">
-        <h2>Summary</h2>
-        <xsl:variable
-            name="testCount"
-            select="sum(testsuite/@tests)"/>
-        <xsl:variable
-            name="errorCount"
-            select="sum(testsuite/@errors)"/>
-        <xsl:variable
-            name="failureCount"
-            select="sum(testsuite/@failures)"/>
-        <xsl:variable
-            name="timeCount"
-            select="sum(testsuite/@time)"/>
-        <xsl:variable
-            name="successRate"
-            select="($testCount - $failureCount - $errorCount) div $testCount"/>
-        <table
-            class="details"
-            border="0"
-            cellpadding="5"
-            cellspacing="2"
-            width="95%">
-            <tr
-                valign="top">
-                <th>Tests</th>
-                <th>Failures</th>
-                <th>Errors</th>
-                <th>Success rate</th>
-                <th>Time</th>
-            </tr>
-            <tr
-                valign="top">
-                <xsl:attribute
-                    name="class">
-				<xsl:choose>
-					<xsl:when
-                    test="$failureCount &gt; 0">Failure</xsl:when>
-					<xsl:when
-                    test="$errorCount &gt; 0">Error</xsl:when>
-				</xsl:choose>
-			</xsl:attribute>
-                <td>
-                    <xsl:value-of
-                        select="$testCount"/>
-                </td>
-                <td>
-                    <xsl:value-of
-                        select="$failureCount"/>
-                </td>
-                <td>
-                    <xsl:value-of
-                        select="$errorCount"/>
-                </td>
-                <td>
-                    <xsl:call-template
-                        name="display-percent">
-                        <xsl:with-param
-                            name="value"
-                            select="$successRate"/>
-                    </xsl:call-template>
-                </td>
-                <td>
-                    <xsl:call-template
-                        name="display-time">
-                        <xsl:with-param
-                            name="value"
-                            select="$timeCount"/>
-                    </xsl:call-template>
-                </td>
-            </tr>
-        </table>
-        <table
-            border="0"
-            width="95%">
-            <tr>
-                <td
-                    style="text-align: justify;">
-                    Note:
-                    <i>failures</i>
-                    are anticipated and checked for with assertions
-                    while
-                    <i>errors</i>
-                    are unanticipated.
-                </td>
-            </tr>
-        </table>
-    </xsl:template>
-    <!--
-        Write properties into a JavaScript data structure. This is based
-        on the original idea by Erik Hatcher (erik@hatcher.net)
-    -->
-    <xsl:template
-        match="properties">
-        cur = TestCases['
-        <xsl:value-of
-            select="../@package"/>
-        .
-        <xsl:value-of
-            select="../@name"/>
-        '] = new Array();
-        <xsl:for-each
-            select="property">
-            <xsl:sort
-                select="@name"/>
-            cur['
-            <xsl:value-of
-                select="@name"/>
-            '] = '
-            <xsl:call-template
-                name="JS-escape">
-                <xsl:with-param
-                    name="string"
-                    select="@value"/>
-            </xsl:call-template>
-            ';
-        </xsl:for-each>
-    </xsl:template>
-
-    <!-- Page HEADER -->
-    <xsl:template
-        name="pageHeader">
-        <h1>Unit Test Results</h1>
-        <table
-            width="100%">
-            <tr>
-                <td
-                    align="left"></td>
-                <td
-                    align="right">
-                    Designed for use with
-                    <a
-                        href='http://www.junit.org'>JUnit</a>
-                    and
-                    <a
-                        href='http://jakarta.apache.org/ant'>Ant</a>
-                    .
-                </td>
-            </tr>
-        </table>
-        <hr
-            size="1"/>
-    </xsl:template>
-    <xsl:template
-        match="testsuite"
-        mode="header">
-        <tr
-            valign="top">
-            <th
-                width="80%">Name</th>
-            <th>Tests</th>
-            <th>Errors</th>
-            <th>Failures</th>
-            <th
-                nowrap="nowrap">Time(s)</th>
-        </tr>
-    </xsl:template>
-
-    <!-- class header -->
-    <xsl:template
-        name="testsuite.test.header">
-        <tr
-            valign="top">
-            <th
-                width="80%">Name</th>
-            <th>Tests</th>
-            <th>Errors</th>
-            <th>Failures</th>
-            <th
-                nowrap="nowrap">Time(s)</th>
-        </tr>
-    </xsl:template>
-
-    <!-- method header -->
-    <xsl:template
-        name="testcase.test.header">
-        <tr
-            valign="top">
-            <th>Name</th>
-            <th>Status</th>
-            <th
-                width="80%">Type</th>
-            <th
-                nowrap="nowrap">Time(s)</th>
-        </tr>
-    </xsl:template>
-
-
-    <!-- class information -->
-    <xsl:template
-        match="testsuite"
-        mode="print.test">
-        <tr
-            valign="top">
-            <!-- set a nice color depending if there is an error/failure -->
-            <xsl:attribute
-                name="class">
-			<xsl:choose>
-				<xsl:when
-                test="@failures[.&gt; 0]">Failure</xsl:when>
-				<xsl:when
-                test="@errors[.&gt; 0]">Error</xsl:when>
-			</xsl:choose>
-		</xsl:attribute>
-
-            <!-- print testsuite information -->
-            <td>
-                <a
-                    href="#{@name}">
-                    <xsl:value-of
-                        select="@name"/>
-                </a>
-            </td>
-            <td>
-                <xsl:value-of
-                    select="@tests"/>
-            </td>
-            <td>
-                <xsl:value-of
-                    select="@errors"/>
-            </td>
-            <td>
-                <xsl:value-of
-                    select="@failures"/>
-            </td>
-            <td>
-                <xsl:call-template
-                    name="display-time">
-                    <xsl:with-param
-                        name="value"
-                        select="@time"/>
-                </xsl:call-template>
-            </td>
-        </tr>
-    </xsl:template>
-    <xsl:template
-        match="testcase"
-        mode="print.test">
-        <tr
-            valign="top">
-            <xsl:attribute
-                name="class">
-			<xsl:choose>
-				<xsl:when
-                test="failure | error">Error</xsl:when>
-			</xsl:choose>
-		</xsl:attribute>
-            <td>
-                <xsl:value-of
-                    select="@name"/>
-            </td>
-            <xsl:choose>
-                <xsl:when
-                    test="failure">
-                    <td>Failure</td>
-                    <td>
-                        <xsl:apply-templates
-                            select="failure"/>
-                    </td>
-                </xsl:when>
-                <xsl:when
-                    test="error">
-                    <td>Error</td>
-                    <td>
-                        <xsl:apply-templates
-                            select="error"/>
-                    </td>
-                </xsl:when>
-                <xsl:otherwise>
-                    <td>Success</td>
-                    <td></td>
-                </xsl:otherwise>
-            </xsl:choose>
-            <td>
-                <xsl:call-template
-                    name="display-time">
-                    <xsl:with-param
-                        name="value"
-                        select="@time"/>
-                </xsl:call-template>
-            </td>
-        </tr>
-    </xsl:template>
-    <xsl:template
-        match="failure">
-        <xsl:call-template
-            name="display-failures"/>
-    </xsl:template>
-    <xsl:template
-        match="error">
-        <xsl:call-template
-            name="display-failures"/>
-    </xsl:template>
-
-    <!-- Style for the error and failure in the tescase template -->
-    <xsl:template
-        name="display-failures">
-        <xsl:choose>
-            <xsl:when
-                test="not(@message)">
-                N/A
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of
-                    select="@message"/>
-            </xsl:otherwise>
-        </xsl:choose>
-        <!-- display the stacktrace -->
-        <code>
-            <p/>
-            <xsl:call-template
-                name="br-replace">
-                <xsl:with-param
-                    name="word"
-                    select="."/>
-            </xsl:call-template>
-        </code>
-        <!--
-            the later is better but might be problematic for non-21"
-            monitors...
-        -->
-        <!--pre><xsl:value-of select="."/></pre-->
-    </xsl:template>
-    <xsl:template
-        name="JS-escape">
-        <xsl:param
-            name="string"/>
-        <xsl:choose>
-            <!--
-                something isn't right here, basically all single quotes
-                need to be replaced with backslash-single-quote
-                <xsl:when test="contains($string,'&apos;')">
-                <xsl:value-of
-                select="substring-before($string,'&apos;')"/> \&apos;
-                <xsl:call-template name="JS-escape"> <xsl:with-param
-                name="string"
-                select="substring-after($string,'&apos;')"/>
-                </xsl:call-template> </xsl:when>
-            -->
-            <xsl:when
-                test="contains($string,'\')">
-                <xsl:value-of
-                    select="substring-before($string,'\')"/>
-                \\
-                <xsl:call-template
-                    name="JS-escape">
-                    <xsl:with-param
-                        name="string"
-                        select="substring-after($string,'\')"/>
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of
-                    select="$string"/>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-    <!--
-        template that will convert a carriage return into a br tag
-        @param word the text from which to convert CR to BR tag
-    -->
-    <xsl:template
-        name="br-replace">
-        <xsl:param
-            name="word"/>
-        <xsl:choose>
-            <xsl:when
-                test="contains($word,'&#xA;')">
-                <xsl:value-of
-                    select="substring-before($word,'&#xA;')"/>
-                <br/>
-                <xsl:call-template
-                    name="br-replace">
-                    <xsl:with-param
-                        name="word"
-                        select="substring-after($word,'&#xA;')"/>
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of
-                    select="$word"/>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-    <xsl:template
-        name="display-time">
-        <xsl:param
-            name="value"/>
-        <xsl:value-of
-            select="format-number($value,'0.000')"/>
-    </xsl:template>
-    <xsl:template
-        name="display-percent">
-        <xsl:param
-            name="value"/>
-        <xsl:value-of
-            select="format-number($value,'0.00%')"/>
-    </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtp.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/wtp.tests/testScripts/test.xml
deleted file mode 100644
index a02caa0..0000000
--- a/releng.wtpbuilder/distribution/wtp.tests/testScripts/test.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<project
-    name="Automated Eclipse Testing"
-    default="all"
-    basedir=".">
-    <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-    <echo
-        level="info"
-        message="starting Automated Eclipse Testing"/>
-    <echo
-        level="debug"
-        message="basedir: ${basedir}"/>
-    <echo
-        level="debug"
-        message="testRoot: ${testRoot}"/>
-    <fail
-        message="testRoot must be set"
-        unless="testRoot"/>
-
-    <!--properties file containing the some server name properties -->
-    <property
-        file="${testRoot}/testServer.properties"/>
-
-    <!--properties file containing the build information-->
-    <property
-        file="${buildDirectory}/label.properties"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-    <!--default directory where test-eclipse will be installed-->
-    <property
-        name="install"
-        value="${testRoot}"/>
-    <!--
-        name that can be added to report name to identify which platform
-        tests results come from
-    -->
-    <property
-        name="platform"
-        value=""/>
-
-    <!-- The root of the eclipse installation -->
-    <property
-        name="eclipse-home"
-        value="${testRoot}${dropinsFolder}/eclipse/"/>
-    <!--
-        The directory that will contain the xml and html results from
-        the tests that are run
-    -->
-    <property
-        name="results"
-        value="${testRoot}/results"/>
-    <property
-        name="library-file"
-        value="${testRoot}/wtp-junit-tests.xml"/>
-
-    <!-- jonas install directory -->
-    <!-- TODO: why do this twice? Here and in init? -->
-    <property
-        name="jonas432Dir"
-        value="${testRoot}/${jonas432DirName}"/>
-    <target
-        name="init">
-        <antcall
-            target="setPropertyJOnAS432Dir"/>
-    </target>
-    <target
-        name="setPropertyJOnAS432Dir"
-        unless="jonas432Dir">
-        <property
-            name="jonas432Dir"
-            value="${testRoot}/${jonas432DirName}"/>
-    </target>
-    <target
-        name="all"
-        depends="init,runOneTestBundle"
-        unless="testBundle">
-        <echo
-            level="info"
-            message="Starting Unit Tests"/>
-        <!--
-            unlike other ant tasks, subant defaults to false for
-            inheritall!
-        -->
-        <subant
-            target=""
-            inheritall="true">
-            <fileset
-                dir="${eclipse-home}/plugins/">
-                <exclude
-                    name="**/*performance*/test.xml"/>
-                <!--
-                    pagedesigner DNFs. See
-                    https://bugs.eclipse.org/bugs/show_bug.cgi?id=259060
-                -->
-                <exclude
-                    name="**/org.eclipse.jst.pagedesigner.tests*/test.xml"/>
-                <include
-                    name="**/test.xml"/>
-            </fileset>
-        </subant>
-        <echo
-            level="info"
-            message="Ended Unit Tests"/>
-        <antcall
-            target="genHtml"/>
-    </target>
-    <!--
-        by making 'all' the default, and "runOneTestBundle" as its
-        'depends' we can effectively control which is ran based on
-        whether or not 'testBundle' has been defined by caller. If so,
-        only that one is ran, otherwise, all of them are. Note, in many
-        cases a collection of tests could be ran, by specifying a
-        partial bundle name. for example, specifying
-        "org.eclipse.jst.jsp" would execute the 3 JSP tests:
-        org.eclipse.jst.jsp.core.tests,
-        org.eclipse.jst.jsp.tests.encoding,
-        org.eclipse.jst.jsp.ui.tests.
-    -->
-    <target
-        name="runOneTestBundle"
-        depends="init"
-        if="testBundle">
-        <echo
-            level="info"
-            message="Starting Unit Tests for one test bundle"/>
-        <!--
-            unlike other ant tasks, subant defaults to false for
-            inheritall!
-        -->
-        <subant
-            target=""
-            inheritall="true">
-            <fileset
-                dir="${eclipse-home}/plugins/">
-                <exclude
-                    name="**/*performance*/test.xml"/>
-                <include
-                    name="**/${testBundle}*/test.xml"/>
-            </fileset>
-        </subant>
-        <echo
-            level="info"
-            message="Finished Unit Tests for one test bundle"/>
-        <antcall
-            target="genHtml"/>
-    </target>
-    <target
-        name="genHtml"
-        description="Generates HTML results with provided JUNIT.XSL provided"
-        unless="genHtml.disable">
-        <xslt
-            style="JUNIT.XSL"
-            basedir="${results}/xml"
-            destdir="${results}/html"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtp.tests/testScripts/testServer.properties b/releng.wtpbuilder/distribution/wtp.tests/testScripts/testServer.properties
deleted file mode 100644
index be77c9b..0000000
--- a/releng.wtpbuilder/distribution/wtp.tests/testScripts/testServer.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-
-# Tomcat dirs
-tomcat50Dir=jakarta-tomcat-5.0.28
-
-# Jonas dirs
-#jonas432Dir=
-jonas432DirName=JONAS_4_3_2
-
-# SWT
-#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
-
-# JSF Runtime Library directory
-jsf1.1Dir=myfaces-core-1.1.5/lib
-
-# JPT Persistence Runtime Library path
-jpt-persistence-jar=jpt/jpt-persistence-2.0-preview/lib/javax.persistence_2.0_preview.jar
-jpt-eclipselink-jar=jpt/jpt-eclipselink-2.0.0/lib/eclipselink.jar
-
-jpt-persistence10-jar=jpt/persistence-1.0/lib/persistence.jar
-jpt-eclipselink110-jar=jpt/eclipselink-1.1.0/lib/eclipselink.jar
diff --git a/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml
deleted file mode 100644
index 026e52f..0000000
--- a/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml
+++ /dev/null
@@ -1,317 +0,0 @@
-<?xml version="1.0"?>
-<project
-    name="JUnit tests"
-    basedir=".">
-    <property
-        environment="env"/>
-
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-    <target
-        name="init">
-        <property
-            name="junit-report-output"
-            value="${testRoot}/results"/>
-        <mkdir
-            dir="${junit-report-output}/raw"/>
-       <!--
-            if not otherwise set, be sure extraVMargs is at least some
-            string, even if unused string. 
-            
-            Remember, though, extraVMArgs can contain more than one extra arg, 
-            so much be passed to VM as a "line", not "value". 
-        -->
-        <property
-            name="extraVMargs"
-            value="-DextraVMargsunused=notused"/>
-
-        <!-- if not otherwise set, use a unique workspace name -->
-        <property
-            name="data-dir"
-            value="${testRoot}/junitworkspaces/workspace-${classname}"/>
-        <property
-            name="testRoot"
-            value="${testRoot}"/>
-        <!--
-        Some common values, of milliseconds to more recognizable units: 
-        14400000: 4 hours
-        7200000: 2 hours 
-        3600000: 1 hour  
-        1800000: 30 minutes 
-        600000: 10 minutes
-        -->
-        <property
-            name="timeout"
-            value="3600000"/>
-        <property
-            name="junit-report-output"
-            value="${junit-report-output}"/>
-        <property
-            name="formatter"
-            value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter"/>
-        <property
-            name="test-output"
-            value="${junit-report-output}/raw/${classname}.xml"/>
-        <property
-            name="jvm"
-            value="${env.JAVA_6_HOME}/bin/java"/>
-        <dirname
-            file="${ant.file}"
-            property="currentDir"/>
-        <echo
-            level="debug"
-            message="data-dir: ${data-dir}"/>
-        <echo
-            level="debug"
-            message="plugin-name: ${plugin-name}"/>
-        <echo
-            level="debug"
-            message="classname: ${classname}"/>
-        <echo
-            level="info"
-            message="extraVMargs: ${extraVMargs}"/>
-        <echo
-            level="debug"
-            message="timeout: ${timeout}"/>
-        <echo
-            level="debug"
-            message="testRoot: ${testRoot}"/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="debug"
-            message="eclipse-home: ${eclipse-home}"/>
-        <echo
-            level="debug"
-            message="junit-report-output: ${junit-report-output}"/>
-        <echo
-            level="debug"
-            message="test-output: ${test-output}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="buildLabel: ${buildLabel}"/>
-        <echo
-            level="debug"
-            message="jvm: ${jvm}"/>
-    </target>
-    <target
-        name="core-test"
-        depends="init">
-        <echo
-            level="info"
-            message="test-type: core-test"/>
-        <ant
-            antfile="${ant.file}"
-            dir="${currentDir}"
-            target="eclipse-test">
-            <property
-                name="application"
-                value="org.eclipse.test.coretestapplication"/>
-        </ant>
-    </target>
-    <target
-        name="ui-test"
-        depends="init">
-        <echo
-            level="info"
-            message="test-type: ui-test"/>
-        <ant
-            antfile="${ant.file}"
-            dir="${currentDir}"
-            target="eclipse-test">
-            <property
-                name="application"
-                value="org.eclipse.test.uitestapplication"/>
-        </ant>
-    </target>
-    <target
-        name="eclipse-test"
-        description="Runs the specified classname as a plug-in test.">
-        <echo
-            level="info"
-            message="Running ${classname}"/>
-        <echo
-            level="debug"
-            message="Result file: ${junit-report-output}/${classname}.xml."/>
-        <echo
-            level="debug"
-            message="DISPLAY: ${env.DISPLAY}"/>
-        <mkdir
-            dir="${buildDirectory}/${buildLabel}/httplogstest"/>
-        <echo
-            message="http log messages to: ${buildDirectory}/${buildLabel}/httplogstest"/>
-        <condition
-            property="xulRunnerParam"
-            value="org.eclipse.swt.browser.XULRunnerPath"
-            else="XULRunnerPathNotSpecified">
-            <isset
-                property="env.WTP_XULRUNNER"/>
-        </condition>
-        <echo
-            message="xulRunnerParam: ${xulRunnerParam}"/>
-        <echo
-            message="WTP_XULRUNNER: ${env.WTP_XULRUNNER}"/>
-        <!--
-            If there is not exactly one launcher in the stack, we'd best
-            fail fast, since we are not expecting that, and may indicate
-            an installation that would produce unpredictable results
-        -->
-        <!--
-            requires ant 1.7, and at this point, we're running 1.6 from
-            eclipse ... <condition property="expectedNumberOfLaunchers">
-            <resourcecount when="equal" count="1" > <fileset
-            dir="${testRoot}/eclipse/plugins"> <include
-            name="org.eclipse.equinox.launcher_*.jar" /> </fileset>
-            </resourcecount> </condition> <fail message="Did not find
-            expected number of launcher jars. Check installation."
-            unless="expectedNumberOfLaunchers" />
-        -->
-        <java
-            taskname="suiteUnitTest"
-            fork="true"
-            resultProperty="suitejunitresult"
-            failonerror="false"
-            timeout="${timeout}"
-            dir="${testRoot}/eclipse"
-            jvm="${jvm}"
-            classname="org.eclipse.equinox.launcher.Main">
-            <classpath>
-                <fileset
-                    dir="${testRoot}/eclipse/plugins">
-                    <include
-                        name="org.eclipse.equinox.launcher_*.jar"/>
-                </fileset>
-            </classpath>
-            <jvmarg
-                value="-Xmx758m"/>
-            <jvmarg
-                value="-Dosgi.ws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dosgi.os=${env.BASEOS}"/>
-            <jvmarg
-                value="-Dosgi.arch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-DbuildLabel=${buildLabel}"/>
-            <jvmarg
-                value="-DbuildDirectory=${buildDirectory}"/>
-            <jvmarg
-                value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
-            <jvmarg
-                value="-DurlLogLocation=${buildDirectory}/${buildLabel}/httplogstest/outgoinghttplog-${plugin-name}.log"/>
-            <jvmarg
-                value="-Dwtp.autotest.noninteractive=true"/>
-            <jvmarg
-                line="${extraVMargs}"/>
-            <jvmarg
-                value="-Declipse.consolelog=true"/>
-            <jvmarg
-                value="-Dosgi.debug"/>
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <jvmarg
-                value="-Dprojectname=${projectname}"/>
-            <jvmarg
-                value="-D${xulRunnerParam}=${env.WTP_XULRUNNER}"/>
-            <arg
-                value="-nosplash"/>
-            <arg
-                value="-data"/>
-            <arg
-                value="${data-dir}"/>
-            <arg
-                value="-application"/>
-            <arg
-                value="${application}"/>
-            <arg
-                value="formatter=${formatter},${test-output}"/>
-            <arg
-                value="-testPluginName"/>
-            <arg
-                value="${plugin-name}"/>
-            <arg
-                value="-className"/>
-            <arg
-                value="${classname}"/>
-            <env
-                key="DISPLAY"
-                value="${env.DISPLAY}"/>
-            <redirector
-                output="${junit-report-output}/${classname}.output.txt"
-                error="${junit-report-output}/${classname}.error.txt"/>
-        </java>
-        <echo
-            level="info"
-            message="suitejunitresult: ${suitejunitresult}"/>
-        <antcall
-            target="summarizeFailure"/>
-        <antcall
-            target="collect-results"/>
-    </target>
-    <target
-        name="collect-results">
-        <dirname
-            property="output-dir"
-            file="${test-output}"/>
-        <basename
-            property="output-file-name"
-            file="${test-output}"/>
-        <mkdir
-            dir="${junit-report-output}/xml"/>
-        <junitreport
-            todir="${junit-report-output}/xml"
-            tofile="${classname}.xml">
-            <fileset
-                dir="${output-dir}">
-                <include
-                    name="${output-file-name}"/>
-            </fileset>
-        </junitreport>
-        <mkdir
-            dir="${junit-report-output}/html"/>
-        <xslt
-            style="${testRoot}/JUNIT.XSL"
-            basedir="${junit-report-output}"
-            includes="${classname}.xml"
-            destdir="${junit-report-output}/html"/>
-    </target>
-    <target
-        name="collect">
-        <!--
-            deprecated, each test.xml uses it, and we should remove,
-            eventually
-        -->
-        <echo
-            message="Deprecated. There is no need to call the collect task. It no longer does anything. Please remove from your test.xml file"/>
-    </target>
-    <target
-        name="summarizeFailure"
-        depends="checkFailure"
-        if="doFailure">
-        <echo
-            append="true"
-            file="${buildDirectory}/junitFailureList.log">${plugin-name}${line.separator}</echo>
-    </target>
-    <target
-        name="checkFailure">
-        <condition
-            property="doFailure">
-            <not>
-                <equals
-                    arg1="${suitejunitresult}"
-                    arg2="0"
-                    trim="true"/>
-            </not>
-        </condition>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtp.tests/testdependency.xml b/releng.wtpbuilder/distribution/wtp.tests/testdependency.xml
deleted file mode 100644
index 98b565a..0000000
--- a/releng.wtpbuilder/distribution/wtp.tests/testdependency.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-    <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <fail
-        message="Required property file does not exist: ${keyCfgFile}">
-        <condition>
-            <not>
-                <available
-                    file="${keyCfgFile}"/>
-            </not>
-        </condition>
-    </fail>
-    <property
-        file="${keyCfgFile}"/>
-    <target
-        name="get">
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined, which we do later with
-            statements such if="${groupId}.url"
-        -->
-        <property
-            file="${dependency.properties}"/>
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="emfvalidation"/>
-        </antcall>
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="dtp"/>
-        </antcall>
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="eclipseTestFramework"/>
-        </antcall>
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="tomcat.5"/>
-        </antcall>
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="jonas.4"/>
-        </antcall>
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="oagis.release"/>
-        </antcall>
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="oagis.wsdl"/>
-        </antcall>
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="jsf.1_1"/>
-        </antcall>
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="jpt-persistence.jar"/>
-        </antcall>
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="jpt-eclipselink.jar"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstallBase"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-    <target
-        name="getAndInstallDropins"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}${dropinsFolder}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtpbuildTools.build/build.xml b/releng.wtpbuilder/distribution/wtpbuildTools.build/build.xml
deleted file mode 100644
index fb94267..0000000
--- a/releng.wtpbuilder/distribution/wtpbuildTools.build/build.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<project
-    default="build"
-    basedir=".">
-    <fail
-        unless="wtp.builder.home"/>
-    <property
-        file="${wtp.builder.home}/build.properties"/>
-
-    <property
-        environment="env"/>
-
-    <!-- required to get proper value of doCreateFprojZips -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-
-    <!-- main -->
-    <target
-        name="build"
-        depends="getBaseBuilder">
-        <dirname
-            file="${ant.file}"
-            property="distribution.wtp.build.dir" />
-        <property
-            name="buildTargets"
-            value="${wtp.builder.home}/scripts/build/runbuild.xml" />
-
-        <!-- for this distribution, dependencies come from releng -->
-        <property
-            name="dependency.properties"
-            value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-
-        <!-- calling label.xml to createg label.properties file -->
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-
-        <echo
-            level="info"
-            message="invoking buildTargets: ${buildTargets} to build for each component"/>
-
-
-        <ant antfile="${buildTargets}">
-            <property
-                name="component"
-                value="wtp-buildTools" />
-        </ant>
-
-
-    </target>
-
-    <target
-        name="getBaseBuilder"
-        if="eclipse.builder.fetch">
-        <dirname
-            file="${ant.file}"
-            property="wtbuilder.dir" />
-        <property
-            name="buildTargets"
-            value="${wtp.builder.home}/scripts/build/runbuild.xml" />
-        <!-- delete dir="${pde.builder.path}" failonerror="false"/ -->
-        <ant
-            antfile="${buildTargets}"
-            target="getBaseBuilder" />
-    </target>
-
-
-</project>
diff --git a/releng.wtpbuilder/distribution/wtpbuildTools.upload/build.xml b/releng.wtpbuilder/distribution/wtpbuildTools.upload/build.xml
deleted file mode 100644
index 42a1395..0000000
--- a/releng.wtpbuilder/distribution/wtpbuildTools.upload/build.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<project
-    default="sync"
-    basedir=".">
-
-
-    <target name="sync">
-
-        <ant antfile="${wtp.builder.home}/scripts/upload/upload.xml">
-            <property
-                name="site-sub-dir"
-                value="wtpBuildTools" />
-        </ant>
-
-    </target>
-</project>
diff --git a/releng.wtpbuilder/distribution/wtpcap.build/build.xml b/releng.wtpbuilder/distribution/wtpcap.build/build.xml
deleted file mode 100644
index d08e847..0000000
--- a/releng.wtpbuilder/distribution/wtpcap.build/build.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<project
-    default="build"
-    basedir=".">
-    <fail
-        unless="wtp.builder.home"/>
-    <property
-        file="${wtp.builder.home}/build.properties"/>
-    <target
-        name="build"
-        depends="getBaseBuilder">
-        <dirname
-            file="${ant.file}"
-            property="distribution.wtp.build.dir"/>
-        <property
-            name="buildTargets"
-            value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
-        <!--
-            for this distribution, dependencies come from project's
-            releng map project
-        -->
-        <property
-            name="dependency.properties"
-            value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-
-        <!-- calling label.xml to createg label.properties file -->
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-        <echo
-            level="info"
-            message="invoking buildTargets: ${buildTargets} to build for each component"/>
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="wtpcap"/>
-        </ant>
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="wtpcap_sdk"/>
-        </ant>
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="wtpcap_tests"/>
-            <property
-                name="eclipseBuildFailOnError"
-                value="false"/>
-        </ant>
-
-        <!-- package -->
-        <antcall
-            target="package"/>
-    </target>
-
-    <!-- invoking runbuild.xml targetting getBaseBuilder -->
-    <target
-        name="getBaseBuilder"
-        if="eclipse.builder.fetch">
-        <dirname
-            file="${ant.file}"
-            property="wtbuilder.dir"/>
-        <property
-            name="buildTargets"
-            value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
-        <echo
-            level="info"
-            message="invoking buildTargets: ${buildTargets} -> getBaseBuilder"/>
-        <ant
-            antfile="${buildTargets}"
-            target="getBaseBuilder"/>
-    </target>
-    <target
-        name="package">
-        <!--
-            post, post packaging, for WTP ... "manually" assemble the
-            desired zips
-        -->
-        <!-- nothing to assemble right now -->
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtpcap.site/build.xml b/releng.wtpbuilder/distribution/wtpcap.site/build.xml
deleted file mode 100644
index 1b3b037..0000000
--- a/releng.wtpbuilder/distribution/wtpcap.site/build.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<project
-    name="Build specific targets and properties"
-    default="build"
-    basedir=".">
-    <!--
-        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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- = = = end standard properties pattern = = = -->
-    <echo
-        message="ant.file: ${ant.file}"/>
-    <target
-        name="build">
-        <java
-            jar="${eclipse.launcher}"
-            fork="true"
-            failonerror="true">
-            <jvmarg
-                value="-Dosgi.ws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dosgi.os=${env.BASEOS}"/>
-            <jvmarg
-                value="-Dosgi.arch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-Dbuild.donottagmaps=${build.donottagmaps}"/>
-            <jvmarg
-                value="-DbuildBranch=${buildBranch}"/>
-            <jvmarg
-                value="-DbuildType=${buildType}"/>
-            <jvmarg
-                value="-DbuildId=${buildId}"/>
-            <jvmarg
-                value="-DmapVersionTag=${mapVersionTag}"/>
-            <jvmarg
-                value="-Dbuild.distribution=${build.distribution}"/>
-            <jvmarg
-                value="-DbuildDirectory=${buildDirectory}"/>
-            <jvmarg
-                value="-Dwtp.builder.home=${wtp.builder.home}"/>
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <jvmarg
-                value="-Dprojectname=${projectname}"/>
-            <jvmarg
-                value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
-            <jvmarg
-                value="-DurlLogLocation=${buildDirectory}/outgoinghttplogfromsitebuild.log"/>
-            <arg
-                value="-data"/>
-            <arg
-                value="${basedir}/workspace"/>
-            <arg
-                value="-application"/>
-            <arg
-                value="org.eclipse.ant.core.antRunner"/>
-            <arg
-                value="-buildfile"/>
-            <arg
-                value="${ant.file}"/>
-            <arg
-                value="publish"/>
-        </java>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Steps to do to publish the build results -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="publish">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-        <property
-            file="${buildDirectory}/label.properties"/>
-        <property
-            name="publish.xml"
-            value="${component.dir}/publish.xml"/>
-        <property
-            name="indexFileName"
-            value="index.php"/>
-        <property
-            name="result"
-            value="${buildDirectory}/${buildLabel}"/>
-        <property
-            name="indexTemplateFilename"
-            value="index.html.template.php"/>
-        <copy
-            file="${wtp.builder.home}/distribution/wtp.site/templateFiles/${indexTemplateFilename}"
-            tofile="${buildDirectory}/${indexFileName}"/>
-        <condition
-            property="isBuildTested"
-            value="true">
-            <available
-                file="${buildDirectory}/${buildLabel}/testResults/html"/>
-        </condition>
-        <ant
-            antfile="${publish.xml}"
-            dir="${component.dir}">
-            <property
-                name="dropTokenList"
-                value="%wtpruntime%,%wtpsdk%,%wtptest%,%wst%,%wst-sdk%,%wst-tests%,%jst-tests%,%wst-perf-tests%,%jst-perf-tests%,%jpt-runtime%,%jpt-sdk%,%jpt-tests%"/>
-            <property
-                name="webtoolsDownloadURL"
-                value="http://www.eclipse.org/downloads/download.php?file=/webtools/committers/drops"/>
-            <property
-                name="buildBranch"
-                value="${buildBranch}"/>
-            <property
-                name="isBuildTested"
-                value="${isBuildTested}"/>
-            <property
-                name="indexTemplateFilename"
-                value="${indexTemplateFilename}"/>
-        </ant>
-
-        <!--  Get the build map over for the results to point to. -->
-        <copy
-            file="${buildDirectory}/directory.txt"
-            tofile="${result}/directory.txt"/>
-
-        <!-- Copy info for build identification -->
-        <copy
-            file="${buildDirectory}/buildmachineinfo.properties"
-            tofile="${result}/buildmachineinfo.properties"/>
-
-        <!-- http access logs -->
-        <copy
-            todir="${result}/"
-            failonerror="false">
-            <fileset
-                dir="${buildDirectory}"
-                includes="*.log"/>
-        </copy>
-
-        <!-- ant build log, from control directory -->
-        <copy
-            todir="${result}/"
-            failonerror="false">
-            <fileset
-                dir="${env.ANT_WORKING}/${projectname}"
-                includes="antBuilderOutput.log"/>
-        </copy>
-
-
-
-        <!-- final count files -->
-        <countBuildFiles
-            sourceDirectory="${buildDirectory}/${buildLabel}"
-            filterString=".zip,.tar.gz"
-            outputFile="${buildDirectory}/${buildLabel}/files.count"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtpcap.site/compilerXMLOutputToHTML.xsl b/releng.wtpbuilder/distribution/wtpcap.site/compilerXMLOutputToHTML.xsl
deleted file mode 100644
index ffc7905..0000000
--- a/releng.wtpbuilder/distribution/wtpcap.site/compilerXMLOutputToHTML.xsl
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet
-    version="1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-    <xsl:output
-        method="html"
-        indent="yes"/>
-    <xsl:template
-        match="/">
-        <html>
-            <body>
-                <xsl:apply-templates
-                    select="compiler"/>
-            </body>
-        </html>
-    </xsl:template>
-    <xsl:template
-        match="compiler">
-        <h2>Compiler Report</h2>
-        <p>
-            Compiler:
-            <xsl:value-of
-                select="@name"/>
-            <xsl:text>   </xsl:text>
-            Version:
-            <xsl:value-of
-                select="@version"/>
-        </p>
-        <xsl:apply-templates
-            select="stats"/>
-        <xsl:apply-templates
-            select="sources"/>
-    </xsl:template>
-    <xsl:template
-        name="stats"
-        match="stats">
-        <p>
-            Number of source files:
-            <xsl:value-of
-                select="count(..//source)"/>
-            Number of classfiles:
-            <xsl:value-of
-                select="number_of_classfiles/@value"/>
-        </p>
-        <p>
-            Problems:
-            <xsl:value-of
-                select="problem_summary/@problems"/>
-            (Errors:
-            <xsl:value-of
-                select="problem_summary/@errors"/>
-            Warnings:
-            <xsl:value-of
-                select="problem_summary/@warnings"/>
-            )
-        </p>
-    </xsl:template>
-    <xsl:template
-        name="sources"
-        match="sources">
-        <xsl:if
-            test="count(source) > 0">
-            <dl>
-                <xsl:for-each
-                    select="source">
-                    <xsl:variable
-                        name="package"
-                        select="normalize-space(@package)">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="path"
-                        select="normalize-space(@path)">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="classname"
-                        select="substring-after($path, $package)">
-                    </xsl:variable>
-                    <xsl:if
-                        test="count(problems) > 0">
-                        <dt
-                            style="font-weight: bold; color: black">
-                            Source File:
-                            <xsl:value-of
-                                select="$package"/>
-                            <xsl:value-of
-                                select="$classname"/>
-                        </dt>
-                        <xsl:apply-templates
-                            select="problems">
-                            <xsl:with-param
-                                name="classname">
-                                <xsl:value-of
-                                    select="$classname"/>
-                            </xsl:with-param>
-                        </xsl:apply-templates>
-                    </xsl:if>
-                </xsl:for-each>
-            </dl>
-        </xsl:if>
-    </xsl:template>
-    <xsl:template
-        match="problems">
-        <xsl:param
-            name="classname"/>
-        <xsl:for-each
-            select="problem">
-            <dd
-                style="font-weight: normal; color: black">
-                <xsl:value-of
-                    select="position()"/>
-                <xsl:text>.  </xsl:text>
-                <xsl:value-of
-                    select="@severity"/>
-                <xsl:text>:  </xsl:text>
-                <xsl:value-of
-                    select="@id"/>
-                <xsl:variable
-                    name="lineNumber"
-                    select="@line">
-                </xsl:variable>
-                <xsl:for-each
-                    select="message">
-                    <p
-                        style="margin-left: +.5in; font-size: -1; margin-top: 0;margin-bottom:0;">
-                        <small>
-                            <xsl:value-of
-                                select="@value"/>
-                        </small>
-                    </p>
-                </xsl:for-each>
-                <xsl:for-each
-                    select="source_context">
-                    <xsl:variable
-                        name="pre"
-                        select="substring(@value,0,(@sourceStart + 1))">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="main"
-                        select="substring(@value,(@sourceStart + 1),(((@sourceEnd + 1) - (@sourceStart + 1)) + 1))">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="end"
-                        select="substring(@value,(@sourceEnd + 2))">
-                    </xsl:variable>
-                    <p
-                        style="margin-left: +.5in; font-size: -2; margin-top: 0;margin-bottom:0;">
-                        <xsl:value-of
-                            select="substring($classname,2)"/>
-                        :
-                    </p>
-                    <p
-                        style="margin-left: +.5in; font-size: -2;font-family: monospace; margin-top: 0;margin-bottom:0;">
-                        <xsl:value-of
-                            select="$lineNumber"/>
-                        :
-                        <xsl:value-of
-                            select="$pre"/>
-                        <b>
-                            <u>
-                                <xsl:value-of
-                                    select="$main"/>
-                            </u>
-                        </b>
-                        <xsl:value-of
-                            select="$end"/>
-                    </p>
-                </xsl:for-each>
-            </dd>
-        </xsl:for-each>
-    </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtpcap.site/publish.xml b/releng.wtpbuilder/distribution/wtpcap.site/publish.xml
deleted file mode 100644
index 0f35d8d..0000000
--- a/releng.wtpbuilder/distribution/wtpcap.site/publish.xml
+++ /dev/null
@@ -1,649 +0,0 @@
-<project
-    name="Publish Build"
-    default="default"
-    basedir=".">
-    <!--
-        Properties that must be passed to this script: buildDirectory:
-        Path to perform the build in. (A working directory) buildType:
-        Type of build (nightly, integration etc.) buildId: Build name
-        buildLabel: <buildType>-<buildName>-<timestamp>
-    -->
-    <property
-        environment="env"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be provided to publish"/>
-    <fail
-        unless="buildLabel"
-        message="buildLabel must be provided to publish"/>
-    <fail
-        unless="wtp.builder.home"
-        message="wtp.builder.home must be provided to publish"/>
-    <fail
-        unless="build.distribution"
-        message="build.distribution must be provided to publish"/>
-    <property
-        name="resultDir"
-        value="${buildDirectory}/${buildLabel}"/>
-    <!--name of generated index page-->
-    <property
-        name="indexFileName"
-        value="index.php"/>
-    <property
-        name="templateDir"
-        value="${wtp.builder.home}/distribution/${build.distribution}.site"/>
-    <property
-        name="resultingIndex"
-        value="${resultDir}/${indexFileName}"/>
-    <echo
-        level="debug"
-        message="resultDir: ${resultDir}"/>
-    <echo
-        level="debug"
-        message="templateDir: ${templateDir}"/>
-    <echo
-        level="debug"
-        message="resultingIndex: ${resultingIndex}"/>
-    <target
-        name="default">
-        <copy
-            overwrite="true"
-            file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/${indexTemplateFilename}"
-            tofile="${resultingIndex}"/>
-        <antcall
-            target="countFiles"/>
-        <antcall
-            target="generateCompileIndex"/>
-        <antcall
-            target="generateJUnitTestsIndex"/>
-        <antcall
-            target="getStaticFiles"/>
-    </target>
-    <target
-        name="generateCompileIndex">
-        <!--
-            <taskdef name="indexResults"
-            classname="org.eclipse.wtp.releng.tools.ResultsSummaryGenerator"
-            />
-        -->
-        <!--
-            isBuildTested: true|false should JUnit plugin test results
-            be used to generate index page dropTokenList: comma
-            separated list of strings which should be replaced by the
-            fileName attribute settings in the testManifest.xml.
-            xmlDirectoryName: path to directory containing JUnit plugin
-            test results in xml format (see doc is org.eclipse.test).
-            dropDirectoryName: path to directory containing the result
-            of the build. testResultsTemplateFileName: path to template
-            file used to generate page with links to JUnit test results
-            testResultsHtmlFileName: name of file which will be
-            generated with links to JUnit test results dropHtmlFileName:
-            name of generated index page hrefTestResultsTargetPath:
-            relative path from index page to directory containing JUnit
-            html test results hrefCompileLogsTargetPath: relative path
-            from index page directory containing compilelogs
-            testManifestFileName: name of xml file containing
-            descriptions of zip types and log files
-        -->
-        <property
-            file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-
-        <!-- create tables of test plugin compiles first -->
-        <antcall
-            target="generateTestCompileOutput">
-            <param
-                name="outputDirectory"
-                value="${resultDir}/testcompilelogs"/>
-        </antcall>
-
-        <!-- create table of code plugins compiles -->
-        <antcall
-            target="generateCompileOutput">
-            <param
-                name="outputDirectory"
-                value="${resultDir}/compilelogs"/>
-        </antcall>
-        <tstamp>
-            <format
-                property="TODAY"
-                pattern="MMMM d, yyyy"/>
-        </tstamp>
-
-        <!--  Insert Build Type descriptor  -->
-        <antcall
-            target="${buildType}"/>
-        <antcall
-            target="writeData"/>
-        <!--
-            Update timestamp on file to permit overwrite through Ant
-            copy task
-        -->
-        <touch
-            file="${resultingIndex}"/>
-    </target>
-    <target
-        name="generateTestCompileOutput"
-        depends="checkIfCompileLogs"
-        if="doCompileLogs">
-        <summarizeResults
-            isBuildTested="false"
-            includeAll="true"
-            dropTokenList="${dropTokenList}"
-            xmlDirectoryName=""
-            dropDirectoryName="${resultDir}"
-            testResultsTemplateFileName="${templateDir}/templateFiles/testCompileResults.php.template"
-            testResultsHtmlFileName="testCompileResults.php"
-            hrefTestResultsTargetPath=""
-            hrefCompileLogsTargetPath="testcompilelogs"
-            compileLogsDirectoryName="${outputDirectory}"/>
-        <antcall
-            target="compilerXMLToHTML"/>
-    </target>
-    <target
-        name="generateCompileOutput"
-        depends="checkIfCompileLogs"
-        if="doCompileLogs">
-        <summarizeResults
-            isBuildTested="false"
-            includeAll="true"
-            dropTokenList="${dropTokenList}"
-            xmlDirectoryName=""
-            dropDirectoryName="${resultDir}"
-            testResultsTemplateFileName="${templateDir}/templateFiles/compileResults.php.template"
-            testResultsHtmlFileName="compileResults.php"
-            hrefTestResultsTargetPath="testResults/html"
-            hrefCompileLogsTargetPath="compilelogs"
-            compileLogsDirectoryName="${outputDirectory}"/>
-        <antcall
-            target="compilerXMLToHTML"/>
-    </target>
-    <target
-        name="compilerXMLToHTML">
-        <xslt
-            basedir="${outputDirectory}"
-            destdir="${outputDirectory}"
-            includes="**/*.xml"
-            scanincludeddirectories="true"
-            style="compilerXMLOutputToHTML.xsl"
-            force="true"/>
-    </target>
-    <target
-        name="generateJUnitTestsIndex"
-        depends="checkIfTested"
-        if="doTests">
-        <!--
-            isBuildTested: true|false should JUnit plugin test results
-            be used to generate index page dropTokenList: comma
-            separated list of strings which should be replaced by the
-            fileName attribute settings in the testManifest.xml.
-            xmlDirectoryName: path to directory containing JUnit plugin
-            test results in xml format (see doc is org.eclipse.test).
-            dropDirectoryName: path to directory containing the result
-            of the build. testResultsTemplateFileName: path to template
-            file used to generate page with links to JUnit test results
-            testResultsHtmlFileName: name of file which will be
-            generated with links to JUnit test results dropHtmlFileName:
-            name of generated index page hrefTestResultsTargetPath:
-            relative path from index page to directory containing JUnit
-            html test results hrefCompileLogsTargetPath: relative path
-            from index page directory containing compilelogs
-            testManifestFileName: name of xml file containing
-            descriptions of zip types and log files
-        -->
-        <property
-            file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-
-        <!-- create table of test plugin compiles first -->
-        <!-- set isBuildTested to true for the "compile only" results -->
-        <summarizeResults
-            isBuildTested="true"
-            dropTokenList="${dropTokenList}"
-            dropDirectoryName="${resultDir}"
-            xmlDirectoryName="${resultDir}/testResults/xml"
-            testResultsTemplateFileName="${templateDir}/templateFiles/testResults.php.template"
-            testResultsHtmlFileName="testResults.php"
-            hrefTestResultsTargetPath="testResults/html"
-            compileLogsDirectoryName=""/>
-        <tstamp>
-            <format
-                property="TODAY"
-                pattern="MMMM d, yyyy"/>
-        </tstamp>
-
-        <!--  Insert Build Type descriptor  -->
-        <antcall
-            target="${buildType}"/>
-        <antcall
-            target="writeData"/>
-        <!--
-            Update timestamp on file to permit overwrite through Ant
-            copy task
-        -->
-        <touch
-            file="${resultingIndex}"/>
-    </target>
-    <target
-        name="getStaticFiles">
-        <!--get static files required in the buildLabel directory-->
-        <copy
-            todir="${resultDir}">
-            <fileset
-                dir="${templateDir}/staticDropFiles"/>
-        </copy>
-
-        <!--copy buildnotes from plugin directories-->
-        <mkdir
-            dir="${resultDir}/buildnotes"/>
-        <copy
-            todir="${resultDir}/buildnotes"
-            flatten="true">
-            <fileset
-                dir="${buildDirectory}/plugins"
-                includes="**/buildnotes_*.html"/>
-            <fileset
-                dir="${buildDirectory}/features"
-                includes="**/buildnotes_*.html"/>
-        </copy>
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/full/logIndex.php"/>
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/testLogs/logIndex.php"/>
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/testSysErrorLogs/logIndex.php"/>
-    </target>
-    <target
-        name="updateSite">
-
-
-        <!-- get our authored, tokenized site.xml file -->
-        <copy
-            file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/siteWTP.xml"
-            tofile="${buildDirectory}/${buildLabel}/updateSite/site.xml"
-            overwrite="true"
-            failonerror="true"/>
-        <!--
-            get the ${buildDirectory}/finalPluginsVersions.properties,
-            and read as properties
-        -->
-        <!-- substitute property value for tokens -->
-        <replace
-            file="${buildDirectory}/${buildLabel}/updateSite/site.xml"
-            propertyfile="${buildDirectory}/finalFeaturesVersions.properties">
-            <replacefilter
-                token="@org.eclipse.wtp@"
-                property="org.eclipse.wtp"/>
-            <replacefilter
-                token="@org.eclipse.wtp.sdk@"
-                property="org.eclipse.wtp.sdk"/>
-            <replacefilter
-                token="@org.eclipse.jst@"
-                property="org.eclipse.jst"/>
-            <replacefilter
-                token="@org.eclipse.jst.sdk@"
-                property="org.eclipse.jst.sdk"/>
-            <replacefilter
-                token="@org.eclipse.jpt.feature@"
-                property="org.eclipse.jpt.feature"/>
-            <replacefilter
-                token="@org.eclipse.jpt_sdk.feature@"
-                property="org.eclipse.jpt_sdk.feature"/>
-        </replace>
-    </target>
-    <target
-        name="countFiles">
-        <!--
-            files.count is a file that should exist in the drop
-            directory with a count of the zip files in the same
-            directory. It is required to generate a link to the build on
-            the downloads page.
-        -->
-        <countBuildFiles
-            sourceDirectory="${resultDir}"
-            filterString=".zip,.tar.gz"
-            outputFile="${resultDir}/files.count"/>
-    </target>
-
-    <!--Build type descriptors-->
-    <target
-        name="I">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Integration"/>
-    </target>
-    <target
-        name="S">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Stable"/>
-    </target>
-    <target
-        name="N">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Nightly"/>
-    </target>
-    <target
-        name="M">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Maintenance"/>
-    </target>
-    <target
-        name="R">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Release"/>
-    </target>
-    <target
-        name="T">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Test"/>
-    </target>
-    <target
-        name="P">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Patches"/>
-    </target>
-    <target
-        name="checkIfTested">
-        <echo
-            level="debug"
-            message="isBuildTested: ${isBuildTested}"/>
-        <condition
-            property="doTests">
-            <equals
-                arg1="${isBuildTested}"
-                arg2="true"
-                trim="true"
-                casesensitive="false"/>
-        </condition>
-    </target>
-    <target
-        name="checkIfCompileLogs">
-        <condition
-            property="doCompileLogs">
-            <available
-                file="${outputDirectory}"/>
-        </condition>
-    </target>
-    <target
-        name="writeData">
-        <!--  Insert Build Date  -->
-        <replace
-            file="${resultingIndex}"
-            token="@date@"
-            value="${TODAY}"/>
-
-        <!--  Insert Build Name  -->
-        <replace
-            file="${resultingIndex}"
-            token="@build@"
-            value="${buildLabel}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@buildBranch@"
-            value="${buildBranch}"/>
-
-        <!--  Insert PreRequsites  -->
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseFile@"
-            value="${eclipse.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseURL@"
-            value="${eclipse.url}/${eclipse.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseBuildURL@"
-            value="${eclipse.url}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilelinux@"
-            value="${eclipse.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilewindows@"
-            value="${eclipse.file.win32-win32-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilemacos@"
-            value="${eclipse.file.macosx-carbon-ppc}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseBuildHome@"
-            value="${eclipse.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipse.mirror.prefixuri@"
-            value="${eclipse.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipse.fspath.prefix@"
-            value="${eclipse.fspath.prefix}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@testURL@"
-            value="${eclipseTestFramework.url}/${eclipseTestFramework.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@testFile@"
-            value="${eclipseTestFramework.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfName@"
-            value="${emf.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfDescription@"
-            value="${emf.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfFile@"
-            value="${emf.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfURL@"
-            value="${emf.url}/${emf.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfBuildHome@"
-            value="${emf.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emf.mirror.prefixuri@"
-            value="${emf.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdFile@"
-            value="${emfxsd.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdName@"
-            value="${emfxsd.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdDescription@"
-            value="${emfxsd.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdURL@"
-            value="${emfxsd.url}/${emfxsd.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdBuildHome@"
-            value="${emfxsd.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsd.mirror.prefixuri@"
-            value="${emfxsd.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstFile@"
-            value="${wst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstURL@"
-            value="${wst.url}/${wst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstBuildHome@"
-            value="${wst.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wst.mirror.prefixuri@"
-            value="${wst.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstFile@"
-            value="${jst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstURL@"
-            value="${jst.url}/${jst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstBuildHome@"
-            value="${jst.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jst.mirror.prefixuri@"
-            value="${jst.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpFile@"
-            value="${wtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpURL@"
-            value="${wtp.url}/${wtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpBuildHome@"
-            value="${wtp.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtp.mirror.prefixuri@"
-            value="${wtp.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefFile@"
-            value="${gef.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefURL@"
-            value="${gef.url}/${gef.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefBuildHome@"
-            value="${gef.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gef.mirror.prefixuri@"
-            value="${gef.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipserelengFile@"
-            value="${eclipsereleng.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipserelengURL@"
-            value="${eclipsereleng.url}/${eclipsereleng.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipFile@"
-            value="${orbitthirdpartyzip.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipURL@"
-            value="${orbitthirdpartyzip.url}/${orbitthirdpartyzip.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipBuildHome@"
-            value="${orbitthirdpartyzip.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzip.mirror.prefixuri@"
-            value="${orbitthirdpartyzip.mirror.prefixuri}"/>
-
-
-        <!-- no longer used. Post 1.5.5 -->
-        <replace
-            file="${resultingIndex}"
-            token="@jemFile@"
-            value="${jem.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jemURL@"
-            value="${jem.url}/${jem.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jemBuildHome@"
-            value="${jem.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jem.mirror.prefixuri@"
-            value="${jem.mirror.prefixuri}"/>
-        <!--
-            these token/s should not exist in maintenance stream, but do
-            no harm done, so in the interests of keeping builder streams
-            in sync, we'll leave them here as place hold
-        -->
-        <replace
-            file="${resultingIndex}"
-            token="@dtpFile@"
-            value="${dtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtpURL@"
-            value="${dtp.url}/${dtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtpBuildHome@"
-            value="${dtp.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtp.mirror.prefixuri@"
-            value="${dtp.mirror.prefixuri}"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/access_err.gif b/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/access_err.gif
deleted file mode 100644
index 4f0748a..0000000
--- a/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/access_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/access_warn.gif b/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/access_warn.gif
deleted file mode 100644
index 8386e3e..0000000
--- a/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/access_warn.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/buildNotes.php b/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/buildNotes.php
deleted file mode 100644
index e843ecf..0000000
--- a/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/buildNotes.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<html>
-<head>
-<?php
-$parts = explode("/", getcwd());
-$parts2 = explode("-", $parts[count($parts) - 1]);
-$buildName = $parts2[1];
-
-echo "<title>Build Notes for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Build Notes</font></b></p>
-
-<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"> Build Notes for <?php echo "$buildName"; ?></font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$hasNotes = false;
-$aDirectory = dir("buildnotes");
-while ($anEntry = $aDirectory->read()) {
-    if ($anEntry != "." && $anEntry != "..") {
-        //print_r($anEntry);
-        //echo "<br />";
-
-        $subject = $anEntry;
-        $pattern = '/^buildnotes_(.*)/i';
-        preg_match($pattern, $subject, $matches);
-        $subject = $matches[1];
-        //print_r($subject);
-        //echo "<br />";
-        $pattern = '/^(.*)\.html$/';
-        preg_match($pattern, $subject, $matches);
-        //print_r($matches);
-        //echo "<br />";
-
-        $component = $matches[1];
-
-        $line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
-        echo "<tr>";
-        echo "$line";
-        echo "</tr>";
-        $hasNotes = true;
-
-    }
-}
-$aDirectory.closedir();
-if (!$hasNotes) {
-    echo "<br>There are no build notes for this build.";
-}
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/compile_err.gif b/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/compile_err.gif
deleted file mode 100644
index c2bfdd6..0000000
--- a/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/compile_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/compile_warn.gif b/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/compile_warn.gif
deleted file mode 100644
index cf4fdf9..0000000
--- a/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/compile_warn.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/consoleLogs.php b/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/consoleLogs.php
deleted file mode 100644
index 7dd5f42..0000000
--- a/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/consoleLogs.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<html>
-<head>
-<?php
-$parts = explode("/", getcwd());
-$parts2 = explode("-", $parts[count($parts) - 1]);
-$buildName = $parts2[1];
-
-echo "<title>Test Console Output for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-<title>Console Logs from Running JUnit Plug-in Tests</title>
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b></p>
-
-<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">Console output from running
-		JUnit plugin tests for <?php echo "$buildName"; ?> </font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$rootDir = "testResults/consolelogs";
-$hasNotes = false;
-$aDirectory = dir($rootDir);
-$index = 0;
-$dirindex = 0;
-while ($anEntry = $aDirectory->read()) {
-    if ($anEntry != "." && $anEntry != "..") {
-        if (is_file("$rootDir/$anEntry")) {
-            $entries[$index] = $anEntry;
-            $index++;
-        } else if (is_dir("$rootDir/$anEntry")) {
-            $direntries[$dirindex] = $anEntry;
-            $dirindex++;
-        }
-    }
-}
-$aDirectory->close();
-
-
-sort($entries);
-sort($direntries);
-
-for ($i = 0; $i < $dirindex; $i++) {
-    $anEntry = $direntries[$i];
-    $line = "<td><a href=\"testResults/consolelogs/$anEntry/logIndex.php\">$anEntry</a></td>";
-    echo "<tr>";
-    echo "$line";
-    echo "</tr>";
-}
-for ($i = 0; $i < $index; $i++) {
-    $anEntry = $entries[$i];
-    $logsize = filesize("testResults/consolelogs/$anEntry");
-
-
-    $level = 0;
-    if ($logsize > 20000) {
-        $level = 2;
-    }
-    else if ($logsize > 2000) {
-        $level = 1;
-    }
-
-    if ($level == 0) {
-        $line = "<td><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-    }
-    else if ($level == 1) {
-        $line = "<td><em><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-    } else if ($level == 2) {
-        $line = "<td><strong><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-    }
-
-
-    echo "<tr>";
-    echo "$line";
-    echo "</tr>";
-    $hasNotes = true;
-}
-
-if (!$hasNotes) {
-    echo "<br>There are no test logs for this build.";
-}
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/junit_err.gif b/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/junit_err.gif
deleted file mode 100644
index 1b7ff9d..0000000
--- a/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/junit_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/logIndex.php b/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/logIndex.php
deleted file mode 100644
index 0b36334..0000000
--- a/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/logIndex.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<html>
-<head>
-<?php
-
-function endsWith( $str, $sub ) {
-
-   return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub );
-}
-
-        $parts = explode("/", getcwd());
-        $parts2 = explode("-", $parts[count($parts) - 1]);
-        $buildName = $parts2[1];
-
-        echo "<title>Test Console Output for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" type="text/css">
-<title>Console Logs from Running JUnit Plug-in Tests</title></head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b> </p>
-
-<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">Console
-      output from running JUnit plugin tests for
-      <?php echo "$buildName"; ?>
-      </font></b></td>
-  </tr>
-</table>
-<table border="0">
-
-<?php
-        $hasNotes = false;
-        $aDirectory = dir(".");
-        $index = 0;
-        while ($anEntry = $aDirectory->read()) {
-                if ($anEntry != "." && $anEntry != ".." && !endsWith(__FILE__, $anEntry)) {
-                        $entries[$index] = $anEntry;
-                        $index++;
-                }
-        }
-        aDirectory.closedir();
-
-
-        sort($entries);
-
-        for ($i = 0; $i < $index; $i++) {
-                $anEntry = $entries[$i];
-                $logsize = filesize("$anEntry");
-
-
-                $level = 0;
-                if ($logsize > 20000) {
-                        $level = 2;
-                }
-                else if ($logsize > 2000) {
-                        $level = 1;
-                }
-
-                if ($level == 0) {
-                        $line = "<td><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-                }
-                else if ($level == 1) {
-                        $line = "<td><em><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-                } else if ($level == 2) {
-                        $line = "<td><strong><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-                }
-
-
-                echo "<tr>";
-                echo "$line";
-                echo "</tr>";
-                $hasNotes = true;
-        }
-
-        if (!$hasNotes) {
-                echo "<br>There are no test logs for this build.";
-        }
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/miscUtil.php b/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/miscUtil.php
deleted file mode 100644
index 966ed48..0000000
--- a/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/miscUtil.php
+++ /dev/null
@@ -1,219 +0,0 @@
-<?php
-
-// todo: unsure if can handle filenames that are URLs?
-// handy constant to compute file size in megabytes
-
-function fileSizeInMegs($filename) {
-	$onemeg=1024*1024;
-	$zipfilesize=filesize($filename);
-	$zipfilesize=round($zipfilesize/$onemeg, 0);
-	return $zipfilesize;
-}
-
-function fileSizeForDisplay($filename) {
-	$onekilo=1024;
-	$onemeg=$onekilo * $onekilo;
-	$criteria = 10 * $onemeg;
-	$scaleChar = "M";
-	if (file_exists($filename)) {
-      	$zipfilesize=filesize($filename);
-      	if ($zipfilesize > $criteria) {
-      		$zipfilesize=round($zipfilesize/$onemeg, 0);
-      		$scaleChar = "M";
-      	}
-      	else {
-      		$zipfilesize=round($zipfilesize/$onekilo, 0);
-      		$scaleChar = "K";
-      	}
-  	} 
-  	else {
-  	   $zipfilesize = 0;
-  	}
-	$result =  "(" . $zipfilesize . $scaleChar . ")";
-	return $result;
-}
-
-
-function displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription) {
-	echo "<td align=\"right\" valign=\"top\" width=\"30%\">";
-	echo "<a href=\"$downloadprefix$filename\">" . $fileShortDescription . "</a>";
-	echo "</td><td align=\"right\" valign=\"top\" width=\"3%\">";
-	echo $zipfilesize;
-	echo "</td>";
-	echo "<td align=\"right\" valign=\"top\" width=\"2%\">";
-	echo "[<a href=\"checksum/$filename.md5\">md5</a>]";
-	echo "</td>";
-}
-
-function resourceExist($url, $mirrorPrefixuri, $prereqfilename, $eclipseFSpathPrefix)
-{
-	$result = false;
-
-	$allowURLopen = ini_get('allow_url_fopen');
-
-	if ($allowURLopen && stream_last_modified($url)) {
-		$result = true;
-	}
-	else {
-		// TODO: for now, we'll do a raw check on the whole file name, since enable_url_open
-		// is off. better would be to check if we are on build.eclipse.org or download.eclipse.org?
-    $wholePath = trim($eclipseFSpathPrefix) . "/" . trim($mirrorPrefixuri) . "/" . trim($prereqfilename);
-    if (file_exists($wholePath)) {
-    	$result = true;
-    }
-	}
-	return $result;
-}
-
-function stream_last_modified($url)
-{
-	if (function_exists('version_compare') && version_compare(phpversion(), '4.3.0') > 0)
-	{
-		if (!($fp = @fopen($url, 'r')))
-		return NULL;
-
-		$meta = stream_get_meta_data($fp);
-		for ($j = 0; isset($meta['wrapper_data'][$j]); $j++)
-		{
-			if (strstr(strtolower($meta['wrapper_data'][$j]), 'last-modified'))
-			{
-				$modtime = substr($meta['wrapper_data'][$j], 15);
-				break;
-			}
-		}
-		fclose($fp);
-	}
-	else
-	{
-		$parts = parse_url($url);
-		$host  = $parts['host'];
-		$path  = $parts['path'];
-
-		if (!($fp = @fsockopen($host, 80)))
-		return NULL;
-
-		$req = "HEAD $path HTTP/1.0\r\nUser-Agent: PHP/".phpversion()."\r\nHost: $host:80\r\nAccept: */*\r\n\r\n";
-		fputs($fp, $req);
-
-		while (!feof($fp))
-		{
-			$str = fgets($fp, 4096);
-			if (strstr(strtolower($str), 'last-modified'))
-			{
-				$modtime = substr($str, 15);
-				break;
-			}
-		}
-		fclose($fp);
-	}
-	return isset($modtime) ? strtotime($modtime) : time();
-}
-
-function isMirrored($uriToCheck) {
-	global $debugScript;
-	global $debugFunctions;
-	$localuri = $uriToCheck;
-
-	$debugMirrorList = false;
-	if ($debugScript) {
-		echo "uriToCheck: " . $localuri . "<br />";
-	}
-
-	$xmlcount = 0;
-
-	/* This method true and accurate method of parsing mirror results
-	 * may be expensive, and would
-	 * likely cause artificially high counts of "downloads".
-	 * Could maybe use if somehow only checked once ever 5 minutes or something.
-
-
-	 // turn off warnings, as sometimes HTML is returned, which causes lots of warnings
-	 $holdLevel = error_reporting(E_ERROR);
-	 $mirrorsxml=simplexml_load_file(rawurlencode($localuri) . urlencode("&format=xml"));
-	 error_reporting($holdLevel);
-
-
-	 if ($mirrorsxml) {
-	 if ($debugFunctions) {
-	 echo "root node: " . $mirrorsxml->getName() . "<br />";
-	 }
-	 if (strcmp($mirrorsxml->getName(), "mirrors") == 0) {
-	 foreach ($mirrorsxml->children() as $mirror) {
-	 if (strcmp($mirror->getName(),"mirror") == 0) {
-	 $xmlcount=$xmlcount+1;
-	 }
-	 if ($debugMirrorList) {
-	 print_r($mirror);
-	 echo "<br />";
-	 }
-	 }
-	 }
-	 if ($debugFunctions) {
-	 echo "Mirror count: " . $xmlcount . "<br />";
-	 }
-	 }
-	 */
-	/*
-	 * Use simple heuristic based on pattern
-	 * in the URI ... if it contains "/downloads/" then assume it's mirrored
-	 */
-	if (strpos($uriToCheck, "webtools/downloads/") > 0) {
-		$xmlcount = 1;
-	}
-	return ($xmlcount > 0);
-
-}
-
-// TODO: replace with Phoenix variables
-function getPlatform () {
-	global $debugScript;
-	global $debugFunctions;
-	// getBrowser is expensive, so cache the data
-	static $browser;
-	$platform = "unknown";
-
-
-	if(ini_get("browscap")) {
-		if(!isset($browser)){
-			$browser = get_browser(null, true);
-		}
-
-		if ($browser) {
-			$rawPlatform = $browser['platform'];
-			if ($debugFunctions) {
-				echo "browser platfrom: " . $rawPlatform . "<br />" ;
-			}
-
-			if ($debugFunctions) {
-				$browserKeys = array_keys($browser);
-				foreach ($browserKeys as $key) {
-					echo $key . ": " . $browser[$key] . "<br />";
-				}
-			}
-		}
-		if (strpos($rawPlatform, "Win") === 0) {
-			$platform="windows";
-		} else if (strpos($rawPlatform, "Linux") === 0) {
-			$platform="linux";
-		} else if (strpos($rawPlatform, "Mac") === 0) {
-			$platform="mac";
-		}
-	}
-	return $platform;
-}
-
-
-function getPrereqReferenceOrName($eclipseMirrorScript, $mirrorPrefixuri, $prerequrl, $prereqfilename, $eclipseFSpathPrefix) {
-	// todo: we really only need "if exists" so could make a bit more efficient
-	// I tried "file_exists" but is didn't seem to work on my test server
-	// For these pre-reqs, we assume if they exist, they are mirrored. This is true
-	// 99% of the time.
-
-	if (resourceExist($prerequrl, $mirrorPrefixuri, $prereqfilename, $eclipseFSpathPrefix)) {
-		$reflink="<a href=\"" . $eclipseMirrorScript . $mirrorPrefixuri . "/" . $prereqfilename . "\">" . $prereqfilename . "</a>";
-	} else {
-		$reflink=$prereqfilename;
-	}
-	return $reflink;
-}
-?>
diff --git a/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/pending.gif b/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/pending.gif
deleted file mode 100644
index 66db2a6..0000000
--- a/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/pending.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/pending1.gif b/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/pending1.gif
deleted file mode 100644
index 1b2ea6e..0000000
--- a/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/pending1.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/report2.php b/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/report2.php
deleted file mode 100644
index 52d2284..0000000
--- a/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/report2.php
+++ /dev/null
@@ -1,45 +0,0 @@
-
-        <?php
-
-function parse_testResults($filename)
-{
-        $junitFailures = 0;
-        if (is_file($filename)) {
-                $handle = @fopen($filename, "r");
-                if ($handle)
-                {
-                        $size = filesize($filename);
-                        $content = fread($handle, $size);
-                        fclose($handle);
-                        $junitStart = strpos($content, "Errors &amp; Failures");
-                        $junitEnd = strpos($content, "</table>", $junitStart);
-                        $junitInfo = substr($content, $junitStart, $junitEnd - $junitStart);
-                        $start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">");
-                        while ($start !== false)
-                        {
-                                $start += 29;
-                                $stop = strpos($junitInfo, "</font></b></td>", $start);
-                                if ($stop !== false)
-                                {
-                                        $result = substr($junitInfo, $start, $stop - $start);
-                                        if (is_numeric($result))
-                                        {
-                                                $junitFailures += $result;
-                                        }
-                                        else if (strcmp($result, "DNF") == 0)
-                                        {
-                                                $junitFailures++;
-                                        }
-                                }
-                                $start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">", $stop);
-                        }
-                        $results = array($junitFailures);
-                        return $results;
-                }
-        }
-}
-
-
-?>
-
-
diff --git a/releng.wtpbuilder/distribution/wtpcap.site/templateFiles/compileResults.php.template b/releng.wtpbuilder/distribution/wtpcap.site/templateFiles/compileResults.php.template
deleted file mode 100644
index f785771..0000000
--- a/releng.wtpbuilder/distribution/wtpcap.site/templateFiles/compileResults.php.template
+++ /dev/null
@@ -1,76 +0,0 @@
-<html>
-<head>
-
-<?php
-        $parts = explode("/", getcwd());
-        $parts2 = explode("-", $parts[count($parts) - 1]);
-        $buildName = $parts2[1];
-
-        echo "<title>Compile Logs: Code Bundles for $buildName</title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2%;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-}
-</style>
-</head>
-<body>
-
-<?php
-        echo "<h1>Compile Logs: Code Bundles for $buildName</h1>";
-?>
-
-
-<table id=tabledata align = "center" width="75%" border="1">
-  <tr>
-    <td class="bold" align="center">Compile Logs</td>
-    <td class="bold" align="center">Compile Errors</td>
-    <td class="bold" align="center">Compiler Warnings</td>
-    <td class="bold" align="center">Access Violations</td>
-    <td class="bold" align="center">Access Warnings</td>
-  </tr>
-
-  %compilelogs%
-
-</table>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/wtpcap.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/wtpcap.site/templateFiles/index.html.template.php
deleted file mode 100644
index 31dbec1..0000000
--- a/releng.wtpbuilder/distribution/wtpcap.site/templateFiles/index.html.template.php
+++ /dev/null
@@ -1,614 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<title>WTP Incubator Downloads</title>
-
-
-<?php
-
-$buildBranch="@buildBranch@";
-$build="@build@";
-$type="@type@";
-$builddate="@date@";
-
-$eclipseMirrorPrefixuri="@eclipse.mirror.prefixuri@";
-$eclipseFSpathPrefix="@eclipse.fspath.prefix@";
-
-$eclipsefilelinux="@eclipsefilelinux@";
-$eclipsefilewindows="@eclipsefilewindows@";
-$eclipsefilemacosx="@eclipsefilemacos@";
-
-$eclipseURL="@eclipseURL@";
-$eclipseFile="@eclipseFile@";
-$eclipseBuildURL="@eclipseBuildURL@";
-$eclipseBuildHome="@eclipseBuildHome@";
-$testURL="@testURL@";
-$testFile="@testFile@";
-
-$wstURL="@wstURL@";
-$wstFile="@wstFile@";
-$wstMirrorPrefixuri="@wst.mirror.prefixuri@";
-$wstBuildHome="@wstBuildHome@";
-
-$jstURL="@jstURL@";
-$jstFile="@jstFile@";
-$jstMirrorPrefixuri="@jst.mirror.prefixuri@";
-$jstBuildHome="@jstBuildHome@";
-
-$wtpURL="@wtpURL@";
-$wtpFile="@wtpFile@";
-$wtpMirrorPrefixuri="@wtp.mirror.prefixuri@";
-$wtpBuildHome="@wtpBuildHome@";
-
-$gefURL="@gefURL@";
-$gefFile="@gefFile@";
-$gefMirrorPrefixuri="@gef.mirror.prefixuri@";
-$gefBuildHome="@gefBuildHome@";
-
-$emfURL="@emfURL@";
-$emfFile="@emfFile@";
-$emfMirrorPrefixuri="@emf.mirror.prefixuri@";
-$emfBuildHome="@emfBuildHome@";
-$emfName="@emfName@";
-$emfDescription="@emfDescription@";
-
-$emfsourceURL="@emfsourceURL@";
-$emfsourceFile="@emfsourceFile@";
-$emfsourceMirrorPrefixuri="@emfsource.mirror.prefixuri@";
-$emfsourceBuildHome="@emfsourceBuildHome@";
-$emfsourceName="@emfsourceName@";
-$emfsourceDescription="@emfsourceDescription@";
-
-
-$emfxsdURL="@emfxsdURL@";
-$emfxsdFile="@emfxsdFile@";
-$emfxsdMirrorPrefixuri="@emfxsd.mirror.prefixuri@";
-$emfxsdBuildHome="@emfxsdBuildHome@";
-$emfxsdName="@emfxsdName@";
-$emfxsdDescription="@emfxsdDescription@";
-
-$emfxsdsourceURL="@emfxsdsourceURL@";
-$emfxsdsourceFile="@emfxsdsourceFile@";
-$emfxsdsourceMirrorPrefixuri="@emfxsdsource.mirror.prefixuri@";
-$emfxsdsourceBuildHome="@emfxsdsourceBuildHome@";
-$emfxsdsourceName="@emfxsdsourceName@";
-$emfxsdsourceDescription="@emfxsdsourceDescription@";
-
-
-$dtpURL="@dtpURL@";
-$dtpFile="@dtpFile@";
-$dtpMirrorPrefixuri="@dtp.mirror.prefixuri@";
-$dtpBuildHome="@dtpBuildHome@";
-
-
-$eclipserelengFile="@eclipserelengFile@";
-$eclipserelengURL="@eclipserelengURL@";
-$orbitthirdpartyzipFile="@orbitthirdpartyzipFile@";
-$orbitthirdpartyzipURL="@orbitthirdpartyzipURL@";
-$orbitthirdpartyzipBuildHome="@orbitthirdpartyzipBuildHome@";
-$orbitthirdpartyzipMirrorPrefixuri="@orbitthirdpartyzip.mirror.prefixuri@";
-
-$incubating = true;
-
-
-include("miscUtil.php");
-
-
-
-ini_set("display_errors", "true");
-error_reporting (E_ALL);
-
-
-$debugScript = false;
-$debugFunctions = false;
-
-$defaultMirrorScript="";
-$defaultWTPMirrorPrefix="./";
-
-$eclipseMirrorScript="http://www.eclipse.org/downloads/download.php?file=";
-
-// TODO: improve so this hard coding isn't required.
-// This depends on the declare script changing webtools/committers to webtools/downloads
-// And, the logic is such that if it is not mirrored, this URI is not used at all, just
-// a relative reference only
-$eclipseWTPMirrorPrefix="/webtools/committers/drops/$buildBranch/$build/";
-
-
-$mirrorScript=$defaultMirrorScript;
-$downloadprefix=$defaultWTPMirrorPrefix;
-
-
-$keytestMirrorString=$eclipseMirrorScript . "$eclipseWTPMirrorPrefix/wtpcap-sdk-$build.zip";
-if (isMirrored($keytestMirrorString) ) {
-        $mirrorScript=$eclipseMirrorScript;
-        $downloadprefix="${mirrorScript}${eclipseWTPMirrorPrefix}";
-}
-
-if ($debugScript)  {
-        echo "inferred platform: " . getPlatform();
-}
-
-
-// our summary results handling requires php 5 (for simple xml file loading)
-// so, if not php 5, just don't display any summary results
-// This was found to be required, since some mirror our whole site (e.g. IBM)
-// and not all mirrors use PHP 5
-$displayTestSummary=false;
-if (phpversion() >= 5) {
-
-        $code_totalBundles=0;
-        $code_totalErrors=0;
-        $code_totalWarnings=0;
-        $code_totalforbiddenAccessWarningCount=0;
-        $code_totaldiscouragedAccessWarningCount=0;
-        
-        $test_totalBundles=0;
-        $test_totalErrors=0;
-        $test_totalWarnings=0;
-        $test_totalforbiddenAccessWarningCount=0;
-        $test_totaldiscouragedAccessWarningCount=0;
-
-
-        $displayTestSummary=true;
-        // expecting grandTotalErrors and grandTotalTests
-        $filename = "unitTestsSummary.xml";
-        if (file_exists($filename)) {
-                $prefix = "unitTests_";
-                $unitTestsSummary = simplexml_load_file($filename);
-                foreach ($unitTestsSummary->summaryItem as $summaryItem) {
-                        $name = $summaryItem->name;
-                        $value = $summaryItem->value;
-                        $code= "\$" . $prefix . $name . " = " . $value . ";";
-                        //echo "<br />code: " . $code;
-                        eval($code);
-                }
-        }
-
-        $filename = "compilelogsSummary.xml";
-        if (file_exists($filename)) {
-          $prefix = "code_";
-          $compileSummary = simplexml_load_file($filename);
-          foreach ($compileSummary->summaryItem as $summaryItem) {
-                  $name = $summaryItem->name;
-                  $value = $summaryItem->value;
-                  $code= "\$" . $prefix . $name . " = " . $value . ";";
-                  //echo "<br />code: " . $code;
-                  eval($code);
-          }
-        }
-
-        $filename = "testcompilelogsSummary.xml";
-        if (file_exists($filename)) {
-          $prefix = "test_";
-          $compileSummary = simplexml_load_file($filename);
-          foreach ($compileSummary->summaryItem as $summaryItem) {
-                  $name = $summaryItem->name;
-                  $value = $summaryItem->value;
-                  $code= "\$" . $prefix . $name . " = " . $value . ";";
-                  //echo "<br />code: " . $code;
-                  eval($code);
-          }
-        }
-}
-
-
-?>
-
-
-</head>
-
-<body>
-
-
-<?php
-
-// tiny banner to remind when looking at "local" machine results
-$serverName = $_SERVER["SERVER_NAME"];
-
-if (!stristr($serverName, "eclipse.org") && !stristr($serverName,"you.are.at.eclipsecon.org")) {
-        echo '<center>
-          <p>
-          Reminder: this is <font color="#FF0000">' .
-        $serverName .
-        '</font>
-          See also
-          <a href="http://download.eclipse.org/webtools/downloads" target="_top">the live public Eclipse site</a>.
-          </p>
-          <hr />
-          </center>';
-
-}
-?>
-
-<?php if ($incubating) { ?>
-<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH="100%">
-        <tr>
-                <td ALIGN=left><font face="'Bitstream Vera',Helvetica,Arial" size="+2"><b><?php echo "$type";?>
-                Build: <?php echo "$build";?></b></font></td>
-           <td align="right" rowspan="3"><a
-  href="http://www.eclipse.org/projects/what-is-incubation.php"><img
-  src="http://www.eclipse.org/images/egg-incubation.png" alt="Incubation"
-  align="middle" border="0"></a></td>
-
-        <tr valign="top">
-                <td><font size="-1"><?php echo "$builddate";?></font></td>
-        </tr>
-        <tr valign="top">
-                <td>
-                <p>The Eclipse Web Tools Platform (WTP) Incubator Project provides
-                tools for development that are just getting started, or are
-                experimental in some fashion.</p>
-                </td>
-        </tr>
-</table>
-
-<?php } else { ?>
-
-<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH="100%">
-        <tr>
-                <td ALIGN=left><font face="'Bitstream Vera',Helvetica,Arial" size="+2"><b><?php echo "$type";?>
-                Build: <?php echo "$build";?></b></font></td>
-           
-
-        <tr valign="top">
-                <td><font size="-1"><?php echo "$builddate";?></font></td>
-        </tr>
-        <tr valign="top">
-                <td>
-                <p>Component build from the Eclipse Web Tools Platform (WTP) Project.</p>
-                </td>
-        </tr>
-</table>
-
-<?php } ?>
-
-<!-- ***********  Prerequisites **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-        <tr>
-                <td align="left" valign="top" bgcolor="#0080C0"><font
-                        face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Prerequisites and Handy Extras</font></td>
-        </tr>
-        <tr>
-                <td>
-                <p>These are the prerequisites to build or run these packages. 
-                Also listed are some frequently needed links for
-                committer-required packages when creating new development
-                environments, or targets to run against.</p>
-                <p>Note that WTP requires Java 5 or higher (and, for some things,
-                actually requires a JDK rather than only a JRE) even though many other
-                <a href="http://www.eclipse.org/downloads/">Eclipse Projects</a> can
-                run with <a href="http://www.eclipse.org/downloads/moreinfo/jre.php">other
-                JRE levels</a>.</p><p></p>
-                </td>
-        </tr>
-        <tr>
-                <td>
-                <table border=0 cellspacing=1 cellpadding=1 width="90%" align="center">
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td width="40%">Eclipse Platform (Platform, JDT)</td>
-                                <?php
-                                //customize page depending on user's browser/platform, if we can detect it
-                                $usersPlatform = getPlatform();
-                                // assume windows by default, since likely most frequent, even for cases where
-                                // platform is "unknown". I've noticed Opera reports 'unknown' :(
-                                $recommendedFile=$eclipsefilewindows;
-                                if (strcmp($usersPlatform,"linux")== 0) {
-                                        $recommendedFile=$eclipsefilelinux;
-                                } else if (strcmp($usersPlatform,"mac") == 0) {
-                                        $recommendedFile=$eclipsefilemacosx;
-                                }
-                                ?>
-                                <td align="right"><?php
-                                echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
-                                echo " or <a href=\"" . $eclipseBuildURL . "\">appropriate platform</a>";
-                                echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-                                ?>
-
-                        </tr>
-
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td>
-                                <?php 
-                                echo $emfName . "&nbsp;" . $emfDescription ; 
-                                ?>
-                                </td>
-                                <td align="right"><?php
-                                echo getPrereqReferenceOrName($eclipseMirrorScript, $emfMirrorPrefixuri, $emfURL, $emfFile, $eclipseFSpathPrefix);
-                                echo " or <a href=\"" . $emfBuildHome . "\">equivalent</a></td>";
-                                ?>
-                        </tr>
-
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td>
-                                <?php 
-                                echo $emfxsdName . "&nbsp;" . $emfxsdDescription ; 
-                                ?>
-                                </td>
-                                <td align="right"><?php
-                                echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdMirrorPrefixuri, $emfxsdURL, $emfxsdFile, $eclipseFSpathPrefix);
-                                echo " or <a href=\"" . $emfxsdBuildHome . "\">equivalent</a></td>";
-                                ?>
-                        </tr>
-
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td>Graphical Editing Framework (GEF)</td>
-                                <td align="right"><?php
-                                echo getPrereqReferenceOrName($eclipseMirrorScript, $gefMirrorPrefixuri, $gefURL, $gefFile, $eclipseFSpathPrefix);
-                                echo " or <a href=\"" . $gefBuildHome . "\">equivalent</a></td>";
-                                ?>
-
-                        </tr>
-
-                        <tr valign="middle">
-                                <td width="10%"></td>
-                                <td colspan="2">
-                                <hr />
-                                </td>
-                        </tr>
-
-
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td>Web Tools Platform portion</td>
-                                <td align="right"><?php
-                                // debug
-                                // echo "debug: full path: " . $eclipseFSpathPrefix . "/" . $wstMirrorPrefixuri . "/" . $wstFile;
-                                
-                                echo getPrereqReferenceOrName($eclipseMirrorScript, $wstMirrorPrefixuri, $wstURL, $wstFile, $eclipseFSpathPrefix);
-                                echo " or <a href=\"" . $wstBuildHome . "\">equivalent</a></td>";
-                                ?>
-
-                        </tr>
-                        <tr valign="middle">
-                                <td width="10%"></td>
-                                <td colspan="2">
-                                <hr />
-                                </td>
-                        </tr>
-
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td>Eclipse Test Framework (required only for Automated JUnit tests)</td>
-                                <td align="right"><?php
-                                echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $testURL, $testFile, $eclipseFSpathPrefix);
-                                echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-                                ?>
-
-                        </tr>
-
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td>Eclipse releng tool (required only for committers to more easily
-                                "release" code to a build)</td>
-                                <td align="right"><?php
-                                echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipserelengURL, $eclipserelengFile, $eclipseFSpathPrefix);
-                                echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-                                ?>
-
-                        </tr>
-
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td>Third Party code from Orbit (currently much more than needed
-                                for WTP, but some committers like having the whole heap in their
-                                target)</td>
-                                <td align="right"><?php
-                                echo getPrereqReferenceOrName($eclipseMirrorScript, $orbitthirdpartyzipMirrorPrefixuri, $orbitthirdpartyzipURL, $orbitthirdpartyzipFile,$eclipseFSpathPrefix);
-                                echo " or <a href=\"" . $orbitthirdpartyzipBuildHome . "\">equivalent</a></td>";
-                                ?>
-
-                        </tr>
-
-                </table>
-                </td>
-        </tr>
-</table>
-
-<!-- ***********  WTP **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-        <tr>
-                <td align=left valign=top colspan="5" bgcolor="#0080C0"><font
-                        face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF"> Web Tools Platform 
-               Components</font></td>
-        </tr>
-
-        <tr>
-                <td align="left" valign="top" colspan="5">
-                <p>The Zip file contains example capability definitions </p>
-                </td>
-        </tr>
-        <tr>
-                <td>
-                <table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
-
-
-                        <tr>
-                                <td align="left" valign="top" width="10%"><b>Minimal</b></td>
-                                <td align="left" valign="top">
-                                <p>Executable code only.</p>
-                                </td>
-                                <?php
-                                $zipfilename="wtpcap-${build}";
-                                $filename=$zipfilename.".zip";
-                                $zipfilesize=fileSizeForDisplay($filename);
-                                $fileShortDescription="wtpcap";
-                                displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-                                ?>
-                        </tr>
-
-                        <tr>
-                                <td align="left" valign="top" width="10%"><b>SDK</b></td>
-                                <td align="left" valign="top">
-                                <p>Executable code and source code.</p>
-                                </td>
-                                <?php
-                                $zipfilename="wtpcap-sdk-${build}";
-                                $filename=$zipfilename.".zip";
-                                $zipfilesize=fileSizeForDisplay($filename);
-                                $fileShortDescription="wtpcap sdk";
-                                displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-                                ?>
-                        </tr>
-                        <tr>
-                                <td align="left" valign="top" width="10%"><b>Tests</b></td>
-                                <td align="left" valign="top">
-                                <p>Unit tests.</p>
-                                </td>
-                                <?php
-                                $zipfilename="wtpcap-tests-${build}";
-                                $filename=$zipfilename.".zip";
-                                $zipfilesize=fileSizeForDisplay($filename);
-                                $fileShortDescription="wtpcap tests";
-                                displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-                                ?>
-                        </tr>
-                </table>
-                </td>
-
-
-        <tr>
-
-</table>
-
-
-
-
-
-
-
-<!-- ***********  Build Status **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-        <tr>
-                <td align=left valign=top bgcolor="#0080C0"><font
-                        face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Status, tests
-                and other interesting details</font></td>
-        </tr>
-        <tr>
-                <td>
-                <table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
-
-                        <tr>
-                                <td><a href="buildNotes.php">Build notes</a> <br />
-                                <a href="directory.txt">map files</a> <br />
-                                <?php
-
-                                if ($displayTestSummary) {
-
-
-                                        if (isset($unitTests_grandTotalErrors)) {
-                                                $errorColor="green";
-                                                if ($unitTests_grandTotalErrors > 0) {
-                                                        $errorColor="red";
-                                                }
-                                                echo "<a href=\"testResults.php\">Unit test results</a>&nbsp;";
-                                                echo "<img src=\"junit_err.gif\"/><font color=\"" . $errorColor . "\">" . $unitTests_grandTotalErrors . "</font>&nbsp;&nbsp;Total: " . $unitTests_grandTotalTests;
-                                        }
-                                        else {
-                                               // we hardly ever "pend" anymore ... abscense usually signifies no tests or a build error.  
-                                               echo "<br /><font color=\"orange\">Unit tests don't exists, are pending, or there's a build error.</font>";
-                                               //&nbsp;&nbsp;<img src=\"pending.gif\"/>";
-                                        }
-
-                                        echo "<br />";
-                                        echo "<a href=\"compileResults.php\">Compile logs: Code Bundles</a>";
-
-                                        echo "&nbsp;&nbsp;($code_totalBundles)&nbsp;&nbsp;";
-                                        echo "<img src=\"compile_err.gif\"/><font color=red>$code_totalErrors</font>&nbsp;";
-                                        echo "<img src=\"compile_warn.gif\"/><font color=orange>$code_totalWarnings</font>&nbsp;";
-                                        echo "<img src=\"access_err.gif\"/><font color=red>$code_totalforbiddenAccessWarningCount</font>&nbsp;";
-                                        echo "<img src=\"access_warn.gif\"/><font color=orange>$code_totaldiscouragedAccessWarningCount</font>&nbsp;";
-
-                                        echo "<br />";
-                                        echo "<a href=\"testCompileResults.php\">Compile logs: Test Bundles</a>";
-
-                                        echo "&nbsp;&nbsp;($test_totalBundles)&nbsp;&nbsp;";
-                                        echo "<img src=\"compile_err.gif\"/><font color=red>$test_totalErrors</font>&nbsp;";
-                                        echo "<img src=\"compile_warn.gif\"/><font color=orange>$test_totalWarnings</font>&nbsp;";
-                                        echo "<img src=\"access_err.gif\"/><font color=red>$test_totalforbiddenAccessWarningCount</font>&nbsp;";
-                                        echo "<img src=\"access_warn.gif\"/><font color=orange>$test_totaldiscouragedAccessWarningCount</font>&nbsp;";
-                                }
-
-                                ?> <br />
-
-                                <?php
-                                if (file_exists("versioningReportName.php")) {
-                                        include "versioningReportName.php";
-                                        $fname="${versionReportFilename}.html";
-                                        if (file_exists($fname)) {
-                                                echo "<br /> <a href='$fname'>Versioning Information</a>";
-                                        }
-}
-?> <?php
-echo "<br />";
-if (file_exists("./apiresults/api-progress.html"))
-{
-        echo "<br /> <a href=\"apiresults/api-progress.html\">API Progress Report</a>";
-}
-if (file_exists("./apiresults/api-info-summary.html"))
-{
-        echo "<br /> <a href=\"apiresults/api-info-summary.html\">APIs Defined by Each Component</a>";
-}
-if (file_exists("./apiresults/api-ref-compatibility.html"))
-{
-        echo "<br /> <a href=\"apiresults/api-ref-compatibility.html\">Adopter Breakage Report</a>";
-}
-if (file_exists("./apiresults/api-violation-summary.html"))
-{
-        echo "<br /> <a href=\"apiresults/api-violation-summary.html\">API Violations</a>";
-}
-if (file_exists("./apiresults/component-api-violation-all.html"))
-{
-        echo "<br /> <a href=\"apiresults/component-api-violation-all.html\">Non-API dependencies</a>";
-}
-if (file_exists("./apiresults/api-tc-summary.html"))
-{
-        echo "<br /> <a href=\"apiresults/api-tc-summary.html\">API Test Coverage</a>";
-}
-if (file_exists("./apiresults/api-javadoc-summary.html"))
-{
-        echo "<br /> <a href=\"apiresults/api-javadoc-summary.html\">API Javadoc Coverage</a>";
-}
-if (file_exists("./apiresults/api-tc-summary.html"))
-{
-        echo "<br /><br /> <a href=\"apiresults/full_test_coverage/api-tc-summary.html\">Test Coverage for All Classes and Methods</a>";
-}
-?> <?php
-if (file_exists("./perfresults/graph/performance.php"))
-{
-        echo "<br />";
-        echo "<br /> <a href=\"perfresults/graph/performance.php\">Performance Results</a>";
-        echo "<br />";
-}
-?></td>
-                        </tr>
-
-
-                </table>
-                </td>
-        </tr>
-</table>
-
-
-
-<!-- footer -->
-<center>
-<hr>
-<p>All downloads are provided under the terms and conditions of the <a
-        href="http://www.eclipse.org/legal/notice.html">Eclipse.org Software
-User Agreement</a> unless otherwise specified.</p>
-
-<p>If you have problems downloading the drops, contact the <font
-        face="'Bitstream Vera',Helvetica,Arial" size="-1"><a
-        href="mailto:webmaster@eclipse.org">webmaster</a></font>.</p>
-
-</center>
-<!-- end footer -->
-
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/wtpcap.site/templateFiles/siteEnablingFeatures.xml b/releng.wtpbuilder/distribution/wtpcap.site/templateFiles/siteEnablingFeatures.xml
deleted file mode 100644
index cc3ed81..0000000
--- a/releng.wtpbuilder/distribution/wtpcap.site/templateFiles/siteEnablingFeatures.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-    <description> The update site contains the enabling features. </description>
-    <category-def
-        name="Enabling Features"
-        label="Enabling Features">
-        <description> This category contains features used by several
-            projects that enable some functionality, but which by
-            themselves are not very interesting. </description>
-    </category-def>
-</site>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtpcap.site/templateFiles/siteWTP.xml b/releng.wtpbuilder/distribution/wtpcap.site/templateFiles/siteWTP.xml
deleted file mode 100644
index f94e83f..0000000
--- a/releng.wtpbuilder/distribution/wtpcap.site/templateFiles/siteWTP.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site
-    pack200="true"
-    mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/webtools/testUpdates/site.xml&amp;format=xml"
-    digestURL="http://download.eclipse.org/webtools/testUpdates/">
-    <description
-        url="http://download.eclipse.org/webtools/declaredUpdates/index.html"> The update site contains the features of the of Eclipse Web
-        Tools Project (WTP) </description>
-    <feature
-        url="features/org.eclipse.wst_@org.eclipse.wst@.jar"
-        id="org.eclipse.wst"
-        version="@org.eclipse.wst@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.wst.sdk_@org.eclipse.wst.sdk@.jar"
-        id="org.eclipse.wst.sdk"
-        version="@org.eclipse.wst.sdk@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jst_@org.eclipse.jst@.jar"
-        id="org.eclipse.jst"
-        version="@org.eclipse.jst@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jst.sdk_@org.eclipse.jst.sdk@.jar"
-        id="org.eclipse.jst.sdk"
-        version="@org.eclipse.jst.sdk@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jpt.feature_@org.eclipse.jpt.feature@.jar"
-        id="org.eclipse.jpt.feature"
-        version="@org.eclipse.jpt.feature@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jpt_sdk.feature_@org.eclipse.jpt_sdk.feature@.jar"
-        id="org.eclipse.jpt_sdk.feature"
-        version="@org.eclipse.jpt_sdk.feature@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <category-def
-        name="Web Tools Platform (WTP)"
-        label="Web Tools Platform (WTP)">
-        <description> This category contains the features of the Eclipse
-            Web Tools Project (WTP). </description>
-    </category-def>
-</site>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtpcap.site/templateFiles/testCompileResults.php.template b/releng.wtpbuilder/distribution/wtpcap.site/templateFiles/testCompileResults.php.template
deleted file mode 100644
index 42d6f65..0000000
--- a/releng.wtpbuilder/distribution/wtpcap.site/templateFiles/testCompileResults.php.template
+++ /dev/null
@@ -1,76 +0,0 @@
-<html>
-<head>
-
-<?php
-        $parts = explode("/", getcwd());
-        $parts2 = explode("-", $parts[count($parts) - 1]);
-        $buildName = $parts2[1];
-
-        echo "<title>Compile Logs: Test Bundles for $buildName</title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2em;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:Bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-}
-</style>
-</head>
-<body>
-
-<?php
-        echo "<h1>Compile Logs: Test Bundles for $buildName</h1>";
-?>
-
-
-<table id=tabledata align = "center" width="75%" border="1">
-  <tr>
-    <td class="bold" align="center">Compile Logs</td>
-    <td class="bold" align="center">Compile Errors</td>
-    <td class="bold" align="center">Compiler Warnings</td>
-    <td class="bold" align="center">Access Violations</td>
-    <td class="bold" align="center">Access Warnings</td>
-  </tr>
-
-  %compilelogs%
-
-</table>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/wtpcap.site/templateFiles/testResults.php.template b/releng.wtpbuilder/distribution/wtpcap.site/templateFiles/testResults.php.template
deleted file mode 100644
index ddad0b7..0000000
--- a/releng.wtpbuilder/distribution/wtpcap.site/templateFiles/testResults.php.template
+++ /dev/null
@@ -1,119 +0,0 @@
-<html>
-<head>
-
-<?php
-	$parts = explode("/", getcwd());
-	$parts2 = explode("-", $parts[count($parts) - 1]);
-	$buildName = $parts2[1];
-	
-	echo "<title>Test Results for $buildName </title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2em;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:Bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-
-}
-</style>
-
-
-</head>
-<body>
-<p><b><font face="Verdana" size="+3">Test Results</font></b> </p>
-
-<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">
-    Unit Test Results for <?php echo "$buildName"; ?> on Various Platforms and JRE</font></b></td>
-  </tr>
-</table>
-
-<?php
-if (file_exists("testResults"))
-{
-$dir = dir("testResults");
-while ($anEntry = $dir->read())
-{
-  if ($anEntry != "." && $anEntry != ".." && $anEntry != "consolelogs" && $anEntry != "html" && $anEntry != "xml")
-  {
-    $link = "testResults/".$anEntry."/results/index.php";
-    echo "<p><a href=\"$link\">$anEntry</a></p>";
-  }
-}
-}
-?>
-
-<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">Unit 
-      Test Results for <?php echo "$buildName"; ?> </font></b></td>
-  </tr>
-</table>
-
-<table id=tableunittestdata align = "center" width="75%" border="1">
-  <tr> 
-    <td class="bold" align="center" width="70%">Test Suite</td>
-    <td class="bold" align="center" width="10%">Errors &amp; Failures</td>
-    <td class="bold" align="center" width="10%">Total Tests</td>
-    <td class="bold" align="center" width="10%">Total Time (s)</td>
-  </tr>
-  
-  
-  %testresults%
-  
-</table>
-<p></p>
-<br>
-<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"> 
-      Console output logs 
-      <?php echo "$buildName"; ?>
-      </font></b></td>
-  </tr>
-</table>
-<br>
-These <a href="consoleLogs.php">logs</a> contain the console output captured while 
-running the JUnit automated tests. <br>
-<br>
-
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/wtpcap.site/transformReportToHTML.xml b/releng.wtpbuilder/distribution/wtpcap.site/transformReportToHTML.xml
deleted file mode 100644
index 3e9f35b..0000000
--- a/releng.wtpbuilder/distribution/wtpcap.site/transformReportToHTML.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-    name="xsl-conversion"
-    default="main"
-    basedir=".">
-    <target
-        name="main"
-        description="example.@dot.xml to produce example.@dot.html">
-      <xslt
-          destdir="${resultDir}/compilelogs"
-          scanincludeddirectories="true"
-          style="compilerXMLOutputToHTML.xsl"
-          force="true" >
-            <fileset dir="${resultDir}/compilelogs" includes="**/*.xml" />
-      </xslt>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtpjee.build/build.xml b/releng.wtpbuilder/distribution/wtpjee.build/build.xml
deleted file mode 100644
index deeed14..0000000
--- a/releng.wtpbuilder/distribution/wtpjee.build/build.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<project
-    default="build"
-    basedir=".">
-    <fail
-        unless="wtp.builder.home"/>
-    <property
-        file="${wtp.builder.home}/build.properties"/>
-    <target
-        name="build"
-        depends="getBaseBuilder">
-        <dirname
-            file="${ant.file}"
-            property="distribution.wtp.build.dir"/>
-        <property
-            name="buildTargets"
-            value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
-        <!--
-            for this distribution, dependencies come from project's
-            releng map project
-        -->
-        <property
-            name="dependency.properties"
-            value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-
-        <!-- calling label.xml to createg label.properties file -->
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-        <echo
-            level="info"
-            message="invoking buildTargets: ${buildTargets} to build for each component"/>
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="wtpjee"/>
-        </ant>
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="wtpjee_sdk"/>
-        </ant>
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="wtpjee_tests"/>
-            <property
-                name="eclipseBuildFailOnError"
-                value="false"/>
-        </ant>
-
-        <!-- package -->
-        <antcall
-            target="package"/>
-    </target>
-
-    <!-- invoking runbuild.xml targetting getBaseBuilder -->
-    <target
-        name="getBaseBuilder"
-        if="eclipse.builder.fetch">
-        <dirname
-            file="${ant.file}"
-            property="wtbuilder.dir"/>
-        <property
-            name="buildTargets"
-            value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
-        <echo
-            level="info"
-            message="invoking buildTargets: ${buildTargets} -> getBaseBuilder"/>
-        <ant
-            antfile="${buildTargets}"
-            target="getBaseBuilder"/>
-    </target>
-    <target
-        name="package">
-        <!--
-            post, post packaging, for WTP ... "manually" assemble the
-            desired zips
-        -->
-        <!-- nothing to assemble right now -->
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtpjee.site/build.xml b/releng.wtpbuilder/distribution/wtpjee.site/build.xml
deleted file mode 100644
index 1b3b037..0000000
--- a/releng.wtpbuilder/distribution/wtpjee.site/build.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<project
-    name="Build specific targets and properties"
-    default="build"
-    basedir=".">
-    <!--
-        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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- = = = end standard properties pattern = = = -->
-    <echo
-        message="ant.file: ${ant.file}"/>
-    <target
-        name="build">
-        <java
-            jar="${eclipse.launcher}"
-            fork="true"
-            failonerror="true">
-            <jvmarg
-                value="-Dosgi.ws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dosgi.os=${env.BASEOS}"/>
-            <jvmarg
-                value="-Dosgi.arch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-Dbuild.donottagmaps=${build.donottagmaps}"/>
-            <jvmarg
-                value="-DbuildBranch=${buildBranch}"/>
-            <jvmarg
-                value="-DbuildType=${buildType}"/>
-            <jvmarg
-                value="-DbuildId=${buildId}"/>
-            <jvmarg
-                value="-DmapVersionTag=${mapVersionTag}"/>
-            <jvmarg
-                value="-Dbuild.distribution=${build.distribution}"/>
-            <jvmarg
-                value="-DbuildDirectory=${buildDirectory}"/>
-            <jvmarg
-                value="-Dwtp.builder.home=${wtp.builder.home}"/>
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <jvmarg
-                value="-Dprojectname=${projectname}"/>
-            <jvmarg
-                value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
-            <jvmarg
-                value="-DurlLogLocation=${buildDirectory}/outgoinghttplogfromsitebuild.log"/>
-            <arg
-                value="-data"/>
-            <arg
-                value="${basedir}/workspace"/>
-            <arg
-                value="-application"/>
-            <arg
-                value="org.eclipse.ant.core.antRunner"/>
-            <arg
-                value="-buildfile"/>
-            <arg
-                value="${ant.file}"/>
-            <arg
-                value="publish"/>
-        </java>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Steps to do to publish the build results -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="publish">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-        <property
-            file="${buildDirectory}/label.properties"/>
-        <property
-            name="publish.xml"
-            value="${component.dir}/publish.xml"/>
-        <property
-            name="indexFileName"
-            value="index.php"/>
-        <property
-            name="result"
-            value="${buildDirectory}/${buildLabel}"/>
-        <property
-            name="indexTemplateFilename"
-            value="index.html.template.php"/>
-        <copy
-            file="${wtp.builder.home}/distribution/wtp.site/templateFiles/${indexTemplateFilename}"
-            tofile="${buildDirectory}/${indexFileName}"/>
-        <condition
-            property="isBuildTested"
-            value="true">
-            <available
-                file="${buildDirectory}/${buildLabel}/testResults/html"/>
-        </condition>
-        <ant
-            antfile="${publish.xml}"
-            dir="${component.dir}">
-            <property
-                name="dropTokenList"
-                value="%wtpruntime%,%wtpsdk%,%wtptest%,%wst%,%wst-sdk%,%wst-tests%,%jst-tests%,%wst-perf-tests%,%jst-perf-tests%,%jpt-runtime%,%jpt-sdk%,%jpt-tests%"/>
-            <property
-                name="webtoolsDownloadURL"
-                value="http://www.eclipse.org/downloads/download.php?file=/webtools/committers/drops"/>
-            <property
-                name="buildBranch"
-                value="${buildBranch}"/>
-            <property
-                name="isBuildTested"
-                value="${isBuildTested}"/>
-            <property
-                name="indexTemplateFilename"
-                value="${indexTemplateFilename}"/>
-        </ant>
-
-        <!--  Get the build map over for the results to point to. -->
-        <copy
-            file="${buildDirectory}/directory.txt"
-            tofile="${result}/directory.txt"/>
-
-        <!-- Copy info for build identification -->
-        <copy
-            file="${buildDirectory}/buildmachineinfo.properties"
-            tofile="${result}/buildmachineinfo.properties"/>
-
-        <!-- http access logs -->
-        <copy
-            todir="${result}/"
-            failonerror="false">
-            <fileset
-                dir="${buildDirectory}"
-                includes="*.log"/>
-        </copy>
-
-        <!-- ant build log, from control directory -->
-        <copy
-            todir="${result}/"
-            failonerror="false">
-            <fileset
-                dir="${env.ANT_WORKING}/${projectname}"
-                includes="antBuilderOutput.log"/>
-        </copy>
-
-
-
-        <!-- final count files -->
-        <countBuildFiles
-            sourceDirectory="${buildDirectory}/${buildLabel}"
-            filterString=".zip,.tar.gz"
-            outputFile="${buildDirectory}/${buildLabel}/files.count"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtpjee.site/compilerXMLOutputToHTML.xsl b/releng.wtpbuilder/distribution/wtpjee.site/compilerXMLOutputToHTML.xsl
deleted file mode 100644
index ffc7905..0000000
--- a/releng.wtpbuilder/distribution/wtpjee.site/compilerXMLOutputToHTML.xsl
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet
-    version="1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-    <xsl:output
-        method="html"
-        indent="yes"/>
-    <xsl:template
-        match="/">
-        <html>
-            <body>
-                <xsl:apply-templates
-                    select="compiler"/>
-            </body>
-        </html>
-    </xsl:template>
-    <xsl:template
-        match="compiler">
-        <h2>Compiler Report</h2>
-        <p>
-            Compiler:
-            <xsl:value-of
-                select="@name"/>
-            <xsl:text>   </xsl:text>
-            Version:
-            <xsl:value-of
-                select="@version"/>
-        </p>
-        <xsl:apply-templates
-            select="stats"/>
-        <xsl:apply-templates
-            select="sources"/>
-    </xsl:template>
-    <xsl:template
-        name="stats"
-        match="stats">
-        <p>
-            Number of source files:
-            <xsl:value-of
-                select="count(..//source)"/>
-            Number of classfiles:
-            <xsl:value-of
-                select="number_of_classfiles/@value"/>
-        </p>
-        <p>
-            Problems:
-            <xsl:value-of
-                select="problem_summary/@problems"/>
-            (Errors:
-            <xsl:value-of
-                select="problem_summary/@errors"/>
-            Warnings:
-            <xsl:value-of
-                select="problem_summary/@warnings"/>
-            )
-        </p>
-    </xsl:template>
-    <xsl:template
-        name="sources"
-        match="sources">
-        <xsl:if
-            test="count(source) > 0">
-            <dl>
-                <xsl:for-each
-                    select="source">
-                    <xsl:variable
-                        name="package"
-                        select="normalize-space(@package)">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="path"
-                        select="normalize-space(@path)">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="classname"
-                        select="substring-after($path, $package)">
-                    </xsl:variable>
-                    <xsl:if
-                        test="count(problems) > 0">
-                        <dt
-                            style="font-weight: bold; color: black">
-                            Source File:
-                            <xsl:value-of
-                                select="$package"/>
-                            <xsl:value-of
-                                select="$classname"/>
-                        </dt>
-                        <xsl:apply-templates
-                            select="problems">
-                            <xsl:with-param
-                                name="classname">
-                                <xsl:value-of
-                                    select="$classname"/>
-                            </xsl:with-param>
-                        </xsl:apply-templates>
-                    </xsl:if>
-                </xsl:for-each>
-            </dl>
-        </xsl:if>
-    </xsl:template>
-    <xsl:template
-        match="problems">
-        <xsl:param
-            name="classname"/>
-        <xsl:for-each
-            select="problem">
-            <dd
-                style="font-weight: normal; color: black">
-                <xsl:value-of
-                    select="position()"/>
-                <xsl:text>.  </xsl:text>
-                <xsl:value-of
-                    select="@severity"/>
-                <xsl:text>:  </xsl:text>
-                <xsl:value-of
-                    select="@id"/>
-                <xsl:variable
-                    name="lineNumber"
-                    select="@line">
-                </xsl:variable>
-                <xsl:for-each
-                    select="message">
-                    <p
-                        style="margin-left: +.5in; font-size: -1; margin-top: 0;margin-bottom:0;">
-                        <small>
-                            <xsl:value-of
-                                select="@value"/>
-                        </small>
-                    </p>
-                </xsl:for-each>
-                <xsl:for-each
-                    select="source_context">
-                    <xsl:variable
-                        name="pre"
-                        select="substring(@value,0,(@sourceStart + 1))">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="main"
-                        select="substring(@value,(@sourceStart + 1),(((@sourceEnd + 1) - (@sourceStart + 1)) + 1))">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="end"
-                        select="substring(@value,(@sourceEnd + 2))">
-                    </xsl:variable>
-                    <p
-                        style="margin-left: +.5in; font-size: -2; margin-top: 0;margin-bottom:0;">
-                        <xsl:value-of
-                            select="substring($classname,2)"/>
-                        :
-                    </p>
-                    <p
-                        style="margin-left: +.5in; font-size: -2;font-family: monospace; margin-top: 0;margin-bottom:0;">
-                        <xsl:value-of
-                            select="$lineNumber"/>
-                        :
-                        <xsl:value-of
-                            select="$pre"/>
-                        <b>
-                            <u>
-                                <xsl:value-of
-                                    select="$main"/>
-                            </u>
-                        </b>
-                        <xsl:value-of
-                            select="$end"/>
-                    </p>
-                </xsl:for-each>
-            </dd>
-        </xsl:for-each>
-    </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtpjee.site/publish.xml b/releng.wtpbuilder/distribution/wtpjee.site/publish.xml
deleted file mode 100644
index 0f35d8d..0000000
--- a/releng.wtpbuilder/distribution/wtpjee.site/publish.xml
+++ /dev/null
@@ -1,649 +0,0 @@
-<project
-    name="Publish Build"
-    default="default"
-    basedir=".">
-    <!--
-        Properties that must be passed to this script: buildDirectory:
-        Path to perform the build in. (A working directory) buildType:
-        Type of build (nightly, integration etc.) buildId: Build name
-        buildLabel: <buildType>-<buildName>-<timestamp>
-    -->
-    <property
-        environment="env"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be provided to publish"/>
-    <fail
-        unless="buildLabel"
-        message="buildLabel must be provided to publish"/>
-    <fail
-        unless="wtp.builder.home"
-        message="wtp.builder.home must be provided to publish"/>
-    <fail
-        unless="build.distribution"
-        message="build.distribution must be provided to publish"/>
-    <property
-        name="resultDir"
-        value="${buildDirectory}/${buildLabel}"/>
-    <!--name of generated index page-->
-    <property
-        name="indexFileName"
-        value="index.php"/>
-    <property
-        name="templateDir"
-        value="${wtp.builder.home}/distribution/${build.distribution}.site"/>
-    <property
-        name="resultingIndex"
-        value="${resultDir}/${indexFileName}"/>
-    <echo
-        level="debug"
-        message="resultDir: ${resultDir}"/>
-    <echo
-        level="debug"
-        message="templateDir: ${templateDir}"/>
-    <echo
-        level="debug"
-        message="resultingIndex: ${resultingIndex}"/>
-    <target
-        name="default">
-        <copy
-            overwrite="true"
-            file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/${indexTemplateFilename}"
-            tofile="${resultingIndex}"/>
-        <antcall
-            target="countFiles"/>
-        <antcall
-            target="generateCompileIndex"/>
-        <antcall
-            target="generateJUnitTestsIndex"/>
-        <antcall
-            target="getStaticFiles"/>
-    </target>
-    <target
-        name="generateCompileIndex">
-        <!--
-            <taskdef name="indexResults"
-            classname="org.eclipse.wtp.releng.tools.ResultsSummaryGenerator"
-            />
-        -->
-        <!--
-            isBuildTested: true|false should JUnit plugin test results
-            be used to generate index page dropTokenList: comma
-            separated list of strings which should be replaced by the
-            fileName attribute settings in the testManifest.xml.
-            xmlDirectoryName: path to directory containing JUnit plugin
-            test results in xml format (see doc is org.eclipse.test).
-            dropDirectoryName: path to directory containing the result
-            of the build. testResultsTemplateFileName: path to template
-            file used to generate page with links to JUnit test results
-            testResultsHtmlFileName: name of file which will be
-            generated with links to JUnit test results dropHtmlFileName:
-            name of generated index page hrefTestResultsTargetPath:
-            relative path from index page to directory containing JUnit
-            html test results hrefCompileLogsTargetPath: relative path
-            from index page directory containing compilelogs
-            testManifestFileName: name of xml file containing
-            descriptions of zip types and log files
-        -->
-        <property
-            file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-
-        <!-- create tables of test plugin compiles first -->
-        <antcall
-            target="generateTestCompileOutput">
-            <param
-                name="outputDirectory"
-                value="${resultDir}/testcompilelogs"/>
-        </antcall>
-
-        <!-- create table of code plugins compiles -->
-        <antcall
-            target="generateCompileOutput">
-            <param
-                name="outputDirectory"
-                value="${resultDir}/compilelogs"/>
-        </antcall>
-        <tstamp>
-            <format
-                property="TODAY"
-                pattern="MMMM d, yyyy"/>
-        </tstamp>
-
-        <!--  Insert Build Type descriptor  -->
-        <antcall
-            target="${buildType}"/>
-        <antcall
-            target="writeData"/>
-        <!--
-            Update timestamp on file to permit overwrite through Ant
-            copy task
-        -->
-        <touch
-            file="${resultingIndex}"/>
-    </target>
-    <target
-        name="generateTestCompileOutput"
-        depends="checkIfCompileLogs"
-        if="doCompileLogs">
-        <summarizeResults
-            isBuildTested="false"
-            includeAll="true"
-            dropTokenList="${dropTokenList}"
-            xmlDirectoryName=""
-            dropDirectoryName="${resultDir}"
-            testResultsTemplateFileName="${templateDir}/templateFiles/testCompileResults.php.template"
-            testResultsHtmlFileName="testCompileResults.php"
-            hrefTestResultsTargetPath=""
-            hrefCompileLogsTargetPath="testcompilelogs"
-            compileLogsDirectoryName="${outputDirectory}"/>
-        <antcall
-            target="compilerXMLToHTML"/>
-    </target>
-    <target
-        name="generateCompileOutput"
-        depends="checkIfCompileLogs"
-        if="doCompileLogs">
-        <summarizeResults
-            isBuildTested="false"
-            includeAll="true"
-            dropTokenList="${dropTokenList}"
-            xmlDirectoryName=""
-            dropDirectoryName="${resultDir}"
-            testResultsTemplateFileName="${templateDir}/templateFiles/compileResults.php.template"
-            testResultsHtmlFileName="compileResults.php"
-            hrefTestResultsTargetPath="testResults/html"
-            hrefCompileLogsTargetPath="compilelogs"
-            compileLogsDirectoryName="${outputDirectory}"/>
-        <antcall
-            target="compilerXMLToHTML"/>
-    </target>
-    <target
-        name="compilerXMLToHTML">
-        <xslt
-            basedir="${outputDirectory}"
-            destdir="${outputDirectory}"
-            includes="**/*.xml"
-            scanincludeddirectories="true"
-            style="compilerXMLOutputToHTML.xsl"
-            force="true"/>
-    </target>
-    <target
-        name="generateJUnitTestsIndex"
-        depends="checkIfTested"
-        if="doTests">
-        <!--
-            isBuildTested: true|false should JUnit plugin test results
-            be used to generate index page dropTokenList: comma
-            separated list of strings which should be replaced by the
-            fileName attribute settings in the testManifest.xml.
-            xmlDirectoryName: path to directory containing JUnit plugin
-            test results in xml format (see doc is org.eclipse.test).
-            dropDirectoryName: path to directory containing the result
-            of the build. testResultsTemplateFileName: path to template
-            file used to generate page with links to JUnit test results
-            testResultsHtmlFileName: name of file which will be
-            generated with links to JUnit test results dropHtmlFileName:
-            name of generated index page hrefTestResultsTargetPath:
-            relative path from index page to directory containing JUnit
-            html test results hrefCompileLogsTargetPath: relative path
-            from index page directory containing compilelogs
-            testManifestFileName: name of xml file containing
-            descriptions of zip types and log files
-        -->
-        <property
-            file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-
-        <!-- create table of test plugin compiles first -->
-        <!-- set isBuildTested to true for the "compile only" results -->
-        <summarizeResults
-            isBuildTested="true"
-            dropTokenList="${dropTokenList}"
-            dropDirectoryName="${resultDir}"
-            xmlDirectoryName="${resultDir}/testResults/xml"
-            testResultsTemplateFileName="${templateDir}/templateFiles/testResults.php.template"
-            testResultsHtmlFileName="testResults.php"
-            hrefTestResultsTargetPath="testResults/html"
-            compileLogsDirectoryName=""/>
-        <tstamp>
-            <format
-                property="TODAY"
-                pattern="MMMM d, yyyy"/>
-        </tstamp>
-
-        <!--  Insert Build Type descriptor  -->
-        <antcall
-            target="${buildType}"/>
-        <antcall
-            target="writeData"/>
-        <!--
-            Update timestamp on file to permit overwrite through Ant
-            copy task
-        -->
-        <touch
-            file="${resultingIndex}"/>
-    </target>
-    <target
-        name="getStaticFiles">
-        <!--get static files required in the buildLabel directory-->
-        <copy
-            todir="${resultDir}">
-            <fileset
-                dir="${templateDir}/staticDropFiles"/>
-        </copy>
-
-        <!--copy buildnotes from plugin directories-->
-        <mkdir
-            dir="${resultDir}/buildnotes"/>
-        <copy
-            todir="${resultDir}/buildnotes"
-            flatten="true">
-            <fileset
-                dir="${buildDirectory}/plugins"
-                includes="**/buildnotes_*.html"/>
-            <fileset
-                dir="${buildDirectory}/features"
-                includes="**/buildnotes_*.html"/>
-        </copy>
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/full/logIndex.php"/>
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/testLogs/logIndex.php"/>
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/testSysErrorLogs/logIndex.php"/>
-    </target>
-    <target
-        name="updateSite">
-
-
-        <!-- get our authored, tokenized site.xml file -->
-        <copy
-            file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/siteWTP.xml"
-            tofile="${buildDirectory}/${buildLabel}/updateSite/site.xml"
-            overwrite="true"
-            failonerror="true"/>
-        <!--
-            get the ${buildDirectory}/finalPluginsVersions.properties,
-            and read as properties
-        -->
-        <!-- substitute property value for tokens -->
-        <replace
-            file="${buildDirectory}/${buildLabel}/updateSite/site.xml"
-            propertyfile="${buildDirectory}/finalFeaturesVersions.properties">
-            <replacefilter
-                token="@org.eclipse.wtp@"
-                property="org.eclipse.wtp"/>
-            <replacefilter
-                token="@org.eclipse.wtp.sdk@"
-                property="org.eclipse.wtp.sdk"/>
-            <replacefilter
-                token="@org.eclipse.jst@"
-                property="org.eclipse.jst"/>
-            <replacefilter
-                token="@org.eclipse.jst.sdk@"
-                property="org.eclipse.jst.sdk"/>
-            <replacefilter
-                token="@org.eclipse.jpt.feature@"
-                property="org.eclipse.jpt.feature"/>
-            <replacefilter
-                token="@org.eclipse.jpt_sdk.feature@"
-                property="org.eclipse.jpt_sdk.feature"/>
-        </replace>
-    </target>
-    <target
-        name="countFiles">
-        <!--
-            files.count is a file that should exist in the drop
-            directory with a count of the zip files in the same
-            directory. It is required to generate a link to the build on
-            the downloads page.
-        -->
-        <countBuildFiles
-            sourceDirectory="${resultDir}"
-            filterString=".zip,.tar.gz"
-            outputFile="${resultDir}/files.count"/>
-    </target>
-
-    <!--Build type descriptors-->
-    <target
-        name="I">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Integration"/>
-    </target>
-    <target
-        name="S">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Stable"/>
-    </target>
-    <target
-        name="N">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Nightly"/>
-    </target>
-    <target
-        name="M">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Maintenance"/>
-    </target>
-    <target
-        name="R">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Release"/>
-    </target>
-    <target
-        name="T">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Test"/>
-    </target>
-    <target
-        name="P">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Patches"/>
-    </target>
-    <target
-        name="checkIfTested">
-        <echo
-            level="debug"
-            message="isBuildTested: ${isBuildTested}"/>
-        <condition
-            property="doTests">
-            <equals
-                arg1="${isBuildTested}"
-                arg2="true"
-                trim="true"
-                casesensitive="false"/>
-        </condition>
-    </target>
-    <target
-        name="checkIfCompileLogs">
-        <condition
-            property="doCompileLogs">
-            <available
-                file="${outputDirectory}"/>
-        </condition>
-    </target>
-    <target
-        name="writeData">
-        <!--  Insert Build Date  -->
-        <replace
-            file="${resultingIndex}"
-            token="@date@"
-            value="${TODAY}"/>
-
-        <!--  Insert Build Name  -->
-        <replace
-            file="${resultingIndex}"
-            token="@build@"
-            value="${buildLabel}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@buildBranch@"
-            value="${buildBranch}"/>
-
-        <!--  Insert PreRequsites  -->
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseFile@"
-            value="${eclipse.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseURL@"
-            value="${eclipse.url}/${eclipse.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseBuildURL@"
-            value="${eclipse.url}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilelinux@"
-            value="${eclipse.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilewindows@"
-            value="${eclipse.file.win32-win32-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilemacos@"
-            value="${eclipse.file.macosx-carbon-ppc}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseBuildHome@"
-            value="${eclipse.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipse.mirror.prefixuri@"
-            value="${eclipse.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipse.fspath.prefix@"
-            value="${eclipse.fspath.prefix}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@testURL@"
-            value="${eclipseTestFramework.url}/${eclipseTestFramework.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@testFile@"
-            value="${eclipseTestFramework.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfName@"
-            value="${emf.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfDescription@"
-            value="${emf.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfFile@"
-            value="${emf.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfURL@"
-            value="${emf.url}/${emf.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfBuildHome@"
-            value="${emf.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emf.mirror.prefixuri@"
-            value="${emf.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdFile@"
-            value="${emfxsd.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdName@"
-            value="${emfxsd.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdDescription@"
-            value="${emfxsd.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdURL@"
-            value="${emfxsd.url}/${emfxsd.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdBuildHome@"
-            value="${emfxsd.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsd.mirror.prefixuri@"
-            value="${emfxsd.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstFile@"
-            value="${wst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstURL@"
-            value="${wst.url}/${wst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstBuildHome@"
-            value="${wst.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wst.mirror.prefixuri@"
-            value="${wst.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstFile@"
-            value="${jst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstURL@"
-            value="${jst.url}/${jst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstBuildHome@"
-            value="${jst.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jst.mirror.prefixuri@"
-            value="${jst.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpFile@"
-            value="${wtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpURL@"
-            value="${wtp.url}/${wtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpBuildHome@"
-            value="${wtp.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtp.mirror.prefixuri@"
-            value="${wtp.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefFile@"
-            value="${gef.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefURL@"
-            value="${gef.url}/${gef.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefBuildHome@"
-            value="${gef.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gef.mirror.prefixuri@"
-            value="${gef.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipserelengFile@"
-            value="${eclipsereleng.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipserelengURL@"
-            value="${eclipsereleng.url}/${eclipsereleng.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipFile@"
-            value="${orbitthirdpartyzip.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipURL@"
-            value="${orbitthirdpartyzip.url}/${orbitthirdpartyzip.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipBuildHome@"
-            value="${orbitthirdpartyzip.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzip.mirror.prefixuri@"
-            value="${orbitthirdpartyzip.mirror.prefixuri}"/>
-
-
-        <!-- no longer used. Post 1.5.5 -->
-        <replace
-            file="${resultingIndex}"
-            token="@jemFile@"
-            value="${jem.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jemURL@"
-            value="${jem.url}/${jem.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jemBuildHome@"
-            value="${jem.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jem.mirror.prefixuri@"
-            value="${jem.mirror.prefixuri}"/>
-        <!--
-            these token/s should not exist in maintenance stream, but do
-            no harm done, so in the interests of keeping builder streams
-            in sync, we'll leave them here as place hold
-        -->
-        <replace
-            file="${resultingIndex}"
-            token="@dtpFile@"
-            value="${dtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtpURL@"
-            value="${dtp.url}/${dtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtpBuildHome@"
-            value="${dtp.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtp.mirror.prefixuri@"
-            value="${dtp.mirror.prefixuri}"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/access_err.gif b/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/access_err.gif
deleted file mode 100644
index 4f0748a..0000000
--- a/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/access_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/access_warn.gif b/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/access_warn.gif
deleted file mode 100644
index 8386e3e..0000000
--- a/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/access_warn.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/buildNotes.php b/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/buildNotes.php
deleted file mode 100644
index e843ecf..0000000
--- a/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/buildNotes.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<html>
-<head>
-<?php
-$parts = explode("/", getcwd());
-$parts2 = explode("-", $parts[count($parts) - 1]);
-$buildName = $parts2[1];
-
-echo "<title>Build Notes for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Build Notes</font></b></p>
-
-<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"> Build Notes for <?php echo "$buildName"; ?></font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$hasNotes = false;
-$aDirectory = dir("buildnotes");
-while ($anEntry = $aDirectory->read()) {
-    if ($anEntry != "." && $anEntry != "..") {
-        //print_r($anEntry);
-        //echo "<br />";
-
-        $subject = $anEntry;
-        $pattern = '/^buildnotes_(.*)/i';
-        preg_match($pattern, $subject, $matches);
-        $subject = $matches[1];
-        //print_r($subject);
-        //echo "<br />";
-        $pattern = '/^(.*)\.html$/';
-        preg_match($pattern, $subject, $matches);
-        //print_r($matches);
-        //echo "<br />";
-
-        $component = $matches[1];
-
-        $line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
-        echo "<tr>";
-        echo "$line";
-        echo "</tr>";
-        $hasNotes = true;
-
-    }
-}
-$aDirectory.closedir();
-if (!$hasNotes) {
-    echo "<br>There are no build notes for this build.";
-}
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/compile_err.gif b/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/compile_err.gif
deleted file mode 100644
index c2bfdd6..0000000
--- a/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/compile_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/compile_warn.gif b/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/compile_warn.gif
deleted file mode 100644
index cf4fdf9..0000000
--- a/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/compile_warn.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/consoleLogs.php b/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/consoleLogs.php
deleted file mode 100644
index 7dd5f42..0000000
--- a/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/consoleLogs.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<html>
-<head>
-<?php
-$parts = explode("/", getcwd());
-$parts2 = explode("-", $parts[count($parts) - 1]);
-$buildName = $parts2[1];
-
-echo "<title>Test Console Output for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-<title>Console Logs from Running JUnit Plug-in Tests</title>
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b></p>
-
-<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">Console output from running
-		JUnit plugin tests for <?php echo "$buildName"; ?> </font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$rootDir = "testResults/consolelogs";
-$hasNotes = false;
-$aDirectory = dir($rootDir);
-$index = 0;
-$dirindex = 0;
-while ($anEntry = $aDirectory->read()) {
-    if ($anEntry != "." && $anEntry != "..") {
-        if (is_file("$rootDir/$anEntry")) {
-            $entries[$index] = $anEntry;
-            $index++;
-        } else if (is_dir("$rootDir/$anEntry")) {
-            $direntries[$dirindex] = $anEntry;
-            $dirindex++;
-        }
-    }
-}
-$aDirectory->close();
-
-
-sort($entries);
-sort($direntries);
-
-for ($i = 0; $i < $dirindex; $i++) {
-    $anEntry = $direntries[$i];
-    $line = "<td><a href=\"testResults/consolelogs/$anEntry/logIndex.php\">$anEntry</a></td>";
-    echo "<tr>";
-    echo "$line";
-    echo "</tr>";
-}
-for ($i = 0; $i < $index; $i++) {
-    $anEntry = $entries[$i];
-    $logsize = filesize("testResults/consolelogs/$anEntry");
-
-
-    $level = 0;
-    if ($logsize > 20000) {
-        $level = 2;
-    }
-    else if ($logsize > 2000) {
-        $level = 1;
-    }
-
-    if ($level == 0) {
-        $line = "<td><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-    }
-    else if ($level == 1) {
-        $line = "<td><em><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-    } else if ($level == 2) {
-        $line = "<td><strong><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-    }
-
-
-    echo "<tr>";
-    echo "$line";
-    echo "</tr>";
-    $hasNotes = true;
-}
-
-if (!$hasNotes) {
-    echo "<br>There are no test logs for this build.";
-}
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/junit_err.gif b/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/junit_err.gif
deleted file mode 100644
index 1b7ff9d..0000000
--- a/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/junit_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/logIndex.php b/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/logIndex.php
deleted file mode 100644
index 0b36334..0000000
--- a/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/logIndex.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<html>
-<head>
-<?php
-
-function endsWith( $str, $sub ) {
-
-   return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub );
-}
-
-        $parts = explode("/", getcwd());
-        $parts2 = explode("-", $parts[count($parts) - 1]);
-        $buildName = $parts2[1];
-
-        echo "<title>Test Console Output for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" type="text/css">
-<title>Console Logs from Running JUnit Plug-in Tests</title></head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b> </p>
-
-<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">Console
-      output from running JUnit plugin tests for
-      <?php echo "$buildName"; ?>
-      </font></b></td>
-  </tr>
-</table>
-<table border="0">
-
-<?php
-        $hasNotes = false;
-        $aDirectory = dir(".");
-        $index = 0;
-        while ($anEntry = $aDirectory->read()) {
-                if ($anEntry != "." && $anEntry != ".." && !endsWith(__FILE__, $anEntry)) {
-                        $entries[$index] = $anEntry;
-                        $index++;
-                }
-        }
-        aDirectory.closedir();
-
-
-        sort($entries);
-
-        for ($i = 0; $i < $index; $i++) {
-                $anEntry = $entries[$i];
-                $logsize = filesize("$anEntry");
-
-
-                $level = 0;
-                if ($logsize > 20000) {
-                        $level = 2;
-                }
-                else if ($logsize > 2000) {
-                        $level = 1;
-                }
-
-                if ($level == 0) {
-                        $line = "<td><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-                }
-                else if ($level == 1) {
-                        $line = "<td><em><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-                } else if ($level == 2) {
-                        $line = "<td><strong><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-                }
-
-
-                echo "<tr>";
-                echo "$line";
-                echo "</tr>";
-                $hasNotes = true;
-        }
-
-        if (!$hasNotes) {
-                echo "<br>There are no test logs for this build.";
-        }
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/miscUtil.php b/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/miscUtil.php
deleted file mode 100644
index 966ed48..0000000
--- a/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/miscUtil.php
+++ /dev/null
@@ -1,219 +0,0 @@
-<?php
-
-// todo: unsure if can handle filenames that are URLs?
-// handy constant to compute file size in megabytes
-
-function fileSizeInMegs($filename) {
-	$onemeg=1024*1024;
-	$zipfilesize=filesize($filename);
-	$zipfilesize=round($zipfilesize/$onemeg, 0);
-	return $zipfilesize;
-}
-
-function fileSizeForDisplay($filename) {
-	$onekilo=1024;
-	$onemeg=$onekilo * $onekilo;
-	$criteria = 10 * $onemeg;
-	$scaleChar = "M";
-	if (file_exists($filename)) {
-      	$zipfilesize=filesize($filename);
-      	if ($zipfilesize > $criteria) {
-      		$zipfilesize=round($zipfilesize/$onemeg, 0);
-      		$scaleChar = "M";
-      	}
-      	else {
-      		$zipfilesize=round($zipfilesize/$onekilo, 0);
-      		$scaleChar = "K";
-      	}
-  	} 
-  	else {
-  	   $zipfilesize = 0;
-  	}
-	$result =  "(" . $zipfilesize . $scaleChar . ")";
-	return $result;
-}
-
-
-function displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription) {
-	echo "<td align=\"right\" valign=\"top\" width=\"30%\">";
-	echo "<a href=\"$downloadprefix$filename\">" . $fileShortDescription . "</a>";
-	echo "</td><td align=\"right\" valign=\"top\" width=\"3%\">";
-	echo $zipfilesize;
-	echo "</td>";
-	echo "<td align=\"right\" valign=\"top\" width=\"2%\">";
-	echo "[<a href=\"checksum/$filename.md5\">md5</a>]";
-	echo "</td>";
-}
-
-function resourceExist($url, $mirrorPrefixuri, $prereqfilename, $eclipseFSpathPrefix)
-{
-	$result = false;
-
-	$allowURLopen = ini_get('allow_url_fopen');
-
-	if ($allowURLopen && stream_last_modified($url)) {
-		$result = true;
-	}
-	else {
-		// TODO: for now, we'll do a raw check on the whole file name, since enable_url_open
-		// is off. better would be to check if we are on build.eclipse.org or download.eclipse.org?
-    $wholePath = trim($eclipseFSpathPrefix) . "/" . trim($mirrorPrefixuri) . "/" . trim($prereqfilename);
-    if (file_exists($wholePath)) {
-    	$result = true;
-    }
-	}
-	return $result;
-}
-
-function stream_last_modified($url)
-{
-	if (function_exists('version_compare') && version_compare(phpversion(), '4.3.0') > 0)
-	{
-		if (!($fp = @fopen($url, 'r')))
-		return NULL;
-
-		$meta = stream_get_meta_data($fp);
-		for ($j = 0; isset($meta['wrapper_data'][$j]); $j++)
-		{
-			if (strstr(strtolower($meta['wrapper_data'][$j]), 'last-modified'))
-			{
-				$modtime = substr($meta['wrapper_data'][$j], 15);
-				break;
-			}
-		}
-		fclose($fp);
-	}
-	else
-	{
-		$parts = parse_url($url);
-		$host  = $parts['host'];
-		$path  = $parts['path'];
-
-		if (!($fp = @fsockopen($host, 80)))
-		return NULL;
-
-		$req = "HEAD $path HTTP/1.0\r\nUser-Agent: PHP/".phpversion()."\r\nHost: $host:80\r\nAccept: */*\r\n\r\n";
-		fputs($fp, $req);
-
-		while (!feof($fp))
-		{
-			$str = fgets($fp, 4096);
-			if (strstr(strtolower($str), 'last-modified'))
-			{
-				$modtime = substr($str, 15);
-				break;
-			}
-		}
-		fclose($fp);
-	}
-	return isset($modtime) ? strtotime($modtime) : time();
-}
-
-function isMirrored($uriToCheck) {
-	global $debugScript;
-	global $debugFunctions;
-	$localuri = $uriToCheck;
-
-	$debugMirrorList = false;
-	if ($debugScript) {
-		echo "uriToCheck: " . $localuri . "<br />";
-	}
-
-	$xmlcount = 0;
-
-	/* This method true and accurate method of parsing mirror results
-	 * may be expensive, and would
-	 * likely cause artificially high counts of "downloads".
-	 * Could maybe use if somehow only checked once ever 5 minutes or something.
-
-
-	 // turn off warnings, as sometimes HTML is returned, which causes lots of warnings
-	 $holdLevel = error_reporting(E_ERROR);
-	 $mirrorsxml=simplexml_load_file(rawurlencode($localuri) . urlencode("&format=xml"));
-	 error_reporting($holdLevel);
-
-
-	 if ($mirrorsxml) {
-	 if ($debugFunctions) {
-	 echo "root node: " . $mirrorsxml->getName() . "<br />";
-	 }
-	 if (strcmp($mirrorsxml->getName(), "mirrors") == 0) {
-	 foreach ($mirrorsxml->children() as $mirror) {
-	 if (strcmp($mirror->getName(),"mirror") == 0) {
-	 $xmlcount=$xmlcount+1;
-	 }
-	 if ($debugMirrorList) {
-	 print_r($mirror);
-	 echo "<br />";
-	 }
-	 }
-	 }
-	 if ($debugFunctions) {
-	 echo "Mirror count: " . $xmlcount . "<br />";
-	 }
-	 }
-	 */
-	/*
-	 * Use simple heuristic based on pattern
-	 * in the URI ... if it contains "/downloads/" then assume it's mirrored
-	 */
-	if (strpos($uriToCheck, "webtools/downloads/") > 0) {
-		$xmlcount = 1;
-	}
-	return ($xmlcount > 0);
-
-}
-
-// TODO: replace with Phoenix variables
-function getPlatform () {
-	global $debugScript;
-	global $debugFunctions;
-	// getBrowser is expensive, so cache the data
-	static $browser;
-	$platform = "unknown";
-
-
-	if(ini_get("browscap")) {
-		if(!isset($browser)){
-			$browser = get_browser(null, true);
-		}
-
-		if ($browser) {
-			$rawPlatform = $browser['platform'];
-			if ($debugFunctions) {
-				echo "browser platfrom: " . $rawPlatform . "<br />" ;
-			}
-
-			if ($debugFunctions) {
-				$browserKeys = array_keys($browser);
-				foreach ($browserKeys as $key) {
-					echo $key . ": " . $browser[$key] . "<br />";
-				}
-			}
-		}
-		if (strpos($rawPlatform, "Win") === 0) {
-			$platform="windows";
-		} else if (strpos($rawPlatform, "Linux") === 0) {
-			$platform="linux";
-		} else if (strpos($rawPlatform, "Mac") === 0) {
-			$platform="mac";
-		}
-	}
-	return $platform;
-}
-
-
-function getPrereqReferenceOrName($eclipseMirrorScript, $mirrorPrefixuri, $prerequrl, $prereqfilename, $eclipseFSpathPrefix) {
-	// todo: we really only need "if exists" so could make a bit more efficient
-	// I tried "file_exists" but is didn't seem to work on my test server
-	// For these pre-reqs, we assume if they exist, they are mirrored. This is true
-	// 99% of the time.
-
-	if (resourceExist($prerequrl, $mirrorPrefixuri, $prereqfilename, $eclipseFSpathPrefix)) {
-		$reflink="<a href=\"" . $eclipseMirrorScript . $mirrorPrefixuri . "/" . $prereqfilename . "\">" . $prereqfilename . "</a>";
-	} else {
-		$reflink=$prereqfilename;
-	}
-	return $reflink;
-}
-?>
diff --git a/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/pending.gif b/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/pending.gif
deleted file mode 100644
index 66db2a6..0000000
--- a/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/pending.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/pending1.gif b/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/pending1.gif
deleted file mode 100644
index 1b2ea6e..0000000
--- a/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/pending1.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/report2.php b/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/report2.php
deleted file mode 100644
index 52d2284..0000000
--- a/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/report2.php
+++ /dev/null
@@ -1,45 +0,0 @@
-
-        <?php
-
-function parse_testResults($filename)
-{
-        $junitFailures = 0;
-        if (is_file($filename)) {
-                $handle = @fopen($filename, "r");
-                if ($handle)
-                {
-                        $size = filesize($filename);
-                        $content = fread($handle, $size);
-                        fclose($handle);
-                        $junitStart = strpos($content, "Errors &amp; Failures");
-                        $junitEnd = strpos($content, "</table>", $junitStart);
-                        $junitInfo = substr($content, $junitStart, $junitEnd - $junitStart);
-                        $start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">");
-                        while ($start !== false)
-                        {
-                                $start += 29;
-                                $stop = strpos($junitInfo, "</font></b></td>", $start);
-                                if ($stop !== false)
-                                {
-                                        $result = substr($junitInfo, $start, $stop - $start);
-                                        if (is_numeric($result))
-                                        {
-                                                $junitFailures += $result;
-                                        }
-                                        else if (strcmp($result, "DNF") == 0)
-                                        {
-                                                $junitFailures++;
-                                        }
-                                }
-                                $start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">", $stop);
-                        }
-                        $results = array($junitFailures);
-                        return $results;
-                }
-        }
-}
-
-
-?>
-
-
diff --git a/releng.wtpbuilder/distribution/wtpjee.site/templateFiles/compileResults.php.template b/releng.wtpbuilder/distribution/wtpjee.site/templateFiles/compileResults.php.template
deleted file mode 100644
index f785771..0000000
--- a/releng.wtpbuilder/distribution/wtpjee.site/templateFiles/compileResults.php.template
+++ /dev/null
@@ -1,76 +0,0 @@
-<html>
-<head>
-
-<?php
-        $parts = explode("/", getcwd());
-        $parts2 = explode("-", $parts[count($parts) - 1]);
-        $buildName = $parts2[1];
-
-        echo "<title>Compile Logs: Code Bundles for $buildName</title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2%;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-}
-</style>
-</head>
-<body>
-
-<?php
-        echo "<h1>Compile Logs: Code Bundles for $buildName</h1>";
-?>
-
-
-<table id=tabledata align = "center" width="75%" border="1">
-  <tr>
-    <td class="bold" align="center">Compile Logs</td>
-    <td class="bold" align="center">Compile Errors</td>
-    <td class="bold" align="center">Compiler Warnings</td>
-    <td class="bold" align="center">Access Violations</td>
-    <td class="bold" align="center">Access Warnings</td>
-  </tr>
-
-  %compilelogs%
-
-</table>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/wtpjee.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/wtpjee.site/templateFiles/index.html.template.php
deleted file mode 100644
index 7fa5f34..0000000
--- a/releng.wtpbuilder/distribution/wtpjee.site/templateFiles/index.html.template.php
+++ /dev/null
@@ -1,614 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<title>WTP Incubator Downloads</title>
-
-
-<?php
-
-$buildBranch="@buildBranch@";
-$build="@build@";
-$type="@type@";
-$builddate="@date@";
-
-$eclipseMirrorPrefixuri="@eclipse.mirror.prefixuri@";
-$eclipseFSpathPrefix="@eclipse.fspath.prefix@";
-
-$eclipsefilelinux="@eclipsefilelinux@";
-$eclipsefilewindows="@eclipsefilewindows@";
-$eclipsefilemacosx="@eclipsefilemacos@";
-
-$eclipseURL="@eclipseURL@";
-$eclipseFile="@eclipseFile@";
-$eclipseBuildURL="@eclipseBuildURL@";
-$eclipseBuildHome="@eclipseBuildHome@";
-$testURL="@testURL@";
-$testFile="@testFile@";
-
-$wstURL="@wstURL@";
-$wstFile="@wstFile@";
-$wstMirrorPrefixuri="@wst.mirror.prefixuri@";
-$wstBuildHome="@wstBuildHome@";
-
-$jstURL="@jstURL@";
-$jstFile="@jstFile@";
-$jstMirrorPrefixuri="@jst.mirror.prefixuri@";
-$jstBuildHome="@jstBuildHome@";
-
-$wtpURL="@wtpURL@";
-$wtpFile="@wtpFile@";
-$wtpMirrorPrefixuri="@wtp.mirror.prefixuri@";
-$wtpBuildHome="@wtpBuildHome@";
-
-$gefURL="@gefURL@";
-$gefFile="@gefFile@";
-$gefMirrorPrefixuri="@gef.mirror.prefixuri@";
-$gefBuildHome="@gefBuildHome@";
-
-$emfURL="@emfURL@";
-$emfFile="@emfFile@";
-$emfMirrorPrefixuri="@emf.mirror.prefixuri@";
-$emfBuildHome="@emfBuildHome@";
-$emfName="@emfName@";
-$emfDescription="@emfDescription@";
-
-$emfsourceURL="@emfsourceURL@";
-$emfsourceFile="@emfsourceFile@";
-$emfsourceMirrorPrefixuri="@emfsource.mirror.prefixuri@";
-$emfsourceBuildHome="@emfsourceBuildHome@";
-$emfsourceName="@emfsourceName@";
-$emfsourceDescription="@emfsourceDescription@";
-
-
-$emfxsdURL="@emfxsdURL@";
-$emfxsdFile="@emfxsdFile@";
-$emfxsdMirrorPrefixuri="@emfxsd.mirror.prefixuri@";
-$emfxsdBuildHome="@emfxsdBuildHome@";
-$emfxsdName="@emfxsdName@";
-$emfxsdDescription="@emfxsdDescription@";
-
-$emfxsdsourceURL="@emfxsdsourceURL@";
-$emfxsdsourceFile="@emfxsdsourceFile@";
-$emfxsdsourceMirrorPrefixuri="@emfxsdsource.mirror.prefixuri@";
-$emfxsdsourceBuildHome="@emfxsdsourceBuildHome@";
-$emfxsdsourceName="@emfxsdsourceName@";
-$emfxsdsourceDescription="@emfxsdsourceDescription@";
-
-
-$dtpURL="@dtpURL@";
-$dtpFile="@dtpFile@";
-$dtpMirrorPrefixuri="@dtp.mirror.prefixuri@";
-$dtpBuildHome="@dtpBuildHome@";
-
-
-$eclipserelengFile="@eclipserelengFile@";
-$eclipserelengURL="@eclipserelengURL@";
-$orbitthirdpartyzipFile="@orbitthirdpartyzipFile@";
-$orbitthirdpartyzipURL="@orbitthirdpartyzipURL@";
-$orbitthirdpartyzipBuildHome="@orbitthirdpartyzipBuildHome@";
-$orbitthirdpartyzipMirrorPrefixuri="@orbitthirdpartyzip.mirror.prefixuri@";
-
-$incubating = false;
-
-
-include("miscUtil.php");
-
-
-
-ini_set("display_errors", "true");
-error_reporting (E_ALL);
-
-
-$debugScript = false;
-$debugFunctions = false;
-
-$defaultMirrorScript="";
-$defaultWTPMirrorPrefix="./";
-
-$eclipseMirrorScript="http://www.eclipse.org/downloads/download.php?file=";
-
-// TODO: improve so this hard coding isn't required.
-// This depends on the declare script changing webtools/committers to webtools/downloads
-// And, the logic is such that if it is not mirrored, this URI is not used at all, just
-// a relative reference only
-$eclipseWTPMirrorPrefix="/webtools/committers/drops/$buildBranch/$build/";
-
-
-$mirrorScript=$defaultMirrorScript;
-$downloadprefix=$defaultWTPMirrorPrefix;
-
-
-$keytestMirrorString=$eclipseMirrorScript . "$eclipseWTPMirrorPrefix/wtpjee-sdk-$build.zip";
-if (isMirrored($keytestMirrorString) ) {
-        $mirrorScript=$eclipseMirrorScript;
-        $downloadprefix="${mirrorScript}${eclipseWTPMirrorPrefix}";
-}
-
-if ($debugScript)  {
-        echo "inferred platform: " . getPlatform();
-}
-
-
-// our summary results handling requires php 5 (for simple xml file loading)
-// so, if not php 5, just don't display any summary results
-// This was found to be required, since some mirror our whole site (e.g. IBM)
-// and not all mirrors use PHP 5
-$displayTestSummary=false;
-if (phpversion() >= 5) {
-
-        $code_totalBundles=0;
-        $code_totalErrors=0;
-        $code_totalWarnings=0;
-        $code_totalforbiddenAccessWarningCount=0;
-        $code_totaldiscouragedAccessWarningCount=0;
-        
-        $test_totalBundles=0;
-        $test_totalErrors=0;
-        $test_totalWarnings=0;
-        $test_totalforbiddenAccessWarningCount=0;
-        $test_totaldiscouragedAccessWarningCount=0;
-
-
-        $displayTestSummary=true;
-        // expecting grandTotalErrors and grandTotalTests
-        $filename = "unitTestsSummary.xml";
-        if (file_exists($filename)) {
-                $prefix = "unitTests_";
-                $unitTestsSummary = simplexml_load_file($filename);
-                foreach ($unitTestsSummary->summaryItem as $summaryItem) {
-                        $name = $summaryItem->name;
-                        $value = $summaryItem->value;
-                        $code= "\$" . $prefix . $name . " = " . $value . ";";
-                        //echo "<br />code: " . $code;
-                        eval($code);
-                }
-        }
-
-        $filename = "compilelogsSummary.xml";
-        if (file_exists($filename)) {
-          $prefix = "code_";
-          $compileSummary = simplexml_load_file($filename);
-          foreach ($compileSummary->summaryItem as $summaryItem) {
-                  $name = $summaryItem->name;
-                  $value = $summaryItem->value;
-                  $code= "\$" . $prefix . $name . " = " . $value . ";";
-                  //echo "<br />code: " . $code;
-                  eval($code);
-          }
-        }
-
-        $filename = "testcompilelogsSummary.xml";
-        if (file_exists($filename)) {
-          $prefix = "test_";
-          $compileSummary = simplexml_load_file($filename);
-          foreach ($compileSummary->summaryItem as $summaryItem) {
-                  $name = $summaryItem->name;
-                  $value = $summaryItem->value;
-                  $code= "\$" . $prefix . $name . " = " . $value . ";";
-                  //echo "<br />code: " . $code;
-                  eval($code);
-          }
-        }
-}
-
-
-?>
-
-
-</head>
-
-<body>
-
-
-<?php
-
-// tiny banner to remind when looking at "local" machine results
-$serverName = $_SERVER["SERVER_NAME"];
-
-if (!stristr($serverName, "eclipse.org") && !stristr($serverName,"you.are.at.eclipsecon.org")) {
-        echo '<center>
-          <p>
-          Reminder: this is <font color="#FF0000">' .
-        $serverName .
-        '</font>
-          See also
-          <a href="http://download.eclipse.org/webtools/downloads" target="_top">the live public Eclipse site</a>.
-          </p>
-          <hr />
-          </center>';
-
-}
-?>
-
-<?php if ($incubating) { ?>
-<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH="100%">
-        <tr>
-                <td ALIGN=left><font face="'Bitstream Vera',Helvetica,Arial" size="+2"><b><?php echo "$type";?>
-                Build: <?php echo "$build";?></b></font></td>
-           <td align="right" rowspan="3"><a
-  href="http://www.eclipse.org/projects/what-is-incubation.php"><img
-  src="http://www.eclipse.org/images/egg-incubation.png" alt="Incubation"
-  align="middle" border="0"></a></td>
-
-        <tr valign="top">
-                <td><font size="-1"><?php echo "$builddate";?></font></td>
-        </tr>
-        <tr valign="top">
-                <td>
-                <p>The Eclipse Web Tools Platform (WTP) Incubator Project provides
-                tools for development that are just getting started, or are
-                experimental in some fashion.</p>
-                </td>
-        </tr>
-</table>
-
-<?php } else { ?>
-
-<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH="100%">
-        <tr>
-                <td ALIGN=left><font face="'Bitstream Vera',Helvetica,Arial" size="+2"><b><?php echo "$type";?>
-                Build: <?php echo "$build";?></b></font></td>
-           
-
-        <tr valign="top">
-                <td><font size="-1"><?php echo "$builddate";?></font></td>
-        </tr>
-        <tr valign="top">
-                <td>
-                <p>Component build from the Eclipse Web Tools Platform (WTP) Project.</p>
-                </td>
-        </tr>
-</table>
-
-<?php } ?>
-
-<!-- ***********  Prerequisites **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-        <tr>
-                <td align="left" valign="top" bgcolor="#0080C0"><font
-                        face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Prerequisites and Handy Extras</font></td>
-        </tr>
-        <tr>
-                <td>
-                <p>These are the prerequisites to build or run these packages. 
-                Also listed are some frequently needed links for
-                committer-required packages when creating new development
-                environments, or targets to run against.</p>
-                <p>Note that WTP requires Java 5 or higher (and, for some things,
-                actually requires a JDK rather than only a JRE) even though many other
-                <a href="http://www.eclipse.org/downloads/">Eclipse Projects</a> can
-                run with <a href="http://www.eclipse.org/downloads/moreinfo/jre.php">other
-                JRE levels</a>.</p><p></p>
-                </td>
-        </tr>
-        <tr>
-                <td>
-                <table border=0 cellspacing=1 cellpadding=1 width="90%" align="center">
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td width="40%">Eclipse Platform (Platform, JDT)</td>
-                                <?php
-                                //customize page depending on user's browser/platform, if we can detect it
-                                $usersPlatform = getPlatform();
-                                // assume windows by default, since likely most frequent, even for cases where
-                                // platform is "unknown". I've noticed Opera reports 'unknown' :(
-                                $recommendedFile=$eclipsefilewindows;
-                                if (strcmp($usersPlatform,"linux")== 0) {
-                                        $recommendedFile=$eclipsefilelinux;
-                                } else if (strcmp($usersPlatform,"mac") == 0) {
-                                        $recommendedFile=$eclipsefilemacosx;
-                                }
-                                ?>
-                                <td align="right"><?php
-                                echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
-                                echo " or <a href=\"" . $eclipseBuildURL . "\">appropriate platform</a>";
-                                echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-                                ?>
-
-                        </tr>
-
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td>
-                                <?php 
-                                echo $emfName . "&nbsp;" . $emfDescription ; 
-                                ?>
-                                </td>
-                                <td align="right"><?php
-                                echo getPrereqReferenceOrName($eclipseMirrorScript, $emfMirrorPrefixuri, $emfURL, $emfFile, $eclipseFSpathPrefix);
-                                echo " or <a href=\"" . $emfBuildHome . "\">equivalent</a></td>";
-                                ?>
-                        </tr>
-
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td>
-                                <?php 
-                                echo $emfxsdName . "&nbsp;" . $emfxsdDescription ; 
-                                ?>
-                                </td>
-                                <td align="right"><?php
-                                echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdMirrorPrefixuri, $emfxsdURL, $emfxsdFile, $eclipseFSpathPrefix);
-                                echo " or <a href=\"" . $emfxsdBuildHome . "\">equivalent</a></td>";
-                                ?>
-                        </tr>
-
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td>Graphical Editing Framework (GEF)</td>
-                                <td align="right"><?php
-                                echo getPrereqReferenceOrName($eclipseMirrorScript, $gefMirrorPrefixuri, $gefURL, $gefFile, $eclipseFSpathPrefix);
-                                echo " or <a href=\"" . $gefBuildHome . "\">equivalent</a></td>";
-                                ?>
-
-                        </tr>
-
-                        <tr valign="middle">
-                                <td width="10%"></td>
-                                <td colspan="2">
-                                <hr />
-                                </td>
-                        </tr>
-
-
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td>Web Tools Platform portion</td>
-                                <td align="right"><?php
-                                // debug
-                                // echo "debug: full path: " . $eclipseFSpathPrefix . "/" . $wstMirrorPrefixuri . "/" . $wstFile;
-                                
-                                echo getPrereqReferenceOrName($eclipseMirrorScript, $MirrorPrefixuri, $URL, $File, $eclipseFSpathPrefix);
-                                echo " or <a href=\"" . $BuildHome . "\">equivalent</a></td>";
-                                ?>
-
-                        </tr>
-                        <tr valign="middle">
-                                <td width="10%"></td>
-                                <td colspan="2">
-                                <hr />
-                                </td>
-                        </tr>
-
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td>Eclipse Test Framework (required only for Automated JUnit tests)</td>
-                                <td align="right"><?php
-                                echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $testURL, $testFile, $eclipseFSpathPrefix);
-                                echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-                                ?>
-
-                        </tr>
-
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td>Eclipse releng tool (required only for committers to more easily
-                                "release" code to a build)</td>
-                                <td align="right"><?php
-                                echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipserelengURL, $eclipserelengFile, $eclipseFSpathPrefix);
-                                echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-                                ?>
-
-                        </tr>
-
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td>Third Party code from Orbit (currently much more than needed
-                                for WTP, but some committers like having the whole heap in their
-                                target)</td>
-                                <td align="right"><?php
-                                echo getPrereqReferenceOrName($eclipseMirrorScript, $orbitthirdpartyzipMirrorPrefixuri, $orbitthirdpartyzipURL, $orbitthirdpartyzipFile,$eclipseFSpathPrefix);
-                                echo " or <a href=\"" . $orbitthirdpartyzipBuildHome . "\">equivalent</a></td>";
-                                ?>
-
-                        </tr>
-
-                </table>
-                </td>
-        </tr>
-</table>
-
-<!-- ***********  WTP **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-        <tr>
-                <td align=left valign=top colspan="5" bgcolor="#0080C0"><font
-                        face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF"> Web Tools Platform 
-               Components</font></td>
-        </tr>
-
-        <tr>
-                <td align="left" valign="top" colspan="5">
-                <p>The Zip file contains productized Java EE Developer Tools</p>
-                </td>
-        </tr>
-        <tr>
-                <td>
-                <table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
-
-
-                        <tr>
-                                <td align="left" valign="top" width="10%"><b>Minimal</b></td>
-                                <td align="left" valign="top">
-                                <p>Executable code only.</p>
-                                </td>
-                                <?php
-                                $zipfilename="wtpjee-${build}";
-                                $filename=$zipfilename.".zip";
-                                $zipfilesize=fileSizeForDisplay($filename);
-                                $fileShortDescription="wtpjee";
-                                displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-                                ?>
-                        </tr>
-
-                        <tr>
-                                <td align="left" valign="top" width="10%"><b>SDK</b></td>
-                                <td align="left" valign="top">
-                                <p>Executable code and source code.</p>
-                                </td>
-                                <?php
-                                $zipfilename="wtpjee-sdk-${build}";
-                                $filename=$zipfilename.".zip";
-                                $zipfilesize=fileSizeForDisplay($filename);
-                                $fileShortDescription="wtpjee sdk";
-                                displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-                                ?>
-                        </tr>
-                        <tr>
-                                <td align="left" valign="top" width="10%"><b>Tests</b></td>
-                                <td align="left" valign="top">
-                                <p>Unit tests.</p>
-                                </td>
-                                <?php
-                                $zipfilename="wtpjee-tests-${build}";
-                                $filename=$zipfilename.".zip";
-                                $zipfilesize=fileSizeForDisplay($filename);
-                                $fileShortDescription="wtpjee tests";
-                                displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-                                ?>
-                        </tr>
-                </table>
-                </td>
-
-
-        <tr>
-
-</table>
-
-
-
-
-
-
-
-<!-- ***********  Build Status **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-        <tr>
-                <td align=left valign=top bgcolor="#0080C0"><font
-                        face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Status, tests
-                and other interesting details</font></td>
-        </tr>
-        <tr>
-                <td>
-                <table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
-
-                        <tr>
-                                <td><a href="buildNotes.php">Build notes</a> <br />
-                                <a href="directory.txt">map files</a> <br />
-                                <?php
-
-                                if ($displayTestSummary) {
-
-
-                                        if (isset($unitTests_grandTotalErrors)) {
-                                                $errorColor="green";
-                                                if ($unitTests_grandTotalErrors > 0) {
-                                                        $errorColor="red";
-                                                }
-                                                echo "<a href=\"testResults.php\">Unit test results</a>&nbsp;";
-                                                echo "<img src=\"junit_err.gif\"/><font color=\"" . $errorColor . "\">" . $unitTests_grandTotalErrors . "</font>&nbsp;&nbsp;Total: " . $unitTests_grandTotalTests;
-                                        }
-                                        else {
-                                               // we hardly ever "pend" anymore ... abscense usually signifies no tests or a build error.  
-                                               echo "<br /><font color=\"orange\">Unit tests don't exists, are pending, or there's a build error.</font>";
-                                               //&nbsp;&nbsp;<img src=\"pending.gif\"/>";
-                                        }
-
-                                        echo "<br />";
-                                        echo "<a href=\"compileResults.php\">Compile logs: Code Bundles</a>";
-
-                                        echo "&nbsp;&nbsp;($code_totalBundles)&nbsp;&nbsp;";
-                                        echo "<img src=\"compile_err.gif\"/><font color=red>$code_totalErrors</font>&nbsp;";
-                                        echo "<img src=\"compile_warn.gif\"/><font color=orange>$code_totalWarnings</font>&nbsp;";
-                                        echo "<img src=\"access_err.gif\"/><font color=red>$code_totalforbiddenAccessWarningCount</font>&nbsp;";
-                                        echo "<img src=\"access_warn.gif\"/><font color=orange>$code_totaldiscouragedAccessWarningCount</font>&nbsp;";
-
-                                        echo "<br />";
-                                        echo "<a href=\"testCompileResults.php\">Compile logs: Test Bundles</a>";
-
-                                        echo "&nbsp;&nbsp;($test_totalBundles)&nbsp;&nbsp;";
-                                        echo "<img src=\"compile_err.gif\"/><font color=red>$test_totalErrors</font>&nbsp;";
-                                        echo "<img src=\"compile_warn.gif\"/><font color=orange>$test_totalWarnings</font>&nbsp;";
-                                        echo "<img src=\"access_err.gif\"/><font color=red>$test_totalforbiddenAccessWarningCount</font>&nbsp;";
-                                        echo "<img src=\"access_warn.gif\"/><font color=orange>$test_totaldiscouragedAccessWarningCount</font>&nbsp;";
-                                }
-
-                                ?> <br />
-
-                                <?php
-                                if (file_exists("versioningReportName.php")) {
-                                        include "versioningReportName.php";
-                                        $fname="${versionReportFilename}.html";
-                                        if (file_exists($fname)) {
-                                                echo "<br /> <a href='$fname'>Versioning Information</a>";
-                                        }
-}
-?> <?php
-echo "<br />";
-if (file_exists("./apiresults/api-progress.html"))
-{
-        echo "<br /> <a href=\"apiresults/api-progress.html\">API Progress Report</a>";
-}
-if (file_exists("./apiresults/api-info-summary.html"))
-{
-        echo "<br /> <a href=\"apiresults/api-info-summary.html\">APIs Defined by Each Component</a>";
-}
-if (file_exists("./apiresults/api-ref-compatibility.html"))
-{
-        echo "<br /> <a href=\"apiresults/api-ref-compatibility.html\">Adopter Breakage Report</a>";
-}
-if (file_exists("./apiresults/api-violation-summary.html"))
-{
-        echo "<br /> <a href=\"apiresults/api-violation-summary.html\">API Violations</a>";
-}
-if (file_exists("./apiresults/component-api-violation-all.html"))
-{
-        echo "<br /> <a href=\"apiresults/component-api-violation-all.html\">Non-API dependencies</a>";
-}
-if (file_exists("./apiresults/api-tc-summary.html"))
-{
-        echo "<br /> <a href=\"apiresults/api-tc-summary.html\">API Test Coverage</a>";
-}
-if (file_exists("./apiresults/api-javadoc-summary.html"))
-{
-        echo "<br /> <a href=\"apiresults/api-javadoc-summary.html\">API Javadoc Coverage</a>";
-}
-if (file_exists("./apiresults/api-tc-summary.html"))
-{
-        echo "<br /><br /> <a href=\"apiresults/full_test_coverage/api-tc-summary.html\">Test Coverage for All Classes and Methods</a>";
-}
-?> <?php
-if (file_exists("./perfresults/graph/performance.php"))
-{
-        echo "<br />";
-        echo "<br /> <a href=\"perfresults/graph/performance.php\">Performance Results</a>";
-        echo "<br />";
-}
-?></td>
-                        </tr>
-
-
-                </table>
-                </td>
-        </tr>
-</table>
-
-
-
-<!-- footer -->
-<center>
-<hr>
-<p>All downloads are provided under the terms and conditions of the <a
-        href="http://www.eclipse.org/legal/notice.html">Eclipse.org Software
-User Agreement</a> unless otherwise specified.</p>
-
-<p>If you have problems downloading the drops, contact the <font
-        face="'Bitstream Vera',Helvetica,Arial" size="-1"><a
-        href="mailto:webmaster@eclipse.org">webmaster</a></font>.</p>
-
-</center>
-<!-- end footer -->
-
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/wtpjee.site/templateFiles/siteEnablingFeatures.xml b/releng.wtpbuilder/distribution/wtpjee.site/templateFiles/siteEnablingFeatures.xml
deleted file mode 100644
index cc3ed81..0000000
--- a/releng.wtpbuilder/distribution/wtpjee.site/templateFiles/siteEnablingFeatures.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-    <description> The update site contains the enabling features. </description>
-    <category-def
-        name="Enabling Features"
-        label="Enabling Features">
-        <description> This category contains features used by several
-            projects that enable some functionality, but which by
-            themselves are not very interesting. </description>
-    </category-def>
-</site>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtpjee.site/templateFiles/siteWTP.xml b/releng.wtpbuilder/distribution/wtpjee.site/templateFiles/siteWTP.xml
deleted file mode 100644
index f94e83f..0000000
--- a/releng.wtpbuilder/distribution/wtpjee.site/templateFiles/siteWTP.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site
-    pack200="true"
-    mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/webtools/testUpdates/site.xml&amp;format=xml"
-    digestURL="http://download.eclipse.org/webtools/testUpdates/">
-    <description
-        url="http://download.eclipse.org/webtools/declaredUpdates/index.html"> The update site contains the features of the of Eclipse Web
-        Tools Project (WTP) </description>
-    <feature
-        url="features/org.eclipse.wst_@org.eclipse.wst@.jar"
-        id="org.eclipse.wst"
-        version="@org.eclipse.wst@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.wst.sdk_@org.eclipse.wst.sdk@.jar"
-        id="org.eclipse.wst.sdk"
-        version="@org.eclipse.wst.sdk@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jst_@org.eclipse.jst@.jar"
-        id="org.eclipse.jst"
-        version="@org.eclipse.jst@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jst.sdk_@org.eclipse.jst.sdk@.jar"
-        id="org.eclipse.jst.sdk"
-        version="@org.eclipse.jst.sdk@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jpt.feature_@org.eclipse.jpt.feature@.jar"
-        id="org.eclipse.jpt.feature"
-        version="@org.eclipse.jpt.feature@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jpt_sdk.feature_@org.eclipse.jpt_sdk.feature@.jar"
-        id="org.eclipse.jpt_sdk.feature"
-        version="@org.eclipse.jpt_sdk.feature@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <category-def
-        name="Web Tools Platform (WTP)"
-        label="Web Tools Platform (WTP)">
-        <description> This category contains the features of the Eclipse
-            Web Tools Project (WTP). </description>
-    </category-def>
-</site>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtpjee.site/templateFiles/testCompileResults.php.template b/releng.wtpbuilder/distribution/wtpjee.site/templateFiles/testCompileResults.php.template
deleted file mode 100644
index 42d6f65..0000000
--- a/releng.wtpbuilder/distribution/wtpjee.site/templateFiles/testCompileResults.php.template
+++ /dev/null
@@ -1,76 +0,0 @@
-<html>
-<head>
-
-<?php
-        $parts = explode("/", getcwd());
-        $parts2 = explode("-", $parts[count($parts) - 1]);
-        $buildName = $parts2[1];
-
-        echo "<title>Compile Logs: Test Bundles for $buildName</title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2em;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:Bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-}
-</style>
-</head>
-<body>
-
-<?php
-        echo "<h1>Compile Logs: Test Bundles for $buildName</h1>";
-?>
-
-
-<table id=tabledata align = "center" width="75%" border="1">
-  <tr>
-    <td class="bold" align="center">Compile Logs</td>
-    <td class="bold" align="center">Compile Errors</td>
-    <td class="bold" align="center">Compiler Warnings</td>
-    <td class="bold" align="center">Access Violations</td>
-    <td class="bold" align="center">Access Warnings</td>
-  </tr>
-
-  %compilelogs%
-
-</table>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/wtpjee.site/templateFiles/testResults.php.template b/releng.wtpbuilder/distribution/wtpjee.site/templateFiles/testResults.php.template
deleted file mode 100644
index ddad0b7..0000000
--- a/releng.wtpbuilder/distribution/wtpjee.site/templateFiles/testResults.php.template
+++ /dev/null
@@ -1,119 +0,0 @@
-<html>
-<head>
-
-<?php
-	$parts = explode("/", getcwd());
-	$parts2 = explode("-", $parts[count($parts) - 1]);
-	$buildName = $parts2[1];
-	
-	echo "<title>Test Results for $buildName </title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2em;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:Bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-
-}
-</style>
-
-
-</head>
-<body>
-<p><b><font face="Verdana" size="+3">Test Results</font></b> </p>
-
-<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">
-    Unit Test Results for <?php echo "$buildName"; ?> on Various Platforms and JRE</font></b></td>
-  </tr>
-</table>
-
-<?php
-if (file_exists("testResults"))
-{
-$dir = dir("testResults");
-while ($anEntry = $dir->read())
-{
-  if ($anEntry != "." && $anEntry != ".." && $anEntry != "consolelogs" && $anEntry != "html" && $anEntry != "xml")
-  {
-    $link = "testResults/".$anEntry."/results/index.php";
-    echo "<p><a href=\"$link\">$anEntry</a></p>";
-  }
-}
-}
-?>
-
-<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">Unit 
-      Test Results for <?php echo "$buildName"; ?> </font></b></td>
-  </tr>
-</table>
-
-<table id=tableunittestdata align = "center" width="75%" border="1">
-  <tr> 
-    <td class="bold" align="center" width="70%">Test Suite</td>
-    <td class="bold" align="center" width="10%">Errors &amp; Failures</td>
-    <td class="bold" align="center" width="10%">Total Tests</td>
-    <td class="bold" align="center" width="10%">Total Time (s)</td>
-  </tr>
-  
-  
-  %testresults%
-  
-</table>
-<p></p>
-<br>
-<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"> 
-      Console output logs 
-      <?php echo "$buildName"; ?>
-      </font></b></td>
-  </tr>
-</table>
-<br>
-These <a href="consoleLogs.php">logs</a> contain the console output captured while 
-running the JUnit automated tests. <br>
-<br>
-
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/wtpjee.site/transformReportToHTML.xml b/releng.wtpbuilder/distribution/wtpjee.site/transformReportToHTML.xml
deleted file mode 100644
index 3e9f35b..0000000
--- a/releng.wtpbuilder/distribution/wtpjee.site/transformReportToHTML.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-    name="xsl-conversion"
-    default="main"
-    basedir=".">
-    <target
-        name="main"
-        description="example.@dot.xml to produce example.@dot.html">
-      <xslt
-          destdir="${resultDir}/compilelogs"
-          scanincludeddirectories="true"
-          style="compilerXMLOutputToHTML.xsl"
-          force="true" >
-            <fileset dir="${resultDir}/compilelogs" includes="**/*.xml" />
-      </xslt>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/xml.build/build.xml b/releng.wtpbuilder/distribution/xml.build/build.xml
deleted file mode 100644
index 0277729..0000000
--- a/releng.wtpbuilder/distribution/xml.build/build.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<project
-    default="build"
-    basedir=".">
-    <fail
-        unless="wtp.builder.home"/>
-    <property
-        file="${wtp.builder.home}/build.properties"/>
-    <target
-        name="build"
-        depends="getBaseBuilder">
-        <dirname
-            file="${ant.file}"
-            property="distribution.wtp.build.dir"/>
-        <property
-            name="buildTargets"
-            value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
-        <!--
-            for this distribution, dependencies come from project's
-            releng map project
-        -->
-        <property
-            name="dependency.properties"
-            value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-
-        <!-- calling label.xml to createg label.properties file -->
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-        <echo
-            level="info"
-            message="invoking buildTargets: ${buildTargets} to build for each component"/>
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="xml"/>
-        </ant>
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="xml_sdk"/>
-        </ant>
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="xml_tests"/>
-            <property
-                name="eclipseBuildFailOnError"
-                value="false"/>
-        </ant>
-
-        <!-- package -->
-        <antcall
-            target="package"/>
-    </target>
-
-    <!-- invoking runbuild.xml targetting getBaseBuilder -->
-    <target
-        name="getBaseBuilder"
-        if="eclipse.builder.fetch">
-        <dirname
-            file="${ant.file}"
-            property="wtbuilder.dir"/>
-        <property
-            name="buildTargets"
-            value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
-        <echo
-            level="info"
-            message="invoking buildTargets: ${buildTargets} -> getBaseBuilder"/>
-        <ant
-            antfile="${buildTargets}"
-            target="getBaseBuilder"/>
-    </target>
-    <target
-        name="package">
-        <!--
-            post, post packaging, for WTP ... "manually" assemble the
-            desired zips
-        -->
-        <!-- nothing to assemble right now -->
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/xml.site/build.xml b/releng.wtpbuilder/distribution/xml.site/build.xml
deleted file mode 100644
index 39fc90e..0000000
--- a/releng.wtpbuilder/distribution/xml.site/build.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-<project
-    name="Build specific targets and properties"
-    default="build"
-    basedir=".">
-    <!--
-        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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- = = = end standard properties pattern = = = -->
-    <echo
-        message="ant.file: ${ant.file}"/>
-    <target
-        name="build">
-    	<mkdir dir="${buildDirectory}/${buildLabel} "/>
-        <java
-            jar="${eclipse.launcher}"
-            fork="true"
-            failonerror="true">
-            <jvmarg
-                value="-Dosgi.ws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dosgi.os=${env.BASEOS}"/>
-            <jvmarg
-                value="-Dosgi.arch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-Dbuild.donottagmaps=${build.donottagmaps}"/>
-            <jvmarg
-                value="-DbuildBranch=${buildBranch}"/>
-            <jvmarg
-                value="-DbuildType=${buildType}"/>
-            <jvmarg
-                value="-DbuildId=${buildId}"/>
-            <jvmarg
-                value="-DmapVersionTag=${mapVersionTag}"/>
-            <jvmarg
-                value="-Dbuild.distribution=${build.distribution}"/>
-            <jvmarg
-                value="-DbuildDirectory=${buildDirectory}"/>
-            <jvmarg
-                value="-Dwtp.builder.home=${wtp.builder.home}"/>
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <jvmarg
-                value="-Dprojectname=${projectname}"/>
-            <jvmarg
-                value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
-            <jvmarg
-                value="-DurlLogLocation=${buildDirectory}/${buildLabel}/outgoinghttplogfromsitebuild.log"/>
-            <arg
-                value="-data"/>
-            <arg
-                value="${basedir}/workspace"/>
-            <arg
-                value="-application"/>
-            <arg
-                value="org.eclipse.ant.core.antRunner"/>
-            <arg
-                value="-buildfile"/>
-            <arg
-                value="${ant.file}"/>
-            <arg
-                value="publish"/>
-        </java>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Steps to do to publish the build results -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="publish">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-        <property
-            file="${buildDirectory}/label.properties"/>
-        <property
-            name="publish.xml"
-            value="${component.dir}/publish.xml"/>
-        <property
-            name="indexFileName"
-            value="index.php"/>
-        <property
-            name="result"
-            value="${buildDirectory}/${buildLabel}"/>
-        <property
-            name="indexTemplateFilename"
-            value="index.html.template.php"/>
-        <copy
-            file="${wtp.builder.home}/distribution/wtp.site/templateFiles/${indexTemplateFilename}"
-            tofile="${buildDirectory}/${indexFileName}"/>
-        <condition
-            property="isBuildTested"
-            value="true">
-            <available
-                file="${buildDirectory}/${buildLabel}/testResults/html"/>
-        </condition>
-        <ant
-            antfile="${publish.xml}"
-            dir="${component.dir}">
-            <property
-                name="dropTokenList"
-                value="%wtpruntime%,%wtpsdk%,%wtptest%,%wst%,%wst-sdk%,%wst-tests%,%jst-tests%,%wst-perf-tests%,%jst-perf-tests%,%jpt-runtime%,%jpt-sdk%,%jpt-tests%"/>
-            <property
-                name="webtoolsDownloadURL"
-                value="http://www.eclipse.org/downloads/download.php?file=/webtools/committers/drops"/>
-            <property
-                name="buildBranch"
-                value="${buildBranch}"/>
-            <property
-                name="isBuildTested"
-                value="${isBuildTested}"/>
-            <property
-                name="indexTemplateFilename"
-                value="${indexTemplateFilename}"/>
-        </ant>
-
-        <!--  Get the build map over for the results to point to. -->
-        <copy
-            file="${buildDirectory}/directory.txt"
-            tofile="${result}/directory.txt"/>
-
-        <!-- Copy info for build identification -->
-        <copy
-            file="${buildDirectory}/buildmachineinfo.properties"
-            tofile="${result}/buildmachineinfo.properties"/>
-
-        <!-- http access logs -->
-        <copy
-            todir="${result}/"
-            failonerror="false">
-            <fileset
-                dir="${buildDirectory}"
-                includes="*.log"/>
-        </copy>
-
-        <!-- ant build log, from control directory -->
-        <copy
-            todir="${result}/"
-            failonerror="false">
-            <fileset
-                dir="${env.ANT_WORKING}/${projectname}"
-                includes="antBuilderOutput.log"/>
-        </copy>
-
-
-
-        <!-- final count files -->
-        <countBuildFiles
-            sourceDirectory="${buildDirectory}/${buildLabel}"
-            filterString=".zip,.tar.gz"
-            outputFile="${buildDirectory}/${buildLabel}/files.count"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/xml.site/compilerXMLOutputToHTML.xsl b/releng.wtpbuilder/distribution/xml.site/compilerXMLOutputToHTML.xsl
deleted file mode 100644
index ffc7905..0000000
--- a/releng.wtpbuilder/distribution/xml.site/compilerXMLOutputToHTML.xsl
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet
-    version="1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-    <xsl:output
-        method="html"
-        indent="yes"/>
-    <xsl:template
-        match="/">
-        <html>
-            <body>
-                <xsl:apply-templates
-                    select="compiler"/>
-            </body>
-        </html>
-    </xsl:template>
-    <xsl:template
-        match="compiler">
-        <h2>Compiler Report</h2>
-        <p>
-            Compiler:
-            <xsl:value-of
-                select="@name"/>
-            <xsl:text>   </xsl:text>
-            Version:
-            <xsl:value-of
-                select="@version"/>
-        </p>
-        <xsl:apply-templates
-            select="stats"/>
-        <xsl:apply-templates
-            select="sources"/>
-    </xsl:template>
-    <xsl:template
-        name="stats"
-        match="stats">
-        <p>
-            Number of source files:
-            <xsl:value-of
-                select="count(..//source)"/>
-            Number of classfiles:
-            <xsl:value-of
-                select="number_of_classfiles/@value"/>
-        </p>
-        <p>
-            Problems:
-            <xsl:value-of
-                select="problem_summary/@problems"/>
-            (Errors:
-            <xsl:value-of
-                select="problem_summary/@errors"/>
-            Warnings:
-            <xsl:value-of
-                select="problem_summary/@warnings"/>
-            )
-        </p>
-    </xsl:template>
-    <xsl:template
-        name="sources"
-        match="sources">
-        <xsl:if
-            test="count(source) > 0">
-            <dl>
-                <xsl:for-each
-                    select="source">
-                    <xsl:variable
-                        name="package"
-                        select="normalize-space(@package)">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="path"
-                        select="normalize-space(@path)">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="classname"
-                        select="substring-after($path, $package)">
-                    </xsl:variable>
-                    <xsl:if
-                        test="count(problems) > 0">
-                        <dt
-                            style="font-weight: bold; color: black">
-                            Source File:
-                            <xsl:value-of
-                                select="$package"/>
-                            <xsl:value-of
-                                select="$classname"/>
-                        </dt>
-                        <xsl:apply-templates
-                            select="problems">
-                            <xsl:with-param
-                                name="classname">
-                                <xsl:value-of
-                                    select="$classname"/>
-                            </xsl:with-param>
-                        </xsl:apply-templates>
-                    </xsl:if>
-                </xsl:for-each>
-            </dl>
-        </xsl:if>
-    </xsl:template>
-    <xsl:template
-        match="problems">
-        <xsl:param
-            name="classname"/>
-        <xsl:for-each
-            select="problem">
-            <dd
-                style="font-weight: normal; color: black">
-                <xsl:value-of
-                    select="position()"/>
-                <xsl:text>.  </xsl:text>
-                <xsl:value-of
-                    select="@severity"/>
-                <xsl:text>:  </xsl:text>
-                <xsl:value-of
-                    select="@id"/>
-                <xsl:variable
-                    name="lineNumber"
-                    select="@line">
-                </xsl:variable>
-                <xsl:for-each
-                    select="message">
-                    <p
-                        style="margin-left: +.5in; font-size: -1; margin-top: 0;margin-bottom:0;">
-                        <small>
-                            <xsl:value-of
-                                select="@value"/>
-                        </small>
-                    </p>
-                </xsl:for-each>
-                <xsl:for-each
-                    select="source_context">
-                    <xsl:variable
-                        name="pre"
-                        select="substring(@value,0,(@sourceStart + 1))">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="main"
-                        select="substring(@value,(@sourceStart + 1),(((@sourceEnd + 1) - (@sourceStart + 1)) + 1))">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="end"
-                        select="substring(@value,(@sourceEnd + 2))">
-                    </xsl:variable>
-                    <p
-                        style="margin-left: +.5in; font-size: -2; margin-top: 0;margin-bottom:0;">
-                        <xsl:value-of
-                            select="substring($classname,2)"/>
-                        :
-                    </p>
-                    <p
-                        style="margin-left: +.5in; font-size: -2;font-family: monospace; margin-top: 0;margin-bottom:0;">
-                        <xsl:value-of
-                            select="$lineNumber"/>
-                        :
-                        <xsl:value-of
-                            select="$pre"/>
-                        <b>
-                            <u>
-                                <xsl:value-of
-                                    select="$main"/>
-                            </u>
-                        </b>
-                        <xsl:value-of
-                            select="$end"/>
-                    </p>
-                </xsl:for-each>
-            </dd>
-        </xsl:for-each>
-    </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/xml.site/publish.xml b/releng.wtpbuilder/distribution/xml.site/publish.xml
deleted file mode 100644
index 71afb65..0000000
--- a/releng.wtpbuilder/distribution/xml.site/publish.xml
+++ /dev/null
@@ -1,821 +0,0 @@
-<project
-    name="Publish Build"
-    default="default"
-    basedir=".">
-    <!--
-        Properties that must be passed to this script: buildDirectory:
-        Path to perform the build in. (A working directory) buildType:
-        Type of build (nightly, integration etc.) buildId: Build name
-        buildLabel: <buildType>-<buildName>-<timestamp>
-    -->
-    <property
-        environment="env"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be provided to publish"/>
-    <fail
-        unless="buildLabel"
-        message="buildLabel must be provided to publish"/>
-    <fail
-        unless="wtp.builder.home"
-        message="wtp.builder.home must be provided to publish"/>
-    <fail
-        unless="build.distribution"
-        message="build.distribution must be provided to publish"/>
-    <property
-        name="resultDir"
-        value="${buildDirectory}/${buildLabel}"/>
-    <!--name of generated index page-->
-    <property
-        name="indexFileName"
-        value="index.php"/>
-    <property
-        name="templateDir"
-        value="${wtp.builder.home}/distribution/${build.distribution}.site"/>
-    <property
-        name="resultingIndex"
-        value="${resultDir}/${indexFileName}"/>
-    <echo
-        level="debug"
-        message="resultDir: ${resultDir}"/>
-    <echo
-        level="debug"
-        message="templateDir: ${templateDir}"/>
-    <echo
-        level="debug"
-        message="resultingIndex: ${resultingIndex}"/>
-    <target
-        name="default">
-        <copy
-            overwrite="true"
-            file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/${indexTemplateFilename}"
-            tofile="${resultingIndex}"/>
-        <antcall
-            target="countFiles"/>
-        <antcall
-            target="generateCompileIndex"/>
-        <antcall
-            target="generateJUnitTestsIndex"/>
-        <antcall
-            target="getStaticFiles"/>
-    </target>
-    <target
-        name="generateCompileIndex">
-        <!--
-            <taskdef name="indexResults"
-            classname="org.eclipse.wtp.releng.tools.ResultsSummaryGenerator"
-            />
-        -->
-        <!--
-            isBuildTested: true|false should JUnit plugin test results
-            be used to generate index page dropTokenList: comma
-            separated list of strings which should be replaced by the
-            fileName attribute settings in the testManifest.xml.
-            xmlDirectoryName: path to directory containing JUnit plugin
-            test results in xml format (see doc is org.eclipse.test).
-            dropDirectoryName: path to directory containing the result
-            of the build. testResultsTemplateFileName: path to template
-            file used to generate page with links to JUnit test results
-            testResultsHtmlFileName: name of file which will be
-            generated with links to JUnit test results dropHtmlFileName:
-            name of generated index page hrefTestResultsTargetPath:
-            relative path from index page to directory containing JUnit
-            html test results hrefCompileLogsTargetPath: relative path
-            from index page directory containing compilelogs
-            testManifestFileName: name of xml file containing
-            descriptions of zip types and log files
-        -->
-        <property
-            file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-
-        <!-- create tables of test plugin compiles first -->
-        <antcall
-            target="generateTestCompileOutput">
-            <param
-                name="outputDirectory"
-                value="${resultDir}/testcompilelogs"/>
-        </antcall>
-
-        <!-- create table of code plugins compiles -->
-        <antcall
-            target="generateCompileOutput">
-            <param
-                name="outputDirectory"
-                value="${resultDir}/compilelogs"/>
-        </antcall>
-        <tstamp>
-            <format
-                property="TODAY"
-                pattern="MMMM d, yyyy"/>
-        </tstamp>
-
-        <!--  Insert Build Type descriptor  -->
-        <antcall
-            target="${buildType}"/>
-        <antcall
-            target="writeData"/>
-        <!--
-            Update timestamp on file to permit overwrite through Ant
-            copy task
-        -->
-        <touch
-            file="${resultingIndex}"/>
-    </target>
-    <target
-        name="generateTestCompileOutput"
-        depends="checkIfCompileLogs"
-        if="doCompileLogs">
-        <summarizeResults
-            isBuildTested="false"
-            includeAll="true"
-            dropTokenList="${dropTokenList}"
-            xmlDirectoryName=""
-            dropDirectoryName="${resultDir}"
-            testResultsTemplateFileName="${templateDir}/templateFiles/testCompileResults.php.template"
-            testResultsHtmlFileName="testCompileResults.php"
-            hrefTestResultsTargetPath=""
-            hrefCompileLogsTargetPath="testcompilelogs"
-            compileLogsDirectoryName="${outputDirectory}"/>
-        <antcall
-            target="compilerXMLToHTML"/>
-    </target>
-    <target
-        name="generateCompileOutput"
-        depends="checkIfCompileLogs"
-        if="doCompileLogs">
-        <summarizeResults
-            isBuildTested="false"
-            includeAll="true"
-            dropTokenList="${dropTokenList}"
-            xmlDirectoryName=""
-            dropDirectoryName="${resultDir}"
-            testResultsTemplateFileName="${templateDir}/templateFiles/compileResults.php.template"
-            testResultsHtmlFileName="compileResults.php"
-            hrefTestResultsTargetPath="testResults/html"
-            hrefCompileLogsTargetPath="compilelogs"
-            compileLogsDirectoryName="${outputDirectory}"/>
-        <antcall
-            target="compilerXMLToHTML"/>
-    </target>
-    <target
-        name="compilerXMLToHTML">
-        <xslt
-            basedir="${outputDirectory}"
-            destdir="${outputDirectory}"
-            includes="**/*.xml"
-            scanincludeddirectories="true"
-            style="compilerXMLOutputToHTML.xsl"
-            force="true"/>
-    </target>
-    <target
-        name="generateJUnitTestsIndex"
-        depends="checkIfTested"
-        if="doTests">
-        <!--
-            isBuildTested: true|false should JUnit plugin test results
-            be used to generate index page dropTokenList: comma
-            separated list of strings which should be replaced by the
-            fileName attribute settings in the testManifest.xml.
-            xmlDirectoryName: path to directory containing JUnit plugin
-            test results in xml format (see doc is org.eclipse.test).
-            dropDirectoryName: path to directory containing the result
-            of the build. testResultsTemplateFileName: path to template
-            file used to generate page with links to JUnit test results
-            testResultsHtmlFileName: name of file which will be
-            generated with links to JUnit test results dropHtmlFileName:
-            name of generated index page hrefTestResultsTargetPath:
-            relative path from index page to directory containing JUnit
-            html test results hrefCompileLogsTargetPath: relative path
-            from index page directory containing compilelogs
-            testManifestFileName: name of xml file containing
-            descriptions of zip types and log files
-        -->
-        <property
-            file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-
-        <!-- create table of test plugin compiles first -->
-        <!-- set isBuildTested to true for the "compile only" results -->
-        <summarizeResults
-            isBuildTested="true"
-            dropTokenList="${dropTokenList}"
-            dropDirectoryName="${resultDir}"
-            xmlDirectoryName="${resultDir}/testResults/xml"
-            testResultsTemplateFileName="${templateDir}/templateFiles/testResults.php.template"
-            testResultsHtmlFileName="testResults.php"
-            hrefTestResultsTargetPath="testResults/html"
-            compileLogsDirectoryName=""/>
-        <tstamp>
-            <format
-                property="TODAY"
-                pattern="MMMM d, yyyy"/>
-        </tstamp>
-
-        <!--  Insert Build Type descriptor  -->
-        <antcall
-            target="${buildType}"/>
-        <antcall
-            target="writeData"/>
-        <!--
-            Update timestamp on file to permit overwrite through Ant
-            copy task
-        -->
-        <touch
-            file="${resultingIndex}"/>
-    </target>
-    <target
-        name="getStaticFiles">
-        <!--get static files required in the buildLabel directory-->
-        <copy
-            todir="${resultDir}">
-            <fileset
-                dir="${templateDir}/staticDropFiles"/>
-        </copy>
-
-        <!--copy buildnotes from plugin directories-->
-        <mkdir
-            dir="${resultDir}/buildnotes"/>
-        <copy
-            todir="${resultDir}/buildnotes"
-            flatten="true">
-            <fileset
-                dir="${buildDirectory}/plugins"
-                includes="**/buildnotes_*.html"/>
-            <fileset
-                dir="${buildDirectory}/features"
-                includes="**/buildnotes_*.html"/>
-        </copy>
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/full/logIndex.php"/>
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/testLogs/logIndex.php"/>
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/testSysErrorLogs/logIndex.php"/>
-    </target>
-    <target
-        name="updateSite">
-
-
-        <!-- get our authored, tokenized site.xml file -->
-        <copy
-            file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/siteWTP.xml"
-            tofile="${buildDirectory}/${buildLabel}/updateSite/site.xml"
-            overwrite="true"
-            failonerror="true"/>
-        <!--
-            get the ${buildDirectory}/finalPluginsVersions.properties,
-            and read as properties
-        -->
-        <!-- substitute property value for tokens -->
-        <replace
-            file="${buildDirectory}/${buildLabel}/updateSite/site.xml"
-            propertyfile="${buildDirectory}/finalFeaturesVersions.properties">
-            <replacefilter
-                token="@org.eclipse.wtp@"
-                property="org.eclipse.wtp"/>
-            <replacefilter
-                token="@org.eclipse.wtp.sdk@"
-                property="org.eclipse.wtp.sdk"/>
-            <replacefilter
-                token="@org.eclipse.jst@"
-                property="org.eclipse.jst"/>
-            <replacefilter
-                token="@org.eclipse.jst.sdk@"
-                property="org.eclipse.jst.sdk"/>
-            <replacefilter
-                token="@org.eclipse.jpt.feature@"
-                property="org.eclipse.jpt.feature"/>
-            <replacefilter
-                token="@org.eclipse.jpt_sdk.feature@"
-                property="org.eclipse.jpt_sdk.feature"/>
-        </replace>
-    </target>
-    <target
-        name="countFiles">
-        <!--
-            files.count is a file that should exist in the drop
-            directory with a count of the zip files in the same
-            directory. It is required to generate a link to the build on
-            the downloads page.
-        -->
-        <countBuildFiles
-            sourceDirectory="${resultDir}"
-            filterString=".zip,.tar.gz"
-            outputFile="${resultDir}/files.count"/>
-    </target>
-
-    <!--Build type descriptors-->
-    <target
-        name="I">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Integration"/>
-    </target>
-    <target
-        name="S">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Stable"/>
-    </target>
-    <target
-        name="N">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Nightly"/>
-    </target>
-    <target
-        name="M">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Maintenance"/>
-    </target>
-    <target
-        name="R">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Release"/>
-    </target>
-    <target
-        name="T">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Test"/>
-    </target>
-    <target
-        name="P">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Patches"/>
-    </target>
-    <target
-        name="checkIfTested">
-        <echo
-            level="debug"
-            message="isBuildTested: ${isBuildTested}"/>
-        <condition
-            property="doTests">
-            <equals
-                arg1="${isBuildTested}"
-                arg2="true"
-                trim="true"
-                casesensitive="false"/>
-        </condition>
-    </target>
-    <target
-        name="checkIfCompileLogs">
-        <condition
-            property="doCompileLogs">
-            <available
-                file="${outputDirectory}"/>
-        </condition>
-    </target>
-    <target
-        name="writeData">
-        <!--  Insert Build Date  -->
-        <replace
-            file="${resultingIndex}"
-            token="@date@"
-            value="${TODAY}"/>
-
-        <!--  Insert Build Name  -->
-        <replace
-            file="${resultingIndex}"
-            token="@build@"
-            value="${buildLabel}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@buildBranch@"
-            value="${buildBranch}"/>
-
-        <!--  Insert PreRequsites  -->
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformFile@"
-            value="${eclipseplatform.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformURL@"
-            value="${eclipseplatform.url}/${eclipseplatform.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformBuildURL@"
-            value="${eclipseplatform.url}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformfilelinux@"
-            value="${eclipseplatform.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformfilewindows@"
-            value="${eclipseplatform.file.win32-win32-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformfilemacos@"
-            value="${eclipseplatform.file.macosx-carbon-ppc}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformBuildHome@"
-            value="${eclipseplatform.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatform.mirror.prefixuri@"
-            value="${eclipseplatform.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatform.fspath.prefix@"
-            value="${eclipseplatform.fspath.prefix}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseFile@"
-            value="${eclipse.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseURL@"
-            value="${eclipse.url}/${eclipse.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseBuildURL@"
-            value="${eclipse.url}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilelinux@"
-            value="${eclipse.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilewindows@"
-            value="${eclipse.file.win32-win32-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilemacos@"
-            value="${eclipse.file.macosx-carbon-ppc}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseBuildHome@"
-            value="${eclipse.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipse.mirror.prefixuri@"
-            value="${eclipse.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipse.fspath.prefix@"
-            value="${eclipse.fspath.prefix}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@testURL@"
-            value="${eclipseTestFramework.url}/${eclipseTestFramework.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@testFile@"
-            value="${eclipseTestFramework.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfName@"
-            value="${emf.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfDescription@"
-            value="${emf.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfFile@"
-            value="${emf.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfURL@"
-            value="${emf.url}/${emf.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfBuildHome@"
-            value="${emf.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emf.mirror.prefixuri@"
-            value="${emf.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsourceURL@"
-            value="${emfsourcedoc.url}/${emfsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsourceFile@"
-            value="${emfsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsourceName@"
-            value="${emfsourcedoc.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsourceDescription@"
-            value="${emfsourcedoc.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsourceBuildHome@"
-            value="${emfsourcedoc.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsource.mirror.prefixuri@"
-            value="${emfsourcedoc.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsourceURL@"
-            value="${emfxsdsourcedoc.url}/${emfsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsourceFile@"
-            value="${emfxsdsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsourceName@"
-            value="${emfxsdsourcedoc.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsourceDescription@"
-            value="${emfxsdsourcedoc.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsourceBuildHome@"
-            value="${emfxsdsourcedoc.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsource.mirror.prefixuri@"
-            value="${emfxsdsourcedoc.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdFile@"
-            value="${emfxsd.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdName@"
-            value="${emfxsd.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdDescription@"
-            value="${emfxsd.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdURL@"
-            value="${emfxsd.url}/${emfxsd.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdBuildHome@"
-            value="${emfxsd.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsd.mirror.prefixuri@"
-            value="${emfxsd.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationFile@"
-            value="${emfvalidation.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationURL@"
-            value="${emfvalidation.url}/${emfvalidation.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationBuildHome@"
-            value="${emfvalidation.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidation.mirror.prefixuri@"
-            value="${emfvalidation.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationName@"
-            value="${emfvalidation.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationDescription@"
-            value="${emfvalidation.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsourceFile@"
-            value="${emfvalidationsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsourceURL@"
-            value="${emfvalidationsourcedoc.url}/${emfvalidationsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsourceBuildHome@"
-            value="${emfvalidationsourcedoc.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsource.mirror.prefixuri@"
-            value="${emfvalidationsourcedoc.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsourceName@"
-            value="${emfvalidationsourcedoc.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsourceDescription@"
-            value="${emfvalidationsourcedoc.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstName@"
-            value="${wst.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstDescription@"
-            value="${wst.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstFile@"
-            value="${wst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstURL@"
-            value="${wst.url}/${wst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstBuildHome@"
-            value="${wst.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wst.mirror.prefixuri@"
-            value="${wst.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstName@"
-            value="${jst.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstDescription@"
-            value="${jst.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstFile@"
-            value="${jst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstURL@"
-            value="${jst.url}/${jst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstBuildHome@"
-            value="${jst.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jst.mirror.prefixuri@"
-            value="${jst.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpName@"
-            value="${wtp.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpDescription@"
-            value="${wtp.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpFile@"
-            value="${wtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpURL@"
-            value="${wtp.url}/${wtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpBuildHome@"
-            value="${wtp.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtp.mirror.prefixuri@"
-            value="${wtp.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefFile@"
-            value="${gef.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefURL@"
-            value="${gef.url}/${gef.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefBuildHome@"
-            value="${gef.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gef.mirror.prefixuri@"
-            value="${gef.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefName@"
-            value="${gef.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefDescription@"
-            value="${gef.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipserelengFile@"
-            value="${eclipsereleng.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipserelengURL@"
-            value="${eclipsereleng.url}/${eclipsereleng.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipFile@"
-            value="${orbitthirdpartyzip.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipURL@"
-            value="${orbitthirdpartyzip.url}/${orbitthirdpartyzip.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipBuildHome@"
-            value="${orbitthirdpartyzip.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzip.mirror.prefixuri@"
-            value="${orbitthirdpartyzip.mirror.prefixuri}"/>
-
-
-        <!-- no longer used. Post 1.5.5 -->
-        <replace
-            file="${resultingIndex}"
-            token="@jemFile@"
-            value="${jem.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jemURL@"
-            value="${jem.url}/${jem.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jemBuildHome@"
-            value="${jem.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jem.mirror.prefixuri@"
-            value="${jem.mirror.prefixuri}"/>
-        <!--
-            these token/s should not exist in maintenance stream, but do
-            no harm done, so in the interests of keeping builder streams
-            in sync, we'll leave them here as place hold
-        -->
-        <replace
-            file="${resultingIndex}"
-            token="@dtpFile@"
-            value="${dtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtpURL@"
-            value="${dtp.url}/${dtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtpBuildHome@"
-            value="${dtp.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtp.mirror.prefixuri@"
-            value="${dtp.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtpName@"
-            value="${dtp.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtpDescription@"
-            value="${dtp.description}"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/xml.site/staticDropFiles/FAIL.gif b/releng.wtpbuilder/distribution/xml.site/staticDropFiles/FAIL.gif
deleted file mode 100644
index 28bba66..0000000
--- a/releng.wtpbuilder/distribution/xml.site/staticDropFiles/FAIL.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/xml.site/staticDropFiles/OK.gif b/releng.wtpbuilder/distribution/xml.site/staticDropFiles/OK.gif
deleted file mode 100644
index 689e523..0000000
--- a/releng.wtpbuilder/distribution/xml.site/staticDropFiles/OK.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/xml.site/staticDropFiles/access_err.gif b/releng.wtpbuilder/distribution/xml.site/staticDropFiles/access_err.gif
deleted file mode 100644
index 4f0748a..0000000
--- a/releng.wtpbuilder/distribution/xml.site/staticDropFiles/access_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/xml.site/staticDropFiles/access_warn.gif b/releng.wtpbuilder/distribution/xml.site/staticDropFiles/access_warn.gif
deleted file mode 100644
index 8386e3e..0000000
--- a/releng.wtpbuilder/distribution/xml.site/staticDropFiles/access_warn.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/xml.site/staticDropFiles/buildNotes.php b/releng.wtpbuilder/distribution/xml.site/staticDropFiles/buildNotes.php
deleted file mode 100644
index f666887..0000000
--- a/releng.wtpbuilder/distribution/xml.site/staticDropFiles/buildNotes.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<html>
-<head>
-<?php
-$parts = explode("/", getcwd());
-$parts2 = explode("-", $parts[count($parts) - 1]);
-$buildName = $parts2[1];
-
-echo "<title>Build Notes for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Build Notes</font></b></p>
-
-<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"> Build Notes for <?php echo "$buildName"; ?></font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$hasNotes = false;
-$aDirectory = dir("buildnotes");
-while ($anEntry = $aDirectory->read()) {
-	if ($anEntry != "." && $anEntry != "..") {
-		//print_r($anEntry);
-		//echo "<br />";
-
-		$subject = $anEntry;
-		$pattern = '/^buildnotes_(.*)/i';
-		preg_match($pattern, $subject, $matches);
-		$subject = $matches[1];
-		//print_r($subject);
-		//echo "<br />";
-		$pattern = '/^(.*)\.html$/';
-		preg_match($pattern, $subject, $matches);
-		//print_r($matches);
-		//echo "<br />";
-
-		$component = $matches[1];
-
-		$line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
-		echo "<tr>";
-		echo "$line";
-		echo "</tr>";
-		$hasNotes = true;
-
-	}
-}
-$aDirectory.closedir();
-if (!$hasNotes) {
-	echo "<br>There are no build notes for this build.";
-}
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/xml.site/staticDropFiles/compile_err.gif b/releng.wtpbuilder/distribution/xml.site/staticDropFiles/compile_err.gif
deleted file mode 100644
index c2bfdd6..0000000
--- a/releng.wtpbuilder/distribution/xml.site/staticDropFiles/compile_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/xml.site/staticDropFiles/compile_warn.gif b/releng.wtpbuilder/distribution/xml.site/staticDropFiles/compile_warn.gif
deleted file mode 100644
index cf4fdf9..0000000
--- a/releng.wtpbuilder/distribution/xml.site/staticDropFiles/compile_warn.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/xml.site/staticDropFiles/componentxmls.php b/releng.wtpbuilder/distribution/xml.site/staticDropFiles/componentxmls.php
deleted file mode 100644
index 73c5443..0000000
--- a/releng.wtpbuilder/distribution/xml.site/staticDropFiles/componentxmls.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<html>
-<head>
-<?php
-  function find_component_xml($directory)
-  {
-    $count = 0;
-    $dir = dir($directory);
-    while ($anEntry = $dir->read())
-    {
-      if ($anEntry != "." && $anEntry != "..")
-      {
-        $anEntry = $directory."/".$anEntry;
-        if (stristr($anEntry, '.source') === FALSE)
-        {
-          if (is_dir($anEntry))
-          {
-            find_component_xml($anEntry);
-          }
-          else
-          {
-            echo "<tr><td><a href=\"$anEntry\">";
-            echo substr($anEntry, 22);
-            echo "</a></td>";
-          }
-        }
-      }
-    }
-  }
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" type="text/css">
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">component.xml</font></b> </p>
-
-<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">
-	   component.xml files for <?php echo "$buildType $buildName"; ?></font></b></td>
-  </tr>
-</table>
-
-<table border="1" width="100%">
-  <tr>
-    <th>component.xml</th>
-  </tr>
-<?php
-  find_component_xml("apitools/componentxmls");
-?>
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/xml.site/staticDropFiles/consoleLogs.php b/releng.wtpbuilder/distribution/xml.site/staticDropFiles/consoleLogs.php
deleted file mode 100644
index 2ee3c36..0000000
--- a/releng.wtpbuilder/distribution/xml.site/staticDropFiles/consoleLogs.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<html>
-<head>
-<?php
-$parts = explode("/", getcwd());
-$parts2 = explode("-", $parts[count($parts) - 1]);
-$buildName = $parts2[1];
-
-echo "<title>Test Console Output for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-<title>Console Logs from Running JUnit Plug-in Tests</title>
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b></p>
-
-<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">Console output from running
-		JUnit plugin tests for <?php echo "$buildName"; ?> </font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$rootDir = "testResults/consolelogs";
-$hasNotes = false;
-$aDirectory = dir($rootDir);
-$index = 0;
-$dirindex = 0;
-while ($anEntry = $aDirectory->read()) {
-	if ($anEntry != "." && $anEntry != "..") {
-		if (is_file("$rootDir/$anEntry")) {
-			$entries[$index] = $anEntry;
-			$index++;
-		} else if (is_dir("$rootDir/$anEntry")) {
-			$direntries[$dirindex] = $anEntry;
-			$dirindex++;
-		}
-	}
-}
-$aDirectory->close();
-
-
-sort($entries);
-sort($direntries);
-
-for ($i = 0; $i < $dirindex; $i++) {
-	$anEntry = $direntries[$i];
-	$line = "<td><a href=\"testResults/consolelogs/$anEntry/logIndex.php\">$anEntry</a></td>";
-	echo "<tr>";
-	echo "$line";
-	echo "</tr>";
-}
-for ($i = 0; $i < $index; $i++) {
-	$anEntry = $entries[$i];
-	$logsize = filesize("testResults/consolelogs/$anEntry");
-
-
-	$level = 0;
-	if ($logsize > 20000) {
-		$level = 2;
-	}
-	else if ($logsize > 2000) {
-		$level = 1;
-	}
-
-	if ($level == 0) {
-		$line = "<td><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-	}
-	else if ($level == 1) {
-		$line = "<td><em><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-	} else if ($level == 2) {
-		$line = "<td><strong><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-	}
-
-
-	echo "<tr>";
-	echo "$line";
-	echo "</tr>";
-	$hasNotes = true;
-}
-
-if (!$hasNotes) {
-	echo "<br>There are no test logs for this build.";
-}
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/xml.site/staticDropFiles/download.php b/releng.wtpbuilder/distribution/xml.site/staticDropFiles/download.php
deleted file mode 100644
index cfeab0a..0000000
--- a/releng.wtpbuilder/distribution/xml.site/staticDropFiles/download.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<html>
-<head>
-<title>Eclipse WTP Download Click Through</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" type="text/css">
-<?php
-	$parts = explode("-", $dropFile);
-	$clickFile = "clickThroughs/";
-	for ($i =0; $i<count($parts); $i++) {
-		if ($i != 2) {
-			$clickFile = $clickFile.$parts[$i];
-		    if ($i < count($parts) - 1) {
-        	    $clickFile = $clickFile."-";
-            }
- 		}
-	}
-	$clickFile = $clickFile.".txt";
-
-	if (file_exists($clickFile)) {
-		$fileHandle = fopen($clickFile, "r");
-		while (!feof($fileHandle)) {
-			$aLine = fgets($fileHandle, 4096);
-			$result = $result.$aLine;
-		}
-		fclose($fileHandle);
-	} else {
-		echo '<META HTTP-EQUIV="Refresh" CONTENT="0;URL='.$dropFile.'">';
-		echo '<b><font size "+4">Downloading: '.$dropFile.'</font></b>';
-		echo '<BR>';
-		echo '<BR>';
-		echo 'If your download does not begin automatically click <a href="'.$dropFile.'">here</a>.';
-	}
-?>
-</head>
-
-<body bgcolor="#FFFFFF" text="#000000">
-  <?php
-	if (file_exists($clickFile)) {
-	 echo '<p><b><font size="+4">Important Notes<BR>';
-	 echo $dropFile;
-	 echo '</font></b></font></p>
-	<p>It is very important to read the following notes in order to run this version 
-	  of Eclipse. Once you have read the notes you can click on the Download link 
-	  to download the drop.</p>
-	';
-	  echo '<textarea name="textfield" cols="80" rows="20" wrap="PHYSICAL">'.$result;
-	  echo '</textarea>';
-	  echo '<BR>';
-	  echo '<BR>';
-	  echo '<a href="'.$dropFile.'">Download</a>';
-	}
-?>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/xml.site/staticDropFiles/junit_err.gif b/releng.wtpbuilder/distribution/xml.site/staticDropFiles/junit_err.gif
deleted file mode 100644
index 1b7ff9d..0000000
--- a/releng.wtpbuilder/distribution/xml.site/staticDropFiles/junit_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/xml.site/staticDropFiles/logIndex.php b/releng.wtpbuilder/distribution/xml.site/staticDropFiles/logIndex.php
deleted file mode 100644
index 721ca00..0000000
--- a/releng.wtpbuilder/distribution/xml.site/staticDropFiles/logIndex.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<html>
-<head>
-<?php
-
-function endsWith( $str, $sub ) {
-
-	return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub );
-}
-
-$parts = explode("/", getcwd());
-$parts2 = explode("-", $parts[count($parts) - 1]);
-$buildName = $parts2[1];
-
-echo "<title>Test Console Output for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-<title>Console Logs from Running JUnit Plug-in Tests</title>
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b></p>
-
-<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">Console output from running
-		JUnit plugin tests for <?php echo "$buildName"; ?> </font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$hasNotes = false;
-$aDirectory = dir(".");
-$index = 0;
-while ($anEntry = $aDirectory->read()) {
-	if ($anEntry != "." && $anEntry != ".." && !endsWith(__FILE__, $anEntry)) {
-		$entries[$index] = $anEntry;
-		$index++;
-	}
-}
-aDirectory.closedir();
-
-
-sort($entries);
-
-for ($i = 0; $i < $index; $i++) {
-	$anEntry = $entries[$i];
-	$logsize = filesize("$anEntry");
-
-
-	$level = 0;
-	if ($logsize > 20000) {
-		$level = 2;
-	}
-	else if ($logsize > 2000) {
-		$level = 1;
-	}
-
-	if ($level == 0) {
-		$line = "<td><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-	}
-	else if ($level == 1) {
-		$line = "<td><em><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-	} else if ($level == 2) {
-		$line = "<td><strong><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-	}
-
-
-	echo "<tr>";
-	echo "$line";
-	echo "</tr>";
-	$hasNotes = true;
-}
-
-if (!$hasNotes) {
-	echo "<br>There are no test logs for this build.";
-}
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/xml.site/staticDropFiles/miscUtil.php b/releng.wtpbuilder/distribution/xml.site/staticDropFiles/miscUtil.php
deleted file mode 100644
index 5001f38..0000000
--- a/releng.wtpbuilder/distribution/xml.site/staticDropFiles/miscUtil.php
+++ /dev/null
@@ -1,219 +0,0 @@
-<?php
-
-// todo: unsure if can handle filenames that are URLs?
-// handy constant to compute file size in megabytes
-
-function fileSizeInMegs($filename) {
-	$onemeg=1024*1024;
-	$zipfilesize=filesize($filename);
-	$zipfilesize=round($zipfilesize/$onemeg, 0);
-	return $zipfilesize;
-}
-
-function fileSizeForDisplay($filename) {
-	$onekilo=1024;
-	$onemeg=$onekilo * $onekilo;
-	$criteria = 10 * $onemeg;
-	$scaleChar = "M";
-	if (file_exists($filename)) {
-		$zipfilesize=filesize($filename);
-		if ($zipfilesize > $criteria) {
-			$zipfilesize=round($zipfilesize/$onemeg, 0);
-			$scaleChar = "M";
-		}
-		else {
-			$zipfilesize=round($zipfilesize/$onekilo, 0);
-			$scaleChar = "K";
-		}
-	}
-	else {
-		$zipfilesize = 0;
-	}
-	$result =  "(" . $zipfilesize . $scaleChar . ")";
-	return $result;
-}
-
-
-function displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription) {
-	echo "<td align=\"right\" valign=\"top\" width=\"30%\">";
-	echo "<a href=\"$downloadprefix$filename\">" . $fileShortDescription . "</a>";
-	echo "</td><td align=\"right\" valign=\"top\" width=\"3%\">";
-	echo $zipfilesize;
-	echo "</td>";
-	echo "<td align=\"right\" valign=\"top\" width=\"2%\">";
-	echo "[<a href=\"checksum/$filename.md5\">md5</a>]";
-	echo "</td>";
-}
-
-function resourceExist($url, $mirrorPrefixuri, $prereqfilename, $eclipseFSpathPrefix)
-{
-	$result = false;
-
-	$allowURLopen = ini_get('allow_url_fopen');
-
-	if ($allowURLopen && stream_last_modified($url)) {
-		$result = true;
-	}
-	else {
-		// TODO: for now, we'll do a raw check on the whole file name, since enable_url_open
-		// is off. better would be to check if we are on build.eclipse.org or download.eclipse.org?
-		$wholePath = trim($eclipseFSpathPrefix) . "/" . trim($mirrorPrefixuri) . "/" . trim($prereqfilename);
-		if (file_exists($wholePath)) {
-			$result = true;
-		}
-	}
-	return $result;
-}
-
-function stream_last_modified($url)
-{
-	if (function_exists('version_compare') && version_compare(phpversion(), '4.3.0') > 0)
-	{
-		if (!($fp = @fopen($url, 'r')))
-		return NULL;
-
-		$meta = stream_get_meta_data($fp);
-		for ($j = 0; isset($meta['wrapper_data'][$j]); $j++)
-		{
-			if (strstr(strtolower($meta['wrapper_data'][$j]), 'last-modified'))
-			{
-				$modtime = substr($meta['wrapper_data'][$j], 15);
-				break;
-			}
-		}
-		fclose($fp);
-	}
-	else
-	{
-		$parts = parse_url($url);
-		$host  = $parts['host'];
-		$path  = $parts['path'];
-
-		if (!($fp = @fsockopen($host, 80)))
-		return NULL;
-
-		$req = "HEAD $path HTTP/1.0\r\nUser-Agent: PHP/".phpversion()."\r\nHost: $host:80\r\nAccept: */*\r\n\r\n";
-		fputs($fp, $req);
-
-		while (!feof($fp))
-		{
-			$str = fgets($fp, 4096);
-			if (strstr(strtolower($str), 'last-modified'))
-			{
-				$modtime = substr($str, 15);
-				break;
-			}
-		}
-		fclose($fp);
-	}
-	return isset($modtime) ? strtotime($modtime) : time();
-}
-
-function isMirrored($uriToCheck) {
-	global $debugScript;
-	global $debugFunctions;
-	$localuri = $uriToCheck;
-
-	$debugMirrorList = false;
-	if ($debugScript) {
-		echo "uriToCheck: " . $localuri . "<br />";
-	}
-
-	$xmlcount = 0;
-
-	/* This method true and accurate method of parsing mirror results
-	 * may be expensive, and would
-	 * likely cause artificially high counts of "downloads".
-	 * Could maybe use if somehow only checked once ever 5 minutes or something.
-
-
-	 // turn off warnings, as sometimes HTML is returned, which causes lots of warnings
-	 $holdLevel = error_reporting(E_ERROR);
-	 $mirrorsxml=simplexml_load_file(rawurlencode($localuri) . urlencode("&format=xml"));
-	 error_reporting($holdLevel);
-
-
-	 if ($mirrorsxml) {
-	 if ($debugFunctions) {
-	 echo "root node: " . $mirrorsxml->getName() . "<br />";
-	 }
-	 if (strcmp($mirrorsxml->getName(), "mirrors") == 0) {
-	 foreach ($mirrorsxml->children() as $mirror) {
-	 if (strcmp($mirror->getName(),"mirror") == 0) {
-	 $xmlcount=$xmlcount+1;
-	 }
-	 if ($debugMirrorList) {
-	 print_r($mirror);
-	 echo "<br />";
-	 }
-	 }
-	 }
-	 if ($debugFunctions) {
-	 echo "Mirror count: " . $xmlcount . "<br />";
-	 }
-	 }
-	 */
-	/*
-	 * Use simple heuristic based on pattern
-	 * in the URI ... if it contains "/downloads/" then assume it's mirrored
-	 */
-	if (strpos($uriToCheck, "webtools/downloads/") > 0) {
-		$xmlcount = 1;
-	}
-	return ($xmlcount > 0);
-
-}
-
-// TODO: replace with Phoenix variables
-function getPlatform () {
-	global $debugScript;
-	global $debugFunctions;
-	// getBrowser is expensive, so cache the data
-	static $browser;
-	$platform = "unknown";
-
-
-	if(ini_get("browscap")) {
-		if(!isset($browser)){
-			$browser = get_browser(null, true);
-		}
-
-		if ($browser) {
-			$rawPlatform = $browser['platform'];
-			if ($debugFunctions) {
-				echo "browser platfrom: " . $rawPlatform . "<br />" ;
-			}
-
-			if ($debugFunctions) {
-				$browserKeys = array_keys($browser);
-				foreach ($browserKeys as $key) {
-					echo $key . ": " . $browser[$key] . "<br />";
-				}
-			}
-		}
-		if (strpos($rawPlatform, "Win") === 0) {
-			$platform="windows";
-		} else if (strpos($rawPlatform, "Linux") === 0) {
-			$platform="linux";
-		} else if (strpos($rawPlatform, "Mac") === 0) {
-			$platform="mac";
-		}
-	}
-	return $platform;
-}
-
-
-function getPrereqReferenceOrName($eclipseMirrorScript, $mirrorPrefixuri, $prerequrl, $prereqfilename, $eclipseFSpathPrefix) {
-	// todo: we really only need "if exists" so could make a bit more efficient
-	// I tried "file_exists" but is didn't seem to work on my test server
-	// For these pre-reqs, we assume if they exist, they are mirrored. This is true
-	// 99% of the time.
-
-	if (resourceExist($prerequrl, $mirrorPrefixuri, $prereqfilename, $eclipseFSpathPrefix)) {
-		$reflink="<a href=\"" . $eclipseMirrorScript . $mirrorPrefixuri . "/" . $prereqfilename . "\">" . $prereqfilename . "</a>";
-	} else {
-		$reflink=$prereqfilename;
-	}
-	return $reflink;
-}
-?>
diff --git a/releng.wtpbuilder/distribution/xml.site/staticDropFiles/pending.gif b/releng.wtpbuilder/distribution/xml.site/staticDropFiles/pending.gif
deleted file mode 100644
index 66db2a6..0000000
--- a/releng.wtpbuilder/distribution/xml.site/staticDropFiles/pending.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/xml.site/staticDropFiles/pending1.gif b/releng.wtpbuilder/distribution/xml.site/staticDropFiles/pending1.gif
deleted file mode 100644
index 1b2ea6e..0000000
--- a/releng.wtpbuilder/distribution/xml.site/staticDropFiles/pending1.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/xml.site/staticDropFiles/pii.php b/releng.wtpbuilder/distribution/xml.site/staticDropFiles/pii.php
deleted file mode 100644
index e3ed59b..0000000
--- a/releng.wtpbuilder/distribution/xml.site/staticDropFiles/pii.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<html>
-<head>
-<?php
-  function write_unused_property($directory)
-  {
-    $count = 0;
-    $dir = dir($directory);
-    while ($anEntry = $dir->read())
-    {
-      if ($anEntry != "." && $anEntry != "..")
-      {
-        $anEntry = $directory."/".$anEntry;
-        if (is_dir($anEntry))
-        {
-          write_unused_property($anEntry);
-        }
-        else
-        {
-          echo "<tr><td><a href=\"$anEntry\">";
-          echo substr($anEntry, 16);
-          echo "</a></td>";
-          $lines = file($anEntry);
-          $count = count($lines);
-          echo "<td>$count</td></tr>";
-        }
-      }
-    }
-  }
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" type="text/css">
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Unused property messages</font></b> </p>
-
-<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">
-	   Unused property messages for <?php echo "$buildType $buildName"; ?></font></b></td>
-  </tr>
-</table>
-
-<table border="1">
-  <tr>
-    <th>Properties file</th>
-    <th>Unused strings</th>
-  </tr>
-<?php
-  write_unused_property("piitools");
-?>
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/xml.site/staticDropFiles/report2.php b/releng.wtpbuilder/distribution/xml.site/staticDropFiles/report2.php
deleted file mode 100644
index cb68e7b..0000000
--- a/releng.wtpbuilder/distribution/xml.site/staticDropFiles/report2.php
+++ /dev/null
@@ -1,45 +0,0 @@
-
-<?php
-
-function parse_testResults($filename)
-{
-	$junitFailures = 0;
-	if (is_file($filename)) {
-		$handle = @fopen($filename, "r");
-		if ($handle)
-		{
-			$size = filesize($filename);
-			$content = fread($handle, $size);
-			fclose($handle);
-			$junitStart = strpos($content, "Errors &amp; Failures");
-			$junitEnd = strpos($content, "</table>", $junitStart);
-			$junitInfo = substr($content, $junitStart, $junitEnd - $junitStart);
-			$start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">");
-			while ($start !== false)
-			{
-				$start += 29;
-				$stop = strpos($junitInfo, "</font></b></td>", $start);
-				if ($stop !== false)
-				{
-					$result = substr($junitInfo, $start, $stop - $start);
-					if (is_numeric($result))
-					{
-						$junitFailures += $result;
-					}
-					else if (strcmp($result, "DNF") == 0)
-					{
-						$junitFailures++;
-					}
-				}
-				$start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">", $stop);
-			}
-			$results = array($junitFailures);
-			return $results;
-		}
-	}
-}
-
-
-?>
-
-
diff --git a/releng.wtpbuilder/distribution/xml.site/templateFiles/compileResults.php.template b/releng.wtpbuilder/distribution/xml.site/templateFiles/compileResults.php.template
deleted file mode 100644
index f785771..0000000
--- a/releng.wtpbuilder/distribution/xml.site/templateFiles/compileResults.php.template
+++ /dev/null
@@ -1,76 +0,0 @@
-<html>
-<head>
-
-<?php
-        $parts = explode("/", getcwd());
-        $parts2 = explode("-", $parts[count($parts) - 1]);
-        $buildName = $parts2[1];
-
-        echo "<title>Compile Logs: Code Bundles for $buildName</title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2%;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-}
-</style>
-</head>
-<body>
-
-<?php
-        echo "<h1>Compile Logs: Code Bundles for $buildName</h1>";
-?>
-
-
-<table id=tabledata align = "center" width="75%" border="1">
-  <tr>
-    <td class="bold" align="center">Compile Logs</td>
-    <td class="bold" align="center">Compile Errors</td>
-    <td class="bold" align="center">Compiler Warnings</td>
-    <td class="bold" align="center">Access Violations</td>
-    <td class="bold" align="center">Access Warnings</td>
-  </tr>
-
-  %compilelogs%
-
-</table>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/xml.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/xml.site/templateFiles/index.html.template.php
deleted file mode 100644
index f104e8e..0000000
--- a/releng.wtpbuilder/distribution/xml.site/templateFiles/index.html.template.php
+++ /dev/null
@@ -1,850 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<?php
-
-ini_set("display_errors", "true");
-error_reporting (E_ALL);
-
-
-$buildBranch="@buildBranch@";
-$build="@build@";
-$type="@type@";
-$builddate="@date@";
-
-$eclipseMirrorPrefixuri="@eclipse.mirror.prefixuri@";
-$eclipseFSpathPrefix="@eclipse.fspath.prefix@";
-
-$eclipsefilelinux="@eclipsefilelinux@";
-$eclipsefilewindows="@eclipsefilewindows@";
-$eclipsefilemacosx="@eclipsefilemacos@";
-
-$eclipseURL="@eclipseURL@";
-$eclipseFile="@eclipseFile@";
-$eclipseBuildURL="@eclipseBuildURL@";
-$eclipseBuildHome="@eclipseBuildHome@";
-$eclipseName="@eclipseName@";
-$eclipseDescription="@eclipseDescription@";
-
-$eclipseplatformMirrorPrefixuri="@eclipseplatform.mirror.prefixuri@";
-$eclipseplatformFSpathPrefix="@eclipse.fspath.prefix@";
-
-$eclipseplatformfilelinux="@eclipseplatformfilelinux@";
-$eclipseplatformfilewindows="@eclipseplatformfilewindows@";
-$eclipseplatformfilemacosx="@eclipseplatformfilemacos@";
-
-$eclipseplatformURL="@eclipseplatformURL@";
-$eclipseplatformFile="@eclipseplatformFile@";
-$eclipseplatformBuildURL="@eclipseplatformBuildURL@";
-$eclipseplatformBuildHome="@eclipseplatformBuildHome@";
-$eclipseplatformName="@eclipseplatformName@";
-$eclipseplatformDescription="@eclipseplatformDescription@";
-
-$testURL="@testURL@";
-$testFile="@testFile@";
-
-$wstURL="@wstURL@";
-$wstFile="@wstFile@";
-$wstMirrorPrefixuri="@wst.mirror.prefixuri@";
-$wstBuildHome="@wstBuildHome@";
-$wstName="@wstName@";
-$wstDescription="@wstDescription@";
-
-$jstURL="@jstURL@";
-$jstFile="@jstFile@";
-$jstMirrorPrefixuri="@jst.mirror.prefixuri@";
-$jstBuildHome="@jstBuildHome@";
-$jstName="@jstName@";
-$jstDescription="@jstDescription@";
-
-$wtpURL="@wtpURL@";
-$wtpFile="@wtpFile@";
-$wtpMirrorPrefixuri="@wtp.mirror.prefixuri@";
-$wtpBuildHome="@wtpBuildHome@";
-$wtpName="@wtpName@";
-$wtpDescription="@wtpDescription@";
-
-$gefURL="@gefURL@";
-$gefFile="@gefFile@";
-$gefMirrorPrefixuri="@gef.mirror.prefixuri@";
-$gefBuildHome="@gefBuildHome@";
-$gefName="@getName@";
-$gefDescription="@gefDescription@";
-
-$emfURL="@emfURL@";
-$emfFile="@emfFile@";
-$emfMirrorPrefixuri="@emf.mirror.prefixuri@";
-$emfBuildHome="@emfBuildHome@";
-$emfName="@emfName@";
-$emfDescription="@emfDescription@";
-
-$emfsourceURL="@emfsourceURL@";
-$emfsourceFile="@emfsourceFile@";
-$emfsourceMirrorPrefixuri="@emfsource.mirror.prefixuri@";
-$emfsourceBuildHome="@emfsourceBuildHome@";
-$emfsourceName="@emfsourceName@";
-$emfsourceDescription="@emfsourceDescription@";
-
-
-$emfxsdURL="@emfxsdURL@";
-$emfxsdFile="@emfxsdFile@";
-$emfxsdMirrorPrefixuri="@emfxsd.mirror.prefixuri@";
-$emfxsdBuildHome="@emfxsdBuildHome@";
-$emfxsdName="@emfxsdName@";
-$emfxsdDescription="@emfxsdDescription@";
-
-$emfxsdsourceURL="@emfxsdsourceURL@";
-$emfxsdsourceFile="@emfxsdsourceFile@";
-$emfxsdsourceMirrorPrefixuri="@emfxsdsource.mirror.prefixuri@";
-$emfxsdsourceBuildHome="@emfxsdsourceBuildHome@";
-$emfxsdsourceName="@emfxsdsourceName@";
-$emfxsdsourceDescription="@emfxsdsourceDescription@";
-
-
-$emfvalidationURL="@emfvalidationURL@";
-$emfvalidationFile="@emfvalidationFile@";
-$emfvalidationMirrorPrefixuri="@emfvalidation.mirror.prefixuri@";
-$emfvalidationBuildHome="@emfvalidationBuildHome@";
-$emfvalidationName="@emfvalidationName@";
-$emfvalidationDescription="@emfvalidationDescription@";
-
-$emfvalidationsourceURL="@emfvalidationsourceURL@";
-$emfvalidationsourceFile="@emfvalidationsourceFile@";
-$emfvalidationsourceMirrorPrefixuri="@emfvalidationsource.mirror.prefixuri@";
-$emfvalidationsourceBuildHome="@emfvalidationsourceBuildHome@";
-$emfvalidationsourceName="@emfvalidationsourceName@";
-$emfvalidationsourceDescription="@emfvalidationsourceDescription@";
-
-
-$dtpURL="@dtpURL@";
-$dtpFile="@dtpFile@";
-$dtpMirrorPrefixuri="@dtp.mirror.prefixuri@";
-$dtpBuildHome="@dtpBuildHome@";
-$dtpName="@dtpName@";
-$dtpDescription="@dtpDescription@";
-
-
-$eclipserelengFile="@eclipserelengFile@";
-$eclipserelengURL="@eclipserelengURL@";
-$orbitthirdpartyzipFile="@orbitthirdpartyzipFile@";
-$orbitthirdpartyzipURL="@orbitthirdpartyzipURL@";
-$orbitthirdpartyzipBuildHome="@orbitthirdpartyzipBuildHome@";
-$orbitthirdpartyzipMirrorPrefixuri="@orbitthirdpartyzip.mirror.prefixuri@";
-
-
-$prereq_eclipse="true";
-$prereq_eclipseplatform="false";
-$prereq_emf="true";
-$prereq_emfxsd="true";
-$prereq_emfvalidation="false";
-$prereq_gef="true";
-$prereq_dtp="false";
-$prereq_wst="false";
-$prereq_jst="false";
-$prereq_wtp="false";
-
-
-include("miscUtil.php");
-
-
-
-
-$debugScript = false;
-$debugFunctions = false;
-
-$defaultMirrorScript="";
-$defaultWTPMirrorPrefix="./";
-
-$eclipseMirrorScript="http://www.eclipse.org/downloads/download.php?file=";
-
-// TODO: improve so this hard coding isn't required.
-// This depends on the declare script changing webtools/committers to webtools/downloads
-// And, the logic is such that if it is not mirrored, this URI is not used at all, just
-// a relative reference only
-$eclipseWTPMirrorPrefix="/webtools/committers/drops/$buildBranch/$build/";
-
-
-$mirrorScript=$defaultMirrorScript;
-$downloadprefix=$defaultWTPMirrorPrefix;
-
-
-$keytestMirrorString=$eclipseMirrorScript . "$eclipseWTPMirrorPrefix/wtp-xml-sdk-$build.zip";
-if (isMirrored($keytestMirrorString) ) {
-	$mirrorScript=$eclipseMirrorScript;
-	$downloadprefix="${mirrorScript}${eclipseWTPMirrorPrefix}";
-}
-
-if ($debugScript)  {
-	echo "inferred platform: " . getPlatform();
-}
-
-
-// our summary results handling requires php 5 (for simple xml file loading)
-// so, if not php 5, just don't display any summary results
-// This was found to be required, since some mirror our whole site (e.g. IBM)
-// and not all mirrors use PHP 5
-$displayTestSummary=false;
-if (phpversion() >= 5) {
-
-	$code_totalBundles=0;
-	$code_totalErrors=0;
-	$code_totalWarnings=0;
-	$code_totalforbiddenAccessWarningCount=0;
-	$code_totaldiscouragedAccessWarningCount=0;
-
-	$test_totalBundles=0;
-	$test_totalErrors=0;
-	$test_totalWarnings=0;
-	$test_totalforbiddenAccessWarningCount=0;
-	$test_totaldiscouragedAccessWarningCount=0;
-
-
-	$displayTestSummary=true;
-	// expecting grandTotalErrors and grandTotalTests
-	$filename = "unitTestsSummary.xml";
-	if (file_exists($filename)) {
-		$prefix = "unitTests_";
-		$unitTestsSummary = simplexml_load_file($filename);
-		foreach ($unitTestsSummary->summaryItem as $summaryItem) {
-			$name = $summaryItem->name;
-			$value = $summaryItem->value;
-			$code= "\$" . $prefix . $name . " = " . $value . ";";
-			//echo "<br />code: " . $code;
-			eval($code);
-		}
-	}
-
-	$filename = "compilelogsSummary.xml";
-	if (file_exists($filename)) {
-		$prefix = "code_";
-		$compileSummary = simplexml_load_file($filename);
-		foreach ($compileSummary->summaryItem as $summaryItem) {
-			$name = $summaryItem->name;
-			$value = $summaryItem->value;
-			$code= "\$" . $prefix . $name . " = " . $value . ";";
-			//echo "<br />code: " . $code;
-			eval($code);
-		}
-	}
-
-	$filename = "testcompilelogsSummary.xml";
-	if (file_exists($filename)) {
-		$prefix = "test_";
-		$compileSummary = simplexml_load_file($filename);
-		foreach ($compileSummary->summaryItem as $summaryItem) {
-			$name = $summaryItem->name;
-			$value = $summaryItem->value;
-			$code= "\$" . $prefix . $name . " = " . $value . ";";
-			//echo "<br />code: " . $code;
-			eval($code);
-		}
-	}
-}
-
-$incubating="false";
-
-
-
-if ($incubating) {
-	echo '<title>WTP Incubator Downloads</title>';
-}
-else {
-	echo '<title>WTP Downloads</title>';
-}
-
-
-?>
-
-
-</head>
-
-<body>
-
-
-<?php
-
-// tiny banner to remind when looking at "local" machine results
-$serverName = $_SERVER["SERVER_NAME"];
-
-if (!stristr($serverName, "eclipse.org") && !stristr($serverName,"you.are.at.eclipsecon.org")) {
-	echo '<center>
-          <p>
-          Reminder: this is <font color="#FF0000">' .
-	$serverName .
-        '</font>
-          See also
-          <a href="http://download.eclipse.org/webtools/downloads" target="_top">the live public Eclipse site</a>.
-          </p>
-          <hr />
-          </center>';
-
-}
-?>
-
-<?php if ("true" === $incubating) {
-	echo "<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH=\"100%\">";
-	echo "	<tr>";
-	echo "		<td ALIGN=left><font face=\"'Bitstream Vera',Helvetica,Arial\" size=\"+2\"><b><?php echo \"$type\";?>";
-	echo "        Build: $build</b></font></td>";
-	echo "		<td align=\"right\" rowspan=\"3\"><a";
-	echo "			href=\"http://www.eclipse.org/projects/what-is-incubation.php\"><img";
-	echo "			src=\"http://www.eclipse.org/images/egg-incubation.png\"";
-	echo "			alt=\"Incubation\" align=\"middle\" border=\"0\"></a></td>";
-
-
-	echo "	<tr valign=\"top\">";
-	echo "		<td><font size=\"-1\">" . $builddate . "</font></td>";
-	echo "	</tr>";
-	echo "	<tr valign=\"top\">";
-	echo "		<td>";
-	echo "		<p>The Eclipse Web Tools Platform (WTP) Incubator Project provides";
-	echo "		tools for development that are just getting started, or are";
-	echo "		experimental in some fashion.</p>";
-	echo "		</td>";
-	echo "	</tr>";
-	echo "</table>";
-
-} else {
-
-	echo "<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH=\"100%\">";
-	echo "	<tr>";
-	echo "		<td ALIGN=left><font face=\"'Bitstream Vera',Helvetica,Arial\" size=\"+2\"><b>$type";
-	echo "		Build: " . $build . "</b></font></td>";
-
-	echo "	<tr valign=\"top\">";
-	echo "		<td><font size=\"-1\">" . $builddate . "</font></td>";
-	echo "	</tr>";
-	echo "	<tr valign=\"top\">";
-	echo "		<td>";
-	echo "		<p>Component build from the Eclipse Web Tools Platform (WTP) Project.</p>";
-	echo "		</td>";
-	echo "	</tr>";
-	echo "</table>";
-
-} ?>
-
-<!-- ***********  Prerequisites **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-	<tr>
-		<td align="left" valign="top" bgcolor="#0080C0"><font
-			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Prerequisites
-		and Handy Extras</font></td>
-	</tr>
-	<tr>
-		<td>
-		<p>These are the prerequisites to build or run these packages. All are
-		not necessarily required, but instead some subset. Also listed are
-		some frequently needed links for committer-required packages when
-		creating new development environments, or targets to run against.</p>
-		<p>Note that WTP requires Java 5 or higher (and, for some things,
-		actually requires a JDK rather than only a JRE) even though many other
-		<a href="http://www.eclipse.org/downloads/">Eclipse Projects</a> can
-		run with <a href="http://www.eclipse.org/downloads/moreinfo/jre.php">other
-		JRE levels</a>.</p>
-		<p></p>
-		</td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=1 cellpadding=1 width="90%" align="center">
-
-		<?php
-		if ("true" === $prereq_eclipseplatform) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td width=\"40%\">Eclipse Platform</td>";
-
-
-			//customize page depending on user's browser/platform, if we can detect it
-			$usersPlatform = getPlatform();
-			// assume windows by default, since likely most frequent, even for cases where
-			// platform is "unknown". I've noticed Opera reports 'unknown' :(
-			$recommendedFile=$eclipseplatformfilewindows;
-			if (strcmp($usersPlatform,"linux")== 0) {
-				$recommendedFile=$eclipseplatformfilelinux;
-			} else if (strcmp($usersPlatform,"mac") == 0) {
-				$recommendedFile=$eclipseplatformfilemacosx;
-			}
-
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $eclipseplatformBuildURL . "\">appropriate platform</a>";
-			echo " or <a href=\"" . $eclipseplatformBuildHome . "\">equivalent</a></td>";
-
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_eclipse) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td width=\"40%\">Eclipse SDK (Platform, JDT)</td>";
-
-
-			//customize page depending on user's browser/platform, if we can detect it
-			$usersPlatform = getPlatform();
-			// assume windows by default, since likely most frequent, even for cases where
-			// platform is "unknown". I've noticed Opera reports 'unknown' :(
-			$recommendedFile=$eclipsefilewindows;
-			if (strcmp($usersPlatform,"linux")== 0) {
-				$recommendedFile=$eclipsefilelinux;
-			} else if (strcmp($usersPlatform,"mac") == 0) {
-				$recommendedFile=$eclipsefilemacosx;
-			}
-
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $eclipseBuildURL . "\">appropriate platform</a>";
-			echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_emf) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $emfName . "&nbsp;" . $emfDescription ;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $emfMirrorPrefixuri, $emfURL, $emfFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $emfBuildHome . "\">equivalent</a></td>";
-			echo " </tr>";
-		}
-		?>
-
-
-		<?php
-		if ("true" === $prereq_emfxsd) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $emfxsdName . "&nbsp;" . $emfxsdDescription ;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdMirrorPrefixuri, $emfxsdURL, $emfxsdFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $emfxsdBuildHome . "\">equivalent</a></td>";
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_emfvalidation) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $emfvalidationName  . "&nbsp;" . $emfvalidationDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $emfvalidationMirrorPrefixuri, $emfvalidationURL, $emfvalidationFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $emfvalidationBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_gef) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $gefName  . "&nbsp;" . $gefDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $gefMirrorPrefixuri, $gefURL, $gefFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $gefBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_dtp) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $dtpName . "&nbsp;" . $dtpDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $dtpMirrorPrefixuri, $dtpURL, $dtpFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $dtpBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_wst) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $wstName . "&nbsp;" . $wstDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $wstMirrorPrefixuri, $wstURL, $wstFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $wstBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_jst) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $jstName . "&nbsp;" . $jstDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $jstMirrorPrefixuri, $jstURL, $jstFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $jstBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-		<?php
-		if ("true" === $prereq_wtp) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $wtpName . "&nbsp;" . $wtpDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $wtpMirrorPrefixuri, $wtpURL, $wtpFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $wtpBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-			<tr valign="middle">
-				<td width="10%"></td>
-				<td colspan="2">
-				<hr />
-				</td>
-			</tr>
-
-
-
-			<?php
-			if ("true" === $prereq_emf) {
-				echo "<tr valign=\"top\">";
-				echo "<td width=\"10%\"></td>";
-				echo "<td>";
-				echo $emfsourceName . "&nbsp;" . $emfsourceDescription;
-				echo "</td> ";
-				echo "<td align=\"right\">";
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfsourceMirrorPrefixuri, $emfsourceURL, $emfsourceFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $emfsourceBuildHome . "\">equivalent</a></td>";
-				echo "</tr>";
-			}
-			?>
-			<?php
-			if ("true" === $prereq_emfxsd) {
-				echo "<tr valign=\"top\">";
-				echo "<td width=\"10%\"></td>";
-				echo "<td>";
-				echo $emfxsdsourceName . "&nbsp;" . $emfxsdsourceDescription;
-				echo "</td> ";
-				echo "<td align=\"right\">";
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdsourceMirrorPrefixuri, $emfxsdsourceURL, $emfxsdsourceFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $emfxsdsourceBuildHome . "\">equivalent</a></td>";
-				echo "</tr>";
-			}
-			?>
-
-			<?php
-			if ("true" === $prereq_emfvalidation) {
-				echo "<tr valign=\"top\">";
-				echo "<td width=\"10%\"></td>";
-				echo "<td>";
-				echo $emfvalidationsourceName . "&nbsp;" . $emfvalidationsourceDescription;
-				echo "</td> ";
-				echo "<td align=\"right\">";
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfvalidationsourceMirrorPrefixuri, $emfvalidationsourceURL, $emfvalidationsourceFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $emfvalidationsourceBuildHome . "\">equivalent</a></td>";
-				echo "</tr>";
-			}
-			?>
-
-			<?php
-			if (true) {
-				echo "<tr valign=\"top\">";
-				echo "<td width=\"10%\"></td>";
-				echo "<td>";
-				echo "Eclipse Test Framework (required only for Automated JUnit tests)";
-				echo "</td> ";
-				echo "<td align=\"right\">";
-
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $testURL, $testFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-				echo "</tr>";
-			}
-			?>
-
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>Eclipse releng tool (required only for committers to more easily
-				"release" code to a build)</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipserelengURL, $eclipserelengFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>Third Party code from Orbit. Not required and is currently much
-				more than needed for WTP, but some committers like using to create a
-				PDE target.</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $orbitthirdpartyzipMirrorPrefixuri, $orbitthirdpartyzipURL, $orbitthirdpartyzipFile,$eclipseFSpathPrefix);
-				echo " or <a href=\"" . $orbitthirdpartyzipBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-		</table>
-		</td>
-	</tr>
-</table>
-
-<!-- ***********  WTP **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-	<tr>
-		<td align=left valign=top colspan="5" bgcolor="#0080C0"><font
-			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF"> Web Tools
-		Platform</font></td>
-	</tr>
-
-	<tr>
-		<td align="left" valign="top" colspan="5">
-		<p>The Zip files includes the features and plugins for XML Development Tools.</p>
-		</td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
-
-
-			<tr>
-				<td align="left" valign="top" width="10%"><b>Minimal</b></td>
-				<td align="left" valign="top">
-				<p>Executable code only.</p>
-				</td>
-				<?php
-				$zipfilename="wtp-xml-${build}";
-				$filename=$zipfilename.".zip";
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription="xml";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-				?>
-			</tr>
-
-			<tr>
-				<td align="left" valign="top" width="10%"><b>SDK</b></td>
-				<td align="left" valign="top">
-				<p>Executable code and source code.</p>
-				</td>
-				<?php
-				$zipfilename="wtp-xml-sdk-${build}";
-				$filename=$zipfilename.".zip";
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription="xml sdk";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-				?>
-			</tr>
-			<tr>
-				<td align="left" valign="top" width="10%"><b>Tests</b></td>
-				<td align="left" valign="top">
-				<p>Unit tests.</p>
-				</td>
-				<?php
-				$zipfilename="wtp-xml-tests-${build}";
-				$filename=$zipfilename.".zip";
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription="xml tests";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-				?>
-			</tr>
-		</table>
-		</td>
-	
-	
-	<tr>
-
-</table>
-
-
-
-
-
-
-
-<!-- ***********  Build Status **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-	<tr>
-		<td align=left valign=top bgcolor="#0080C0"><font
-			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Status, tests
-		and other interesting details</font></td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
-
-			<tr>
-				<td><!-- 
-				Its silly to always display 'Build notes', but hard to 
-				compute if required or not. 
-				<a href="buildNotes.php">Build notes</a> <br /> 
-				--> <a href="directory.txt">map files</a> <br />
-				<?php
-
-				if ($displayTestSummary) {
-
-
-					if (isset($unitTests_grandTotalErrors)) {
-						$errorColor="green";
-						if ($unitTests_grandTotalErrors > 0) {
-							$errorColor="red";
-						}
-						echo "<a href=\"testResults.php\">Unit test results</a>&nbsp;";
-						echo "<img src=\"junit_err.gif\"/><font color=\"" . $errorColor . "\">" . $unitTests_grandTotalErrors . "</font>&nbsp;&nbsp;Total: " . $unitTests_grandTotalTests;
-					}
-					else {
-						// we hardly ever "pend" anymore ... abscense usually signifies no tests or a build error.
-						echo "<br /><font color=\"orange\">Unit tests don't exists, are pending, or there's a build error.</font>";
-						//&nbsp;&nbsp;<img src=\"pending.gif\"/>";
-					}
-
-					echo "<br />";
-					echo "<a href=\"compileResults.php\">Compile logs: Code Bundles</a>";
-
-					echo "&nbsp;&nbsp;($code_totalBundles)&nbsp;&nbsp;";
-					echo "<img src=\"compile_err.gif\"/><font color=red>$code_totalErrors</font>&nbsp;";
-					echo "<img src=\"compile_warn.gif\"/><font color=orange>$code_totalWarnings</font>&nbsp;";
-					echo "<img src=\"access_err.gif\"/><font color=red>$code_totalforbiddenAccessWarningCount</font>&nbsp;";
-					echo "<img src=\"access_warn.gif\"/><font color=orange>$code_totaldiscouragedAccessWarningCount</font>&nbsp;";
-
-					echo "<br />";
-					echo "<a href=\"testCompileResults.php\">Compile logs: Test Bundles</a>";
-
-					echo "&nbsp;&nbsp;($test_totalBundles)&nbsp;&nbsp;";
-					echo "<img src=\"compile_err.gif\"/><font color=red>$test_totalErrors</font>&nbsp;";
-					echo "<img src=\"compile_warn.gif\"/><font color=orange>$test_totalWarnings</font>&nbsp;";
-					echo "<img src=\"access_err.gif\"/><font color=red>$test_totalforbiddenAccessWarningCount</font>&nbsp;";
-					echo "<img src=\"access_warn.gif\"/><font color=orange>$test_totaldiscouragedAccessWarningCount</font>&nbsp;";
-				}
-
-				?> <br />
-
-				<?php
-				if (file_exists("versioningReportName.php")) {
-					include "versioningReportName.php";
-					$fname="${versionReportFilename}.html";
-					if (file_exists($fname)) {
-						echo "<br /> <a href='$fname'>Versioning Information</a>";
-					}
-}
-?> <?php
-echo "<br />";
-if (file_exists("./apiresults/api-progress.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-progress.html\">API Progress Report</a>";
-}
-if (file_exists("./apiresults/api-info-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-info-summary.html\">APIs Defined by Each Component</a>";
-}
-if (file_exists("./apiresults/api-ref-compatibility.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-ref-compatibility.html\">Adopter Breakage Report</a>";
-}
-if (file_exists("./apiresults/api-violation-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-violation-summary.html\">API Violations</a>";
-}
-if (file_exists("./apiresults/component-api-violation-all.html"))
-{
-	echo "<br /> <a href=\"apiresults/component-api-violation-all.html\">Non-API dependencies</a>";
-}
-if (file_exists("./apiresults/api-tc-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-tc-summary.html\">API Test Coverage</a>";
-}
-if (file_exists("./apiresults/api-javadoc-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-javadoc-summary.html\">API Javadoc Coverage</a>";
-}
-if (file_exists("./apiresults/api-tc-summary.html"))
-{
-	echo "<br /><br /> <a href=\"apiresults/full_test_coverage/api-tc-summary.html\">Test Coverage for All Classes and Methods</a>";
-}
-?> <?php
-if (file_exists("./perfresults/graph/performance.php"))
-{
-	echo "<br />";
-	echo "<br /> <a href=\"perfresults/graph/performance.php\">Performance Results</a>";
-	echo "<br />";
-}
-?></td>
-			</tr>
-
-
-		</table>
-		</td>
-	</tr>
-</table>
-
-
-
-<!-- footer -->
-<center>
-<hr>
-<p>All downloads are provided under the terms and conditions of the <a
-	href="http://www.eclipse.org/legal/notice.html">Eclipse.org Software
-User Agreement</a> unless otherwise specified.</p>
-
-<p>If you have problems downloading the drops, contact the <font
-	face="'Bitstream Vera',Helvetica,Arial" size="-1"><a
-	href="mailto:webmaster@eclipse.org">webmaster</a></font>.</p>
-
-</center>
-<!-- end footer -->
-
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/xml.site/templateFiles/performance.template b/releng.wtpbuilder/distribution/xml.site/templateFiles/performance.template
deleted file mode 100644
index f8abfbc..0000000
--- a/releng.wtpbuilder/distribution/xml.site/templateFiles/performance.template
+++ /dev/null
@@ -1,62 +0,0 @@
-<P>
-  <A NAME="unit"></A>
-  * Missing reference data. Build used for comparison specified in ending parenthesis.
-  <BR>green: faster, less memory
-  <BR>red: slower, more memory
-  <BR>x axis: difference between current value and baseline value as percentage
-  <BR>
-</P>
-
-<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 grouped by scenario prefix
-    </font></b></td>
-  </tr>
-</table>
-
-<?php
-  $dir = dir(".");
-  while ($anEntry = $dir->read())
-  {
-    if ($anEntry != "global.php" && substr($anEntry, strlen($anEntry) - 4) == ".php")
-    {
-      echo "<a href=\"$anEntry\">$anEntry</a><br>";
-    }
-  }
-?>
-
-<table border=0 cellspacing=5 cellpadding=2 width="100%" >
-  <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 JUnit test results for <?php echo "$buildType $buildName"; ?>
-    </font></b></td>
-  </tr>
-</table>
-
-<font color="#FFFFFF" face="Arial,Helvetica">
-<table border=1" width="100%">
-  <tr>
-    <td width="100%"><b>Tests Performed</b></td>
-  </tr>
-  <?php
-    $xmlDir = dir("../xml");
-    while ($xmlEntry = $xmlDir->read())
-    {
-      if ($xmlEntry != "." && $xmlEntry != "..")
-      {
-        $htmlEntry = substr($xmlEntry, 0, strlen($xmlEntry) - 3) . "html";
-        echo "<tr>";
-        echo "<td><a href=\"../html/$htmlEntry\">$htmlEntry</a></td>";
-        echo "</tr>";
-      }
-    }
-  ?>
-</table>
-</html>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/xml.site/templateFiles/siteEnablingFeatures.xml b/releng.wtpbuilder/distribution/xml.site/templateFiles/siteEnablingFeatures.xml
deleted file mode 100644
index cc3ed81..0000000
--- a/releng.wtpbuilder/distribution/xml.site/templateFiles/siteEnablingFeatures.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-    <description> The update site contains the enabling features. </description>
-    <category-def
-        name="Enabling Features"
-        label="Enabling Features">
-        <description> This category contains features used by several
-            projects that enable some functionality, but which by
-            themselves are not very interesting. </description>
-    </category-def>
-</site>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/xml.site/templateFiles/siteWTP.xml b/releng.wtpbuilder/distribution/xml.site/templateFiles/siteWTP.xml
deleted file mode 100644
index f94e83f..0000000
--- a/releng.wtpbuilder/distribution/xml.site/templateFiles/siteWTP.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site
-    pack200="true"
-    mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/webtools/testUpdates/site.xml&amp;format=xml"
-    digestURL="http://download.eclipse.org/webtools/testUpdates/">
-    <description
-        url="http://download.eclipse.org/webtools/declaredUpdates/index.html"> The update site contains the features of the of Eclipse Web
-        Tools Project (WTP) </description>
-    <feature
-        url="features/org.eclipse.wst_@org.eclipse.wst@.jar"
-        id="org.eclipse.wst"
-        version="@org.eclipse.wst@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.wst.sdk_@org.eclipse.wst.sdk@.jar"
-        id="org.eclipse.wst.sdk"
-        version="@org.eclipse.wst.sdk@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jst_@org.eclipse.jst@.jar"
-        id="org.eclipse.jst"
-        version="@org.eclipse.jst@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jst.sdk_@org.eclipse.jst.sdk@.jar"
-        id="org.eclipse.jst.sdk"
-        version="@org.eclipse.jst.sdk@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jpt.feature_@org.eclipse.jpt.feature@.jar"
-        id="org.eclipse.jpt.feature"
-        version="@org.eclipse.jpt.feature@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jpt_sdk.feature_@org.eclipse.jpt_sdk.feature@.jar"
-        id="org.eclipse.jpt_sdk.feature"
-        version="@org.eclipse.jpt_sdk.feature@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <category-def
-        name="Web Tools Platform (WTP)"
-        label="Web Tools Platform (WTP)">
-        <description> This category contains the features of the Eclipse
-            Web Tools Project (WTP). </description>
-    </category-def>
-</site>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/xml.site/templateFiles/testCompileResults.php.template b/releng.wtpbuilder/distribution/xml.site/templateFiles/testCompileResults.php.template
deleted file mode 100644
index 42d6f65..0000000
--- a/releng.wtpbuilder/distribution/xml.site/templateFiles/testCompileResults.php.template
+++ /dev/null
@@ -1,76 +0,0 @@
-<html>
-<head>
-
-<?php
-        $parts = explode("/", getcwd());
-        $parts2 = explode("-", $parts[count($parts) - 1]);
-        $buildName = $parts2[1];
-
-        echo "<title>Compile Logs: Test Bundles for $buildName</title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2em;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:Bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-}
-</style>
-</head>
-<body>
-
-<?php
-        echo "<h1>Compile Logs: Test Bundles for $buildName</h1>";
-?>
-
-
-<table id=tabledata align = "center" width="75%" border="1">
-  <tr>
-    <td class="bold" align="center">Compile Logs</td>
-    <td class="bold" align="center">Compile Errors</td>
-    <td class="bold" align="center">Compiler Warnings</td>
-    <td class="bold" align="center">Access Violations</td>
-    <td class="bold" align="center">Access Warnings</td>
-  </tr>
-
-  %compilelogs%
-
-</table>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/xml.site/templateFiles/testResults.php.template b/releng.wtpbuilder/distribution/xml.site/templateFiles/testResults.php.template
deleted file mode 100644
index ddad0b7..0000000
--- a/releng.wtpbuilder/distribution/xml.site/templateFiles/testResults.php.template
+++ /dev/null
@@ -1,119 +0,0 @@
-<html>
-<head>
-
-<?php
-	$parts = explode("/", getcwd());
-	$parts2 = explode("-", $parts[count($parts) - 1]);
-	$buildName = $parts2[1];
-	
-	echo "<title>Test Results for $buildName </title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2em;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:Bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-
-}
-</style>
-
-
-</head>
-<body>
-<p><b><font face="Verdana" size="+3">Test Results</font></b> </p>
-
-<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">
-    Unit Test Results for <?php echo "$buildName"; ?> on Various Platforms and JRE</font></b></td>
-  </tr>
-</table>
-
-<?php
-if (file_exists("testResults"))
-{
-$dir = dir("testResults");
-while ($anEntry = $dir->read())
-{
-  if ($anEntry != "." && $anEntry != ".." && $anEntry != "consolelogs" && $anEntry != "html" && $anEntry != "xml")
-  {
-    $link = "testResults/".$anEntry."/results/index.php";
-    echo "<p><a href=\"$link\">$anEntry</a></p>";
-  }
-}
-}
-?>
-
-<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">Unit 
-      Test Results for <?php echo "$buildName"; ?> </font></b></td>
-  </tr>
-</table>
-
-<table id=tableunittestdata align = "center" width="75%" border="1">
-  <tr> 
-    <td class="bold" align="center" width="70%">Test Suite</td>
-    <td class="bold" align="center" width="10%">Errors &amp; Failures</td>
-    <td class="bold" align="center" width="10%">Total Tests</td>
-    <td class="bold" align="center" width="10%">Total Time (s)</td>
-  </tr>
-  
-  
-  %testresults%
-  
-</table>
-<p></p>
-<br>
-<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"> 
-      Console output logs 
-      <?php echo "$buildName"; ?>
-      </font></b></td>
-  </tr>
-</table>
-<br>
-These <a href="consoleLogs.php">logs</a> contain the console output captured while 
-running the JUnit automated tests. <br>
-<br>
-
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/xml.site/transformReportToHTML.xml b/releng.wtpbuilder/distribution/xml.site/transformReportToHTML.xml
deleted file mode 100644
index b72f6cd..0000000
--- a/releng.wtpbuilder/distribution/xml.site/transformReportToHTML.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-    name="xsl-conversion"
-    default="main"
-    basedir=".">
-    <target
-        name="main"
-        description="example.@dot.xml to produce example.@dot.html">
-        <xslt
-            destdir="${resultDir}/compilelogs"
-            scanincludeddirectories="true"
-            style="compilerXMLOutputToHTML.xsl"
-            force="true">
-            <fileset
-                dir="${resultDir}/compilelogs"
-                includes="**/*.xml"/>
-        </xslt>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/xml.tests/build.xml b/releng.wtpbuilder/distribution/xml.tests/build.xml
deleted file mode 100644
index bd2ef55..0000000
--- a/releng.wtpbuilder/distribution/xml.tests/build.xml
+++ /dev/null
@@ -1,330 +0,0 @@
-<project
-    name="Build specific targets and properties"
-    default="runTest">
-    <!--
-        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"/>
-    <fail
-        message="testRoot must be set for this task"
-        unless="testRoot"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-
-
-    <!-- 
-        typcially already set, but in case of standalone tests, may not
-        be
-    -->
-    <property
-        name="buildLabel"
-        value="${buildType}-${buildId}-${timestamp}"/>
-
-
-    <!-- 
-	   Steps to do after the build is done. 
-	 -->
-    <target
-        name="test">
-        <dirname
-            file="${ant.file}"
-            property="currentDirectory"/>
-        <ant
-            antfile="${ant.file}"
-            target="runTest"
-            dir="${currentDirectory}"/>
-    </target>
-
-    <!-- 
-	  Steps to do to test the build results
-   -->
-    <target
-        name="runTest">
-        <dirname
-            file="${ant.file}"
-            property="test.component.dir"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-        <property
-            file="${buildDirectory}/label.properties"/>
-        <property
-            file="${wtp.builder.home}/build.properties"/>
-        <fail
-            message="testRoot must be set for this task"
-            unless="testRoot"/>
-        <mkdir
-            dir="${testRoot}"/>
-
-        <!-- if results already exist, delete them -->
-        <delete
-            dir="${testRoot}/results"
-            failOnError="false"/>
-        <mkdir
-            dir="${testRoot}/results"/>
-        <mkdir
-            dir="${testRoot}/results/consolelogs"/>
-        <copy
-            todir="${testRoot}"
-            overwrite="true">
-            <fileset
-                dir="${test.component.dir}/testScripts"/>
-        </copy>
-        <echo
-            message="BASEOS: ${env.BASEOS}   BASEWS: ${env.BASEWS}   BASEARCH: ${env.BASEARCH} "/>
-        <ant
-            antfile="${test.component.dir}/testdependency.xml"
-            target="get">
-            <property
-                name="dependency.properties"
-                value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-            <property
-                name="base.install.dir"
-                value="${testRoot}"/>
-        </ant>
-        <antcall
-            target="unzipTests"/>
-        <antcall
-            target="runTestEclipse">
-            <param
-                name="testTarget"
-                value="all"/>
-        </antcall>
-        <antcall
-            target="postRunTestEclipse">
-            <param
-                name="testTarget"
-                value="all"/>
-        </antcall>
-    </target>
-    <target
-        name="unzipTests">
-        <!--
-            unzip the builds and junit tests we use 'unzip' here, so we
-            can continue on error, if desired. (such as if zip was not
-            created, due to other failures or options).
-        -->
-        <echo
-            message="installing sdk"/>
-        <exec
-            dir="${buildDirectory}/${buildLabel}"
-            executable="unzip"
-            failonerror="true">
-            <arg
-                line="-o -qq  wtp-xml-sdk-${buildLabel}.zip -d ${testRoot}${dropinsFolder}"/>
-        </exec>
-        <echo
-            message="installing tests"/>
-        <exec
-            dir="${buildDirectory}/${buildLabel}"
-            executable="unzip"
-            failonerror="false">
-            <arg
-                line="-o -qq wtp-xml-tests-${buildLabel}.zip -d ${testRoot}${dropinsFolder}"/>
-        </exec>
-    </target>
-    <!--
-        time out may need to be set/adjust for api or performance tests?
-        This testTimeLimit is the whole, overall limit on tests. There's
-        a shorter one for individual suites. some common values, of
-        milliseconds to more recognizable units: 7200000: 2 hours
-        3600000: 1 hour 1800000: 30 minutes 600000: 10 minutes
-    -->
-    <property
-        name="testTimeLimit"
-        value="7200000"/>
-    <property
-        name="testFailOnError"
-        value="false"/>
-    <target
-        name="runTestEclipse"
-        description="Run our JUnit's within an instance of antRunner">
-        <property
-            name="test-vm"
-            value="${env.JAVA_6_HOME}/bin/java"/>
-
-        <property
-            name="vmargs"
-            value="-Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm}  -Dperf.buildId=${buildType}${date}-${time}"/>
-        <!--
-            set path to eclipse folder. If local folder, use '.';
-            otherwise, use c:\path\to\eclipse or /path/to/eclipse/
-        -->
-        <property
-            name="eclipse.home"
-            value="${testRoot}"/>
-        <echo
-            message="Running junits"/>
-        <!--
-            Remember: using -debug for org.eclipse.ant.core.antRunner
-            produces ant debug info to be output ... which is a TON of
-            stuff
-        -->
-        <echo
-            message="eclipse.launcher: ${eclipse.launcher}"/>
-        <java
-            taskname="unit-test-masterprocess"
-            fork="true"
-            resultProperty="wtpmasterjunitresult"
-            failonerror="false"
-            timeout="${testTimeLimit}"
-            dir="${testRoot}/eclipse"
-            jvm="${env.JAVA_6_HOME}/bin/java"
-            classname="org.eclipse.equinox.launcher.Main">
-            <classpath>
-                <fileset
-                    dir="${testRoot}/eclipse/plugins">
-                    <include
-                        name="org.eclipse.equinox.launcher_*.jar"/>
-                </fileset>
-            </classpath>
-            <jvmarg
-                value="-Xmx512m"/>
-            <jvmarg
-                value="-Dosgi.ws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dosgi.os=${env.BASEOS}"/>
-            <jvmarg
-                value="-Dosgi.arch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-Dws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dos=${env.BASEOS}"/>
-            <jvmarg
-                value="-Darch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-Dnoclean=true"/>
-            <jvmarg
-                value="-DbuildBranch=${buildBranch}"/>
-            <jvmarg
-                value="-DbuildType=${buildType}"/>
-            <jvmarg
-                value="-DbuildId=${buildId}"/>
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <jvmarg
-                value="-Dprojectname=${projectname}"/>
-            <arg
-                value="-nosplash"/>
-            <arg
-                value="-consolelog"/>
-            <arg
-                value="-data"/>
-            <arg
-                value="${testRoot}/overallTestWorkspace"/>
-            <arg
-                value="-application"/>
-            <arg
-                value="org.eclipse.ant.core.antRunner"/>
-            <arg
-                value="-file"/>
-            <arg
-                value="${testRoot}/test.xml"/>
-            <arg
-                value="-logger"/>
-            <arg
-                value="org.apache.tools.ant.DefaultLogger"/>
-            <env
-                key="DISPLAY"
-                value="${env.DISPLAY}"/>
-            <redirector
-                output="${testRoot}/results/fullOutput.txt"
-                error="${testRoot}/results/fullErrorLog.txt"/>
-            <sysproperty
-                key="build.home"
-                value="${env.BUILD_HOME}"/>
-            <sysproperty
-                key="buildDirectory"
-                value="${buildDirectory}"/>
-            <sysproperty
-                key="buildLabel"
-                value="${buildLabel}"/>
-            <sysproperty
-                key="baseLocation"
-                value="${baseLocation}"/>
-            <sysproperty
-                key="testRoot"
-                value="${testRoot}"/>
-            <sysproperty
-                key="testDir"
-                value="${testRoot}"/>
-            <sysproperty
-                key="perf.buildId"
-                value="${buildType}${date}-${time}"/>
-            <sysproperty
-                key="eclipseBuilderDirectory"
-                value="${pde.builder.path}"/>
-            <sysproperty
-                key="buildLabel"
-                value="${buildLabel}"/>
-        </java>
-        <echo
-            message="wtpmasterjunitresult ${wtpmasterjunitresult}"/>
-    </target>
-    <target
-        name="postRunTestEclipse">
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/consolelogs/testLogs"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results">
-                <include
-                    name="*output.txt"/>
-            </fileset>
-        </copy>
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/consolelogs/testSysErrorLogs"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results">
-                <include
-                    name="*error.txt"/>
-            </fileset>
-        </copy>
-        <copy
-            file="${testRoot}/results/fullOutput.txt"
-            toDir="${buildDirectory}/${buildLabel}/testResults/consolelogs/full"
-            overwrite="true"
-            failonerror="false">
-        </copy>
-        <copy
-            file="${testRoot}/results/fullErrorLog.txt"
-            toDir="${buildDirectory}/${buildLabel}/testResults/consolelogs/full"
-            overwrite="true"
-            failonerror="false">
-        </copy>
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/xml"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results/xml">
-                <include
-                    name="*.xml"/>
-            </fileset>
-        </copy>
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/html"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results/html">
-                <include
-                    name="*.html"/>
-            </fileset>
-        </copy>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/xml.tests/standaloneTest.xml b/releng.wtpbuilder/distribution/xml.tests/standaloneTest.xml
deleted file mode 100644
index e1ec46f..0000000
--- a/releng.wtpbuilder/distribution/xml.tests/standaloneTest.xml
+++ /dev/null
@@ -1,257 +0,0 @@
-<project
-    default="main"
-    basedir=".">
-    <!--
-        Required inputs: build.home buildType buildId timestamp
-        build.stream [optional] build.committers [optional] testTarget
-        [optional]
-    -->
-    <property
-        environment="env"/>
-    <target
-        name="main">
-        <property
-            file="${build.home}/${env.RELENG_BUILDER}/build.properties"/>
-        <property
-            name="local.cache.dir"
-            value="${env.LOCAL_PREREQS_CACHE}"/>
-        <property
-            name="testRoot"
-            value="${build.home}/testRoot"/>
-        <delete
-            dir="${testRoot}"
-            failonerror="false"/>
-        <mkdir
-            dir="${testRoot}"/>
-        <antcall
-            target="getReleng"/>
-        <property
-            file="${testRoot}/${env.RELENG}/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="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="${testRoot}"
-            command="export"
-            tag="${releng.tag}"
-            quiet="${env.CVS_QUIET}"
-            reallyquiet="${env.CVS_REALLY_QUIET}"/>
-    </target>
-    <target
-        name="getDependencies">
-        <ant
-            antfile="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.tests/testdependency.xml">
-            <property
-                name="base.install.dir"
-                value="${testRoot}"/>
-            <property
-                name="dependencyTargets"
-                value="${build.home}/${env.RELENG_BUILDER}/scripts/dependency/build.xml"/>
-        </ant>
-        <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}.zip"/>
-        </antcall>
-        <antcall
-            target="getAndInstallWTP">
-            <param
-                name="file"
-                value="wtp-wst-Automated-Tests-${buildType}-${buildId}-${timestamp}.zip"/>
-        </antcall>
-        <antcall
-            target="getAndInstallWTP">
-            <param
-                name="file"
-                value="wtp-jst-Automated-Tests-${buildId}.zip"/>
-        </antcall>
-        <antcall
-            target="getAndInstallWTP">
-            <param
-                name="file"
-                value="wtp-jst-Automated-Tests-${buildType}-${buildId}-${timestamp}.zip"/>
-        </antcall>
-    </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="${testRoot}"
-            overwrite="true"/>
-    </target>
-    <target
-        name="run">
-        <mkdir
-            dir="${testRoot}/results/consolelogs"/>
-        <copy
-            todir="${testRoot}"
-            flatten="true"
-            overwrite="true">
-            <fileset
-                dir="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.tests/testScripts"/>
-        </copy>
-        <ant
-            antfile="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.tests/build.xml"
-            target="runTestEclipse">
-            <property
-                name="testRoot"
-                value="${testRoot}"/>
-            <property
-                name="testTarget"
-                value="all"/>
-        </ant>
-        <copy
-            file="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.tests/templateFiles/index.php"
-            todir="${testRoot}/results"
-            overwrite="true"/>
-    </target>
-    <target
-        name="upload"
-        if="login">
-        <mkdir
-            dir="${build.home}/archives"/>
-        <zip
-            destfile="${build.home}/archives/${buildType}-${buildId}-${timestamp}.zip"
-            basedir="${build.home}/testRoot/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}-${timestamp}/testResults/${config}"
-            value="${upload.path.1}/drops/${build.stream}/${buildType}-${buildId}-${timestamp}/testResults/${config}">
-            <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 ./testRoot/results ${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="testRoot"
-            value="${build.home}/testRoot"/>
-        <delete
-            dir="${testRoot}"
-            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/xml.tests/templateFiles/index.php b/releng.wtpbuilder/distribution/xml.tests/templateFiles/index.php
deleted file mode 100644
index a42c883..0000000
--- a/releng.wtpbuilder/distribution/xml.tests/templateFiles/index.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<html>
-<head>
-
-<?php
-$parts = explode("/", realpath(".."));
-$label = $parts[count($parts) - 1];
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-</head>
-<body>
-<p><b><font face="Verdana" size="+3">Test Results</font></b></p>
-<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">Unit Test Results for <?php echo "$label"; ?>
-		</font></b></td>
-	</tr>
-</table>
-<p></p>
-<table border="0">
-</table>
-
-<table width="77%" border="1">
-	<tr>
-		<td width="81%"><b>Tests Performed</b></td>
-		<td width="19%"><b>Errors &amp; Failures</b></td>
-	</tr>
-
-	<?
-	$dir = dir("html");
-	while ($anEntry = $dir->read())
-	{
-		if ($anEntry != "." && $anEntry != "..")
-		{
-			$link = "html/".$anEntry;
-			$xml = "xml/".substr($anEntry, 0, strlen($anEntry)-4)."xml";
-			$count = 0;
-			$fileHandle = fopen($xml, "r");
-			while (!feof($fileHandle))
-			{
-				$aLine = fgets($fileHandle, 4096); // Length parameter only optional after 4.2.0
-				$count = $count + substr_count($aLine, '<error');
-			}
-			fclose($fileHandle);
-			if ($count > 0)
-			{
-				echo "<tr><td><a href=\"$link\"><b><font color=\"red\">";
-				echo "$anEntry";
-				echo "</font></b></a></td>";
-				echo "<td><b><font color=\"red\">$count</font></b></td></tr>";
-			}
-			else
-			{
-				echo "<tr><td><a href=\"$link\">";
-				echo "$anEntry";
-				echo "</a></td>";
-				echo "<td>$count</td></tr>";
-			}
-		}
-	}
-	?>
-
-</table>
-<p></p>
-<br>
-<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"> Console output logs <?php echo "$label"; ?>
-		</font></b></td>
-	</tr>
-</table>
-<br>
-These
-<a href="consolelogs/wtptestlog.txt">logs</a>
-contain the console output captured while running the JUnit automated
-tests.
-<br>
-<br>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/xml.tests/testScripts/JUNIT.XSL b/releng.wtpbuilder/distribution/xml.tests/testScripts/JUNIT.XSL
deleted file mode 100644
index 9cdd80e..0000000
--- a/releng.wtpbuilder/distribution/xml.tests/testScripts/JUNIT.XSL
+++ /dev/null
@@ -1,703 +0,0 @@
-<xsl:stylesheet
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="1.0">
-    <xsl:output
-        method="html"
-        indent="yes"/>
-    <xsl:decimal-format
-        decimal-separator="."
-        grouping-separator=","/>
-    <xsl:template
-        match="testsuites">
-        <HTML>
-            <HEAD>
-                <style
-                    type="text/css"> body { font:normal 68%
-                    verdana,arial,helvetica; color:#000000; } table tr
-                    td, table tr th { font-size: 68%; } table.details tr
-                    th{ font-weight: bold; text-align:left;
-                    background:#a6caf0; } table.details tr td{
-                    background:#eeeee0; } p { line-height:1.5em;
-                    margin-top:0.5em; margin-bottom:1.0em; } h1 {
-                    margin: 0px 0px 5px; font: 165%
-                    verdana,arial,helvetica } h2 { margin-top: 1em;
-                    margin-bottom: 0.5em; font: bold 125%
-                    verdana,arial,helvetica } h3 { margin-bottom: 0.5em;
-                    font: bold 115% verdana,arial,helvetica } h4 {
-                    margin-bottom: 0.5em; font: bold 100%
-                    verdana,arial,helvetica } h5 { margin-bottom: 0.5em;
-                    font: bold 100% verdana,arial,helvetica } h6 {
-                    margin-bottom: 0.5em; font: bold 100%
-                    verdana,arial,helvetica } .Error { font-weight:bold;
-                    color:red; } .Failure { font-weight:bold;
-                    color:purple; } .Properties { text-align:right; } </style>
-                <script
-                    language="JavaScript">
-                    var TestCases = new Array(); var cur;
-                    <xsl:for-each
-                        select="./testsuite">
-                        <xsl:apply-templates
-                            select="properties"/>
-                    </xsl:for-each>
-                </script>
-                <script
-                    language="JavaScript"><![CDATA[
-        function displayProperties (name) {
-          var win = window.open('','JUnitSystemProperties','scrollbars=1,resizable=1');
-          var doc = win.document.open();
-          doc.write("<html><head><title>Properties of " + name + "</title>");
-          doc.write("<style>")
-          doc.write("body {font:normal 68% verdana,arial,helvetica;	color:#000000; }");
-          doc.write("table tr td, table tr th { font-size: 68%; }");
-          doc.write("table.properties { border-collapse:collapse; border-left:solid 1 #cccccc; border-top:solid 1 #cccccc; padding:5px; }");
-          doc.write("table.properties th { text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#eeeeee; }");
-          doc.write("table.properties td { font:normal; text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#fffffff; }");
-          doc.write("h3 { margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica }");
-          doc.write("</style>");
-          doc.write("</head><body>");
-          doc.write("<h3>Properties of " + name + "</h3>");
-          doc.write("<div align=\"right\"><a href=\"javascript:window.close();\">Close</a></div>");
-          doc.write("<table class='properties'>");
-          doc.write("<tr><th>Name</th><th>Value</th></tr>");
-          for (prop in TestCases[name]) {
-            doc.write("<tr><th>" + prop + "</th><td>" + TestCases[name][prop] + "</td></tr>");
-          }
-          doc.write("</table>");
-          doc.write("</body></html>");
-          doc.close();
-          win.focus();
-        }
-      ]]>
-                </script>
-            </HEAD>
-            <body>
-                <a
-                    name="top"></a>
-                <xsl:call-template
-                    name="pageHeader"/>
-
-                <!-- Summary part -->
-                <xsl:call-template
-                    name="summary"/>
-                <hr
-                    size="1"
-                    width="95%"
-                    align="left"/>
-
-                <!-- Package List part -->
-                <xsl:call-template
-                    name="packagelist"/>
-                <hr
-                    size="1"
-                    width="95%"
-                    align="left"/>
-
-                <!-- For each package create its part -->
-                <xsl:call-template
-                    name="packages"/>
-                <hr
-                    size="1"
-                    width="95%"
-                    align="left"/>
-
-                <!-- For each class create the  part -->
-                <xsl:call-template
-                    name="classes"/>
-            </body>
-        </HTML>
-    </xsl:template>
-    <!--
-        ==================================================================
-    -->
-    <!--
-        Write a list of all packages with an hyperlink to the anchor of
-    -->
-    <!--
-        of the package name.
-    -->
-    <!--
-        ==================================================================
-    -->
-    <xsl:template
-        name="packagelist">
-        <h2>Packages</h2>
-        Note: package statistics are not computed recursively, they only
-        sum up all of its testsuites numbers.
-        <table
-            class="details"
-            border="0"
-            cellpadding="5"
-            cellspacing="2"
-            width="95%">
-            <xsl:call-template
-                name="testsuite.test.header"/>
-            <!-- list all packages recursively -->
-            <xsl:for-each
-                select="./testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
-                <xsl:sort
-                    select="@package"/>
-                <xsl:variable
-                    name="testsuites-in-package"
-                    select="/testsuites/testsuite[./@package = current()/@package]"/>
-                <xsl:variable
-                    name="testCount"
-                    select="sum($testsuites-in-package/@tests)"/>
-                <xsl:variable
-                    name="errorCount"
-                    select="sum($testsuites-in-package/@errors)"/>
-                <xsl:variable
-                    name="failureCount"
-                    select="sum($testsuites-in-package/@failures)"/>
-                <xsl:variable
-                    name="timeCount"
-                    select="sum($testsuites-in-package/@time)"/>
-
-                <!-- write a summary for the package -->
-                <tr
-                    valign="top">
-                    <!-- set a nice color depending if there is an error/failure -->
-                    <xsl:attribute
-                        name="class">
-						<xsl:choose>
-							<xsl:when
-                        test="$failureCount &gt; 0">Failure</xsl:when>
-							<xsl:when
-                        test="$errorCount &gt; 0">Error</xsl:when>
-						</xsl:choose>
-					</xsl:attribute>
-                    <td>
-                        <a
-                            href="#{@package}">
-                            <xsl:value-of
-                                select="@package"/>
-                        </a>
-                    </td>
-                    <td>
-                        <xsl:value-of
-                            select="$testCount"/>
-                    </td>
-                    <td>
-                        <xsl:value-of
-                            select="$errorCount"/>
-                    </td>
-                    <td>
-                        <xsl:value-of
-                            select="$failureCount"/>
-                    </td>
-                    <td>
-                        <xsl:call-template
-                            name="display-time">
-                            <xsl:with-param
-                                name="value"
-                                select="$timeCount"/>
-                        </xsl:call-template>
-                    </td>
-                </tr>
-            </xsl:for-each>
-        </table>
-    </xsl:template>
-    <!--
-        ==================================================================
-    -->
-    <!--
-        Write a package level report
-    -->
-    <!--
-        It creates a table with values from the document:
-    -->
-    <!--
-        Name | Tests | Errors | Failures | Time
-    -->
-    <!--
-        ==================================================================
-    -->
-    <xsl:template
-        name="packages">
-        <!-- create an anchor to this package name -->
-        <xsl:for-each
-            select="/testsuites/testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
-            <xsl:sort
-                select="@package"/>
-            <a
-                name="{@package}"></a>
-            <h3>
-                Package
-                <xsl:value-of
-                    select="@package"/>
-            </h3>
-            <table
-                class="details"
-                border="0"
-                cellpadding="5"
-                cellspacing="2"
-                width="95%">
-                <xsl:call-template
-                    name="testsuite.test.header"/>
-
-                <!-- match the testsuites of this package -->
-                <xsl:apply-templates
-                    select="/testsuites/testsuite[./@package = current()/@package]"
-                    mode="print.test"/>
-            </table>
-            <a
-                href="#top">Back to top</a>
-            <p/>
-            <p/>
-        </xsl:for-each>
-    </xsl:template>
-    <xsl:template
-        name="classes">
-        <xsl:for-each
-            select="testsuite">
-            <xsl:sort
-                select="@name"/>
-            <!-- create an anchor to this class name -->
-            <a
-                name="{@name}"></a>
-            <h3>
-                TestCase
-                <xsl:value-of
-                    select="@name"/>
-            </h3>
-            <table
-                class="details"
-                border="0"
-                cellpadding="5"
-                cellspacing="2"
-                width="95%">
-                <xsl:call-template
-                    name="testcase.test.header"/>
-                <!--
-                    test can even not be started at all (failure to load
-                    the class) so report the error directly
-                -->
-                <xsl:if
-                    test="./error">
-                    <tr
-                        class="Error">
-                        <td
-                            colspan="4">
-                            <xsl:apply-templates
-                                select="./error"/>
-                        </td>
-                    </tr>
-                </xsl:if>
-                <xsl:apply-templates
-                    select="./testcase"
-                    mode="print.test"/>
-            </table>
-            <div
-                class="Properties">
-                <a>
-                    <xsl:attribute
-                        name="href">javascript:displayProperties('<xsl:value-of
-                        select="@package"/>.<xsl:value-of
-                        select="@name"/>');</xsl:attribute>
-                    Properties &gt;&gt;
-                </a>
-            </div>
-            <p/>
-            <a
-                href="#top">Back to top</a>
-        </xsl:for-each>
-    </xsl:template>
-    <xsl:template
-        name="summary">
-        <h2>Summary</h2>
-        <xsl:variable
-            name="testCount"
-            select="sum(testsuite/@tests)"/>
-        <xsl:variable
-            name="errorCount"
-            select="sum(testsuite/@errors)"/>
-        <xsl:variable
-            name="failureCount"
-            select="sum(testsuite/@failures)"/>
-        <xsl:variable
-            name="timeCount"
-            select="sum(testsuite/@time)"/>
-        <xsl:variable
-            name="successRate"
-            select="($testCount - $failureCount - $errorCount) div $testCount"/>
-        <table
-            class="details"
-            border="0"
-            cellpadding="5"
-            cellspacing="2"
-            width="95%">
-            <tr
-                valign="top">
-                <th>Tests</th>
-                <th>Failures</th>
-                <th>Errors</th>
-                <th>Success rate</th>
-                <th>Time</th>
-            </tr>
-            <tr
-                valign="top">
-                <xsl:attribute
-                    name="class">
-				<xsl:choose>
-					<xsl:when
-                    test="$failureCount &gt; 0">Failure</xsl:when>
-					<xsl:when
-                    test="$errorCount &gt; 0">Error</xsl:when>
-				</xsl:choose>
-			</xsl:attribute>
-                <td>
-                    <xsl:value-of
-                        select="$testCount"/>
-                </td>
-                <td>
-                    <xsl:value-of
-                        select="$failureCount"/>
-                </td>
-                <td>
-                    <xsl:value-of
-                        select="$errorCount"/>
-                </td>
-                <td>
-                    <xsl:call-template
-                        name="display-percent">
-                        <xsl:with-param
-                            name="value"
-                            select="$successRate"/>
-                    </xsl:call-template>
-                </td>
-                <td>
-                    <xsl:call-template
-                        name="display-time">
-                        <xsl:with-param
-                            name="value"
-                            select="$timeCount"/>
-                    </xsl:call-template>
-                </td>
-            </tr>
-        </table>
-        <table
-            border="0"
-            width="95%">
-            <tr>
-                <td
-                    style="text-align: justify;">
-                    Note:
-                    <i>failures</i>
-                    are anticipated and checked for with assertions
-                    while
-                    <i>errors</i>
-                    are unanticipated.
-                </td>
-            </tr>
-        </table>
-    </xsl:template>
-    <!--
-        Write properties into a JavaScript data structure. This is based
-        on the original idea by Erik Hatcher (erik@hatcher.net)
-    -->
-    <xsl:template
-        match="properties">
-        cur = TestCases['
-        <xsl:value-of
-            select="../@package"/>
-        .
-        <xsl:value-of
-            select="../@name"/>
-        '] = new Array();
-        <xsl:for-each
-            select="property">
-            <xsl:sort
-                select="@name"/>
-            cur['
-            <xsl:value-of
-                select="@name"/>
-            '] = '
-            <xsl:call-template
-                name="JS-escape">
-                <xsl:with-param
-                    name="string"
-                    select="@value"/>
-            </xsl:call-template>
-            ';
-        </xsl:for-each>
-    </xsl:template>
-
-    <!-- Page HEADER -->
-    <xsl:template
-        name="pageHeader">
-        <h1>Unit Test Results</h1>
-        <table
-            width="100%">
-            <tr>
-                <td
-                    align="left"></td>
-                <td
-                    align="right">
-                    Designed for use with
-                    <a
-                        href='http://www.junit.org'>JUnit</a>
-                    and
-                    <a
-                        href='http://jakarta.apache.org/ant'>Ant</a>
-                    .
-                </td>
-            </tr>
-        </table>
-        <hr
-            size="1"/>
-    </xsl:template>
-    <xsl:template
-        match="testsuite"
-        mode="header">
-        <tr
-            valign="top">
-            <th
-                width="80%">Name</th>
-            <th>Tests</th>
-            <th>Errors</th>
-            <th>Failures</th>
-            <th
-                nowrap="nowrap">Time(s)</th>
-        </tr>
-    </xsl:template>
-
-    <!-- class header -->
-    <xsl:template
-        name="testsuite.test.header">
-        <tr
-            valign="top">
-            <th
-                width="80%">Name</th>
-            <th>Tests</th>
-            <th>Errors</th>
-            <th>Failures</th>
-            <th
-                nowrap="nowrap">Time(s)</th>
-        </tr>
-    </xsl:template>
-
-    <!-- method header -->
-    <xsl:template
-        name="testcase.test.header">
-        <tr
-            valign="top">
-            <th>Name</th>
-            <th>Status</th>
-            <th
-                width="80%">Type</th>
-            <th
-                nowrap="nowrap">Time(s)</th>
-        </tr>
-    </xsl:template>
-
-
-    <!-- class information -->
-    <xsl:template
-        match="testsuite"
-        mode="print.test">
-        <tr
-            valign="top">
-            <!-- set a nice color depending if there is an error/failure -->
-            <xsl:attribute
-                name="class">
-			<xsl:choose>
-				<xsl:when
-                test="@failures[.&gt; 0]">Failure</xsl:when>
-				<xsl:when
-                test="@errors[.&gt; 0]">Error</xsl:when>
-			</xsl:choose>
-		</xsl:attribute>
-
-            <!-- print testsuite information -->
-            <td>
-                <a
-                    href="#{@name}">
-                    <xsl:value-of
-                        select="@name"/>
-                </a>
-            </td>
-            <td>
-                <xsl:value-of
-                    select="@tests"/>
-            </td>
-            <td>
-                <xsl:value-of
-                    select="@errors"/>
-            </td>
-            <td>
-                <xsl:value-of
-                    select="@failures"/>
-            </td>
-            <td>
-                <xsl:call-template
-                    name="display-time">
-                    <xsl:with-param
-                        name="value"
-                        select="@time"/>
-                </xsl:call-template>
-            </td>
-        </tr>
-    </xsl:template>
-    <xsl:template
-        match="testcase"
-        mode="print.test">
-        <tr
-            valign="top">
-            <xsl:attribute
-                name="class">
-			<xsl:choose>
-				<xsl:when
-                test="failure | error">Error</xsl:when>
-			</xsl:choose>
-		</xsl:attribute>
-            <td>
-                <xsl:value-of
-                    select="@name"/>
-            </td>
-            <xsl:choose>
-                <xsl:when
-                    test="failure">
-                    <td>Failure</td>
-                    <td>
-                        <xsl:apply-templates
-                            select="failure"/>
-                    </td>
-                </xsl:when>
-                <xsl:when
-                    test="error">
-                    <td>Error</td>
-                    <td>
-                        <xsl:apply-templates
-                            select="error"/>
-                    </td>
-                </xsl:when>
-                <xsl:otherwise>
-                    <td>Success</td>
-                    <td></td>
-                </xsl:otherwise>
-            </xsl:choose>
-            <td>
-                <xsl:call-template
-                    name="display-time">
-                    <xsl:with-param
-                        name="value"
-                        select="@time"/>
-                </xsl:call-template>
-            </td>
-        </tr>
-    </xsl:template>
-    <xsl:template
-        match="failure">
-        <xsl:call-template
-            name="display-failures"/>
-    </xsl:template>
-    <xsl:template
-        match="error">
-        <xsl:call-template
-            name="display-failures"/>
-    </xsl:template>
-
-    <!-- Style for the error and failure in the tescase template -->
-    <xsl:template
-        name="display-failures">
-        <xsl:choose>
-            <xsl:when
-                test="not(@message)">
-                N/A
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of
-                    select="@message"/>
-            </xsl:otherwise>
-        </xsl:choose>
-        <!-- display the stacktrace -->
-        <code>
-            <p/>
-            <xsl:call-template
-                name="br-replace">
-                <xsl:with-param
-                    name="word"
-                    select="."/>
-            </xsl:call-template>
-        </code>
-        <!--
-            the later is better but might be problematic for non-21"
-            monitors...
-        -->
-        <!--pre><xsl:value-of select="."/></pre-->
-    </xsl:template>
-    <xsl:template
-        name="JS-escape">
-        <xsl:param
-            name="string"/>
-        <xsl:choose>
-            <!--
-                something isn't right here, basically all single quotes
-                need to be replaced with backslash-single-quote
-                <xsl:when test="contains($string,'&apos;')">
-                <xsl:value-of
-                select="substring-before($string,'&apos;')"/> \&apos;
-                <xsl:call-template name="JS-escape"> <xsl:with-param
-                name="string"
-                select="substring-after($string,'&apos;')"/>
-                </xsl:call-template> </xsl:when>
-            -->
-            <xsl:when
-                test="contains($string,'\')">
-                <xsl:value-of
-                    select="substring-before($string,'\')"/>
-                \\
-                <xsl:call-template
-                    name="JS-escape">
-                    <xsl:with-param
-                        name="string"
-                        select="substring-after($string,'\')"/>
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of
-                    select="$string"/>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-    <!--
-        template that will convert a carriage return into a br tag
-        @param word the text from which to convert CR to BR tag
-    -->
-    <xsl:template
-        name="br-replace">
-        <xsl:param
-            name="word"/>
-        <xsl:choose>
-            <xsl:when
-                test="contains($word,'&#xA;')">
-                <xsl:value-of
-                    select="substring-before($word,'&#xA;')"/>
-                <br/>
-                <xsl:call-template
-                    name="br-replace">
-                    <xsl:with-param
-                        name="word"
-                        select="substring-after($word,'&#xA;')"/>
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of
-                    select="$word"/>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-    <xsl:template
-        name="display-time">
-        <xsl:param
-            name="value"/>
-        <xsl:value-of
-            select="format-number($value,'0.000')"/>
-    </xsl:template>
-    <xsl:template
-        name="display-percent">
-        <xsl:param
-            name="value"/>
-        <xsl:value-of
-            select="format-number($value,'0.00%')"/>
-    </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/xml.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/xml.tests/testScripts/test.xml
deleted file mode 100644
index 96c6ddc..0000000
--- a/releng.wtpbuilder/distribution/xml.tests/testScripts/test.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<project
-    name="Automated Eclipse Testing"
-    default="all"
-    basedir=".">
-    <property
-        environment="env"/>
-
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-    <echo
-        level="info"
-        message="starting Automated Eclipse Testing"/>
-    <echo
-        level="debug"
-        message="basedir: ${basedir}"/>
-    <echo
-        level="debug"
-        message="testRoot: ${testRoot}"/>
-    <fail
-        message="testRoot must be set"
-        unless="testRoot"/>
-
-    <!--properties file containing the build information-->
-    <property
-        file="${buildDirectory}/label.properties"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-    <!--default directory where test-eclipse will be installed-->
-    <property
-        name="install"
-        value="${testRoot}"/>
-    <!--
-        name that can be added to report name to identify which platform
-        tests results come from
-    -->
-    <property
-        name="platform"
-        value=""/>
-
-    <!-- The root of the eclipse installation -->
-    <property
-        name="eclipse-home"
-        value="${testRoot}${dropinsFolder}/eclipse/"/>
-    <!--
-        The directory that will contain the xml and html results from
-        the tests that are run
-    -->
-    <property
-        name="results"
-        value="${testRoot}/results"/>
-    <property
-        name="library-file"
-        value="${testRoot}/wtp-junit-tests.xml"/>
-    <target
-        name="init">
-    </target>
-    <target
-        name="all"
-        depends="init">
-        <echo
-            level="info"
-            message="Starting Unit Tests"/>
-        <!--
-            unlike other ant tasks, subant defaults to false for
-            inheritall!
-        -->
-        <subant
-            target=""
-            inheritall="true">
-            <fileset
-                dir="${eclipse-home}/plugins/">
-                <exclude
-                    name="**/*performance*/test.xml"/>
-                <include
-                    name="**/test.xml"/>
-            </fileset>
-        </subant>
-        <echo
-            level="info"
-            message="Ended Unit Tests"/>
-        <antcall
-            target="genHtml"/>
-    </target>
-    <target
-        name="genHtml"
-        description="Generates HTML results with provided JUNIT.XSL provided"
-        unless="genHtml.disable">
-        <xslt
-            style="JUNIT.XSL"
-            basedir="${results}/xml"
-            destdir="${results}/html"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/xml.tests/testScripts/testServer.properties b/releng.wtpbuilder/distribution/xml.tests/testScripts/testServer.properties
deleted file mode 100644
index ab2cb39..0000000
--- a/releng.wtpbuilder/distribution/xml.tests/testScripts/testServer.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-
-# Tomcat dirs
-tomcat50Dir=jakarta-tomcat-5.0.28
-
-# Jonas dirs
-#jonas432Dir=
-jonas432DirName=JONAS_4_3_2
-
-# SWT
-#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
-
-# JSF Runtime Library directory
-jsf1.1Dir=myfaces-core-1.1.5/lib
-
-# JPT Runtime Library directory
-jptPersistenceLibDir=jpt/persistence-1.0/lib
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/xml.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/xml.tests/testScripts/wtp-junit-tests.xml
deleted file mode 100644
index 62f4501..0000000
--- a/releng.wtpbuilder/distribution/xml.tests/testScripts/wtp-junit-tests.xml
+++ /dev/null
@@ -1,317 +0,0 @@
-<?xml version="1.0"?>
-<project
-    name="JUnit tests"
-    basedir=".">
-    <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-    <target
-        name="init">
-        <property
-            name="junit-report-output"
-            value="${testRoot}/results"/>
-        <mkdir
-            dir="${junit-report-output}/raw"/>
-        <!--
-            if not otherwise set, be sure extraVMargs is at least some
-            string, even if unused string. 
-            
-            Remember, though, extraVMArgs can contain more than one extra arg, 
-            so much be passed to VM as a "line", not "value". 
-        -->
-        <property
-            name="extraVMargs"
-            value="-DextraVMargsunused=notused"/>
-
-        <!-- if not otherwise set, use a unique workspace name -->
-        <property
-            name="data-dir"
-            value="${testRoot}/junitworkspaces/workspace-${classname}"/>
-        <property
-            name="testRoot"
-            value="${testRoot}"/>
-        <!--
-            Some common values, of milliseconds to more recognizable
-            units: 14400000: 4 hours 7200000: 2 hours 3600000: 1 hour
-            1800000: 30 minutes 600000: 10 minutes
-        -->
-        <property
-            name="timeout"
-            value="1800000"/>
-        <property
-            name="junit-report-output"
-            value="${junit-report-output}"/>
-        <property
-            name="formatter"
-            value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter"/>
-        <property
-            name="test-output"
-            value="${junit-report-output}/raw/${classname}.xml"/>
-        <property
-            name="jvm"
-            value="${env.JAVA_6_HOME}/bin/java"/>
-        <dirname
-            file="${ant.file}"
-            property="currentDir"/>
-        <echo
-            level="debug"
-            message="data-dir: ${data-dir}"/>
-        <echo
-            level="debug"
-            message="plugin-name: ${plugin-name}"/>
-        <echo
-            level="debug"
-            message="classname: ${classname}"/>
-        <echo
-            level="info"
-            message="extraVMargs: ${extraVMargs}"/>
-        <echo
-            level="debug"
-            message="timeout: ${timeout}"/>
-        <echo
-            level="debug"
-            message="testRoot: ${testRoot}"/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="debug"
-            message="eclipse-home: ${eclipse-home}"/>
-        <echo
-            level="debug"
-            message="junit-report-output: ${junit-report-output}"/>
-        <echo
-            level="debug"
-            message="test-output: ${test-output}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="buildLabel: ${buildLabel}"/>
-        <echo
-            level="debug"
-            message="jvm: ${jvm}"/>
-    </target>
-    <target
-        name="core-test"
-        depends="init">
-        <echo
-            level="info"
-            message="test-type: core-test"/>
-        <ant
-            antfile="${ant.file}"
-            dir="${currentDir}"
-            target="eclipse-test">
-            <property
-                name="application"
-                value="org.eclipse.test.coretestapplication"/>
-        </ant>
-    </target>
-    <target
-        name="ui-test"
-        depends="init">
-        <echo
-            level="info"
-            message="test-type: ui-test"/>
-        <ant
-            antfile="${ant.file}"
-            dir="${currentDir}"
-            target="eclipse-test">
-            <property
-                name="application"
-                value="org.eclipse.test.uitestapplication"/>
-        </ant>
-    </target>
-    <target
-        name="eclipse-test"
-        description="Runs the specified classname as a plug-in test.">
-        <echo
-            level="info"
-            message="Running ${classname}"/>
-        <echo
-            level="debug"
-            message="Result file: ${junit-report-output}/${classname}.xml."/>
-        <echo
-            level="debug"
-            message="DISPLAY: ${env.DISPLAY}"/>
-        <mkdir
-            dir="${buildDirectory}/${buildLabel}/httplogstest"/>
-        <echo
-            message="http log messages to: ${buildDirectory}/${buildLabel}/httplogstest"/>
-    	
-       <condition
-           property="xulRunnerParam"
-           value="org.eclipse.swt.browser.XULRunnerPath"
-           else="XULRunnerPathNotSpecified">
-           <isset
-               property="env.WTP_XULRUNNER"/>
-       </condition>
-        <echo
-            message="xulRunnerParam: ${xulRunnerParam}"/>
-        <echo
-            message="WTP_XULRUNNER: ${env.WTP_XULRUNNER}"/>
-        <!--
-            If there is not exactly one launcher in the stack, we'd best
-            fail fast, since we are not expecting that, and may indicate
-            an installation that would produce unpredictable results
-        -->
-        <!--
-            requires ant 1.7, and at this point, we're running 1.6 from
-            eclipse ... <condition property="expectedNumberOfLaunchers">
-            <resourcecount when="equal" count="1" > <fileset
-            dir="${testRoot}/eclipse/plugins"> <include
-            name="org.eclipse.equinox.launcher_*.jar" /> </fileset>
-            </resourcecount> </condition> <fail message="Did not find
-            expected number of launcher jars. Check installation."
-            unless="expectedNumberOfLaunchers" />
-        -->
-        <java
-            taskname="suiteUnitTest"
-            fork="true"
-            resultProperty="suitejunitresult"
-            failonerror="false"
-            timeout="${timeout}"
-            dir="${testRoot}/eclipse"
-            jvm="${jvm}"
-            classname="org.eclipse.equinox.launcher.Main">
-            <classpath>
-                <fileset
-                    dir="${testRoot}/eclipse/plugins">
-                    <include
-                        name="org.eclipse.equinox.launcher_*.jar"/>
-                </fileset>
-            </classpath>
-            <jvmarg
-                value="-Xmx512m"/>
-            <jvmarg
-                value="-Dosgi.ws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dosgi.os=${env.BASEOS}"/>
-            <jvmarg
-                value="-Dosgi.arch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-DbuildLabel=${buildLabel}"/>
-            <jvmarg
-                value="-DbuildDirectory=${buildDirectory}"/>
-            <jvmarg
-                value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
-            <jvmarg
-                value="-DurlLogLocation=${buildDirectory}/${buildLabel}/httplogstest/outgoinghttplog-${plugin-name}.log"/>
-            <jvmarg
-                value="-Dwtp.autotest.noninteractive=true"/>
-            <jvmarg
-                line="${extraVMargs}"/>
-            <jvmarg
-                value="-Declipse.consolelog=true"/>
-            <jvmarg
-                value="-Dosgi.debug"/>
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <jvmarg
-                value="-Dprojectname=${projectname}"/>
-        	
-              <jvmarg
-                  value="-D${xulRunnerParam}=${env.WTP_XULRUNNER}"/> 	
-        	
-        	
-            <arg
-                value="-nosplash"/>
-            <arg
-                value="-data"/>
-            <arg
-                value="${data-dir}"/>
-            <arg
-                value="-application"/>
-            <arg
-                value="${application}"/>
-            <arg
-                value="formatter=${formatter},${test-output}"/>
-            <arg
-                value="-testPluginName"/>
-            <arg
-                value="${plugin-name}"/>
-            <arg
-                value="-className"/>
-            <arg
-                value="${classname}"/>
-            <env
-                key="DISPLAY"
-                value="${env.DISPLAY}"/>
-            <redirector
-                output="${junit-report-output}/${classname}.output.txt"
-                error="${junit-report-output}/${classname}.error.txt"/>
-        </java>
-        <echo
-            level="info"
-            message="suitejunitresult: ${suitejunitresult}"/>
-        <antcall
-            target="summarizeFailure"/>
-        <antcall
-            target="collect-results"/>
-    </target>
-    <target
-        name="collect-results">
-        <dirname
-            property="output-dir"
-            file="${test-output}"/>
-        <basename
-            property="output-file-name"
-            file="${test-output}"/>
-        <mkdir
-            dir="${junit-report-output}/xml"/>
-        <junitreport
-            todir="${junit-report-output}/xml"
-            tofile="${classname}.xml">
-            <fileset
-                dir="${output-dir}">
-                <include
-                    name="${output-file-name}"/>
-            </fileset>
-        </junitreport>
-        <mkdir
-            dir="${junit-report-output}/html"/>
-        <xslt
-            style="${testRoot}/JUNIT.XSL"
-            basedir="${junit-report-output}"
-            includes="${classname}.xml"
-            destdir="${junit-report-output}/html"/>
-    </target>
-    <target
-        name="collect">
-        <!--
-            deprecated, each test.xml uses it, and we should remove,
-            eventually
-        -->
-        <echo
-            message="Deprecated. There is no need to call the collect task. It no longer does anything. Please remove from your test.xml file"/>
-    </target>
-    <target
-        name="summarizeFailure"
-        depends="checkFailure"
-        if="doFailure">
-        <echo
-            append="true"
-            file="${buildDirectory}/junitFailureList.log">${plugin-name}${line.separator}</echo>
-    </target>
-    <target
-        name="checkFailure">
-        <condition
-            property="doFailure">
-            <not>
-                <equals
-                    arg1="${suitejunitresult}"
-                    arg2="0"
-                    trim="true"/>
-            </not>
-        </condition>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/xml.tests/testdependency.xml b/releng.wtpbuilder/distribution/xml.tests/testdependency.xml
deleted file mode 100644
index 463d863..0000000
--- a/releng.wtpbuilder/distribution/xml.tests/testdependency.xml
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-    <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <fail
-        message="Required property file does not exist: ${keyCfgFile}">
-        <condition>
-            <not>
-                <available
-                    file="${keyCfgFile}"/>
-            </not>
-        </condition>
-    </fail>
-    <property
-        file="${keyCfgFile}"/>
-    <condition
-        property="getprereq.eclipse">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.eclipseplatform">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.emf">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.emfxsd">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.emfvalidation">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.gef">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.dtp">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.wst">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.jst">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.wtp">
-        <istrue
-            value="false"/>
-    </condition>
-    <target
-        name="get">
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined, which we do later with
-            statements such if="${groupId}.url"
-        -->
-        <property
-            file="${dependency.properties}"/>
-        <antcall
-            target="prereq.emf"/>
-        <antcall
-            target="prereq.emfxsd"/>
-        <antcall
-            target="prereq.emfvalidation"/>
-        <antcall
-            target="prereq.gef"/>
-        <antcall
-            target="prereq.dtp"/>
-        <antcall
-            target="prereq.wst"/>
-        <antcall
-            target="prereq.jst"/>
-        <antcall
-            target="prereq.wtp"/>
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="eclipseTestFramework"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.eclipse"
-        if="getprereq.eclipse">
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.eclipseplatform"
-        if="getprereq.eclipseplatform">
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="eclipseplatform"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emf"
-        if="getprereq.emf">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfxsd"
-        if="getprereq.emfxsd">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfvalidation"
-        if="getprereq.emfvalidation">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="emfvalidation"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.gef"
-        if="getprereq.gef">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.dtp"
-        if="getprereq.dtp">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="dtp"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wst"
-        if="getprereq.wst">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="wst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.jst"
-        if="getprereq.jst">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="jst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wtp"
-        if="getprereq.wtp">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="wtp"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstallBase"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-    <target
-        name="getAndInstallDropins"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}${dropinsFolder}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/xmlsec.build/build.xml b/releng.wtpbuilder/distribution/xmlsec.build/build.xml
deleted file mode 100644
index 7be5cac..0000000
--- a/releng.wtpbuilder/distribution/xmlsec.build/build.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<project
-    default="build"
-    basedir=".">
-    <fail
-        unless="wtp.builder.home"/>
-    <property
-        file="${wtp.builder.home}/build.properties"/>
-    <target
-        name="build"
-        depends="getBaseBuilder">
-        <dirname
-            file="${ant.file}"
-            property="distribution.wtp.build.dir"/>
-        <property
-            name="buildTargets"
-            value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
-        <!--
-            for this distribution, dependencies come from project's
-            releng map project
-        -->
-        <property
-            name="dependency.properties"
-            value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-
-        <!-- calling label.xml to createg label.properties file -->
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-        <echo
-            level="info"
-            message="invoking buildTargets: ${buildTargets} to build for each component"/>
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="xmlsec"/>
-        </ant>
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="xmlsec_sdk"/>
-        </ant>
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="xmlsec_tests"/>
-            <property
-                name="eclipseBuildFailOnError"
-                value="false"/>
-        </ant>
-
-        <!-- package -->
-        <antcall
-            target="package"/>
-    </target>
-
-    <!-- invoking runbuild.xml targetting getBaseBuilder -->
-    <target
-        name="getBaseBuilder"
-        if="eclipse.builder.fetch">
-        <dirname
-            file="${ant.file}"
-            property="wtbuilder.dir"/>
-        <property
-            name="buildTargets"
-            value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
-        <echo
-            level="info"
-            message="invoking buildTargets: ${buildTargets} -> getBaseBuilder"/>
-        <ant
-            antfile="${buildTargets}"
-            target="getBaseBuilder"/>
-    </target>
-    <target
-        name="package">
-        <!--
-            post, post packaging, for WTP ... "manually" assemble the
-            desired zips
-        -->
-        <!-- nothing to assemble right now -->
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/build.xml b/releng.wtpbuilder/distribution/xmlsec.site/build.xml
deleted file mode 100644
index 39fc90e..0000000
--- a/releng.wtpbuilder/distribution/xmlsec.site/build.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-<project
-    name="Build specific targets and properties"
-    default="build"
-    basedir=".">
-    <!--
-        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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- = = = end standard properties pattern = = = -->
-    <echo
-        message="ant.file: ${ant.file}"/>
-    <target
-        name="build">
-    	<mkdir dir="${buildDirectory}/${buildLabel} "/>
-        <java
-            jar="${eclipse.launcher}"
-            fork="true"
-            failonerror="true">
-            <jvmarg
-                value="-Dosgi.ws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dosgi.os=${env.BASEOS}"/>
-            <jvmarg
-                value="-Dosgi.arch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-Dbuild.donottagmaps=${build.donottagmaps}"/>
-            <jvmarg
-                value="-DbuildBranch=${buildBranch}"/>
-            <jvmarg
-                value="-DbuildType=${buildType}"/>
-            <jvmarg
-                value="-DbuildId=${buildId}"/>
-            <jvmarg
-                value="-DmapVersionTag=${mapVersionTag}"/>
-            <jvmarg
-                value="-Dbuild.distribution=${build.distribution}"/>
-            <jvmarg
-                value="-DbuildDirectory=${buildDirectory}"/>
-            <jvmarg
-                value="-Dwtp.builder.home=${wtp.builder.home}"/>
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <jvmarg
-                value="-Dprojectname=${projectname}"/>
-            <jvmarg
-                value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
-            <jvmarg
-                value="-DurlLogLocation=${buildDirectory}/${buildLabel}/outgoinghttplogfromsitebuild.log"/>
-            <arg
-                value="-data"/>
-            <arg
-                value="${basedir}/workspace"/>
-            <arg
-                value="-application"/>
-            <arg
-                value="org.eclipse.ant.core.antRunner"/>
-            <arg
-                value="-buildfile"/>
-            <arg
-                value="${ant.file}"/>
-            <arg
-                value="publish"/>
-        </java>
-    </target>
-    <!--
-        =====================================================================
-    -->
-    <!-- Steps to do to publish the build results -->
-    <!--
-        =====================================================================
-    -->
-    <target
-        name="publish">
-        <dirname
-            file="${ant.file}"
-            property="component.dir"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-        <property
-            file="${buildDirectory}/label.properties"/>
-        <property
-            name="publish.xml"
-            value="${component.dir}/publish.xml"/>
-        <property
-            name="indexFileName"
-            value="index.php"/>
-        <property
-            name="result"
-            value="${buildDirectory}/${buildLabel}"/>
-        <property
-            name="indexTemplateFilename"
-            value="index.html.template.php"/>
-        <copy
-            file="${wtp.builder.home}/distribution/wtp.site/templateFiles/${indexTemplateFilename}"
-            tofile="${buildDirectory}/${indexFileName}"/>
-        <condition
-            property="isBuildTested"
-            value="true">
-            <available
-                file="${buildDirectory}/${buildLabel}/testResults/html"/>
-        </condition>
-        <ant
-            antfile="${publish.xml}"
-            dir="${component.dir}">
-            <property
-                name="dropTokenList"
-                value="%wtpruntime%,%wtpsdk%,%wtptest%,%wst%,%wst-sdk%,%wst-tests%,%jst-tests%,%wst-perf-tests%,%jst-perf-tests%,%jpt-runtime%,%jpt-sdk%,%jpt-tests%"/>
-            <property
-                name="webtoolsDownloadURL"
-                value="http://www.eclipse.org/downloads/download.php?file=/webtools/committers/drops"/>
-            <property
-                name="buildBranch"
-                value="${buildBranch}"/>
-            <property
-                name="isBuildTested"
-                value="${isBuildTested}"/>
-            <property
-                name="indexTemplateFilename"
-                value="${indexTemplateFilename}"/>
-        </ant>
-
-        <!--  Get the build map over for the results to point to. -->
-        <copy
-            file="${buildDirectory}/directory.txt"
-            tofile="${result}/directory.txt"/>
-
-        <!-- Copy info for build identification -->
-        <copy
-            file="${buildDirectory}/buildmachineinfo.properties"
-            tofile="${result}/buildmachineinfo.properties"/>
-
-        <!-- http access logs -->
-        <copy
-            todir="${result}/"
-            failonerror="false">
-            <fileset
-                dir="${buildDirectory}"
-                includes="*.log"/>
-        </copy>
-
-        <!-- ant build log, from control directory -->
-        <copy
-            todir="${result}/"
-            failonerror="false">
-            <fileset
-                dir="${env.ANT_WORKING}/${projectname}"
-                includes="antBuilderOutput.log"/>
-        </copy>
-
-
-
-        <!-- final count files -->
-        <countBuildFiles
-            sourceDirectory="${buildDirectory}/${buildLabel}"
-            filterString=".zip,.tar.gz"
-            outputFile="${buildDirectory}/${buildLabel}/files.count"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/compilerXMLOutputToHTML.xsl b/releng.wtpbuilder/distribution/xmlsec.site/compilerXMLOutputToHTML.xsl
deleted file mode 100644
index ffc7905..0000000
--- a/releng.wtpbuilder/distribution/xmlsec.site/compilerXMLOutputToHTML.xsl
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet
-    version="1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-    <xsl:output
-        method="html"
-        indent="yes"/>
-    <xsl:template
-        match="/">
-        <html>
-            <body>
-                <xsl:apply-templates
-                    select="compiler"/>
-            </body>
-        </html>
-    </xsl:template>
-    <xsl:template
-        match="compiler">
-        <h2>Compiler Report</h2>
-        <p>
-            Compiler:
-            <xsl:value-of
-                select="@name"/>
-            <xsl:text>   </xsl:text>
-            Version:
-            <xsl:value-of
-                select="@version"/>
-        </p>
-        <xsl:apply-templates
-            select="stats"/>
-        <xsl:apply-templates
-            select="sources"/>
-    </xsl:template>
-    <xsl:template
-        name="stats"
-        match="stats">
-        <p>
-            Number of source files:
-            <xsl:value-of
-                select="count(..//source)"/>
-            Number of classfiles:
-            <xsl:value-of
-                select="number_of_classfiles/@value"/>
-        </p>
-        <p>
-            Problems:
-            <xsl:value-of
-                select="problem_summary/@problems"/>
-            (Errors:
-            <xsl:value-of
-                select="problem_summary/@errors"/>
-            Warnings:
-            <xsl:value-of
-                select="problem_summary/@warnings"/>
-            )
-        </p>
-    </xsl:template>
-    <xsl:template
-        name="sources"
-        match="sources">
-        <xsl:if
-            test="count(source) > 0">
-            <dl>
-                <xsl:for-each
-                    select="source">
-                    <xsl:variable
-                        name="package"
-                        select="normalize-space(@package)">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="path"
-                        select="normalize-space(@path)">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="classname"
-                        select="substring-after($path, $package)">
-                    </xsl:variable>
-                    <xsl:if
-                        test="count(problems) > 0">
-                        <dt
-                            style="font-weight: bold; color: black">
-                            Source File:
-                            <xsl:value-of
-                                select="$package"/>
-                            <xsl:value-of
-                                select="$classname"/>
-                        </dt>
-                        <xsl:apply-templates
-                            select="problems">
-                            <xsl:with-param
-                                name="classname">
-                                <xsl:value-of
-                                    select="$classname"/>
-                            </xsl:with-param>
-                        </xsl:apply-templates>
-                    </xsl:if>
-                </xsl:for-each>
-            </dl>
-        </xsl:if>
-    </xsl:template>
-    <xsl:template
-        match="problems">
-        <xsl:param
-            name="classname"/>
-        <xsl:for-each
-            select="problem">
-            <dd
-                style="font-weight: normal; color: black">
-                <xsl:value-of
-                    select="position()"/>
-                <xsl:text>.  </xsl:text>
-                <xsl:value-of
-                    select="@severity"/>
-                <xsl:text>:  </xsl:text>
-                <xsl:value-of
-                    select="@id"/>
-                <xsl:variable
-                    name="lineNumber"
-                    select="@line">
-                </xsl:variable>
-                <xsl:for-each
-                    select="message">
-                    <p
-                        style="margin-left: +.5in; font-size: -1; margin-top: 0;margin-bottom:0;">
-                        <small>
-                            <xsl:value-of
-                                select="@value"/>
-                        </small>
-                    </p>
-                </xsl:for-each>
-                <xsl:for-each
-                    select="source_context">
-                    <xsl:variable
-                        name="pre"
-                        select="substring(@value,0,(@sourceStart + 1))">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="main"
-                        select="substring(@value,(@sourceStart + 1),(((@sourceEnd + 1) - (@sourceStart + 1)) + 1))">
-                    </xsl:variable>
-                    <xsl:variable
-                        name="end"
-                        select="substring(@value,(@sourceEnd + 2))">
-                    </xsl:variable>
-                    <p
-                        style="margin-left: +.5in; font-size: -2; margin-top: 0;margin-bottom:0;">
-                        <xsl:value-of
-                            select="substring($classname,2)"/>
-                        :
-                    </p>
-                    <p
-                        style="margin-left: +.5in; font-size: -2;font-family: monospace; margin-top: 0;margin-bottom:0;">
-                        <xsl:value-of
-                            select="$lineNumber"/>
-                        :
-                        <xsl:value-of
-                            select="$pre"/>
-                        <b>
-                            <u>
-                                <xsl:value-of
-                                    select="$main"/>
-                            </u>
-                        </b>
-                        <xsl:value-of
-                            select="$end"/>
-                    </p>
-                </xsl:for-each>
-            </dd>
-        </xsl:for-each>
-    </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/publish.xml b/releng.wtpbuilder/distribution/xmlsec.site/publish.xml
deleted file mode 100644
index 71afb65..0000000
--- a/releng.wtpbuilder/distribution/xmlsec.site/publish.xml
+++ /dev/null
@@ -1,821 +0,0 @@
-<project
-    name="Publish Build"
-    default="default"
-    basedir=".">
-    <!--
-        Properties that must be passed to this script: buildDirectory:
-        Path to perform the build in. (A working directory) buildType:
-        Type of build (nightly, integration etc.) buildId: Build name
-        buildLabel: <buildType>-<buildName>-<timestamp>
-    -->
-    <property
-        environment="env"/>
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be provided to publish"/>
-    <fail
-        unless="buildLabel"
-        message="buildLabel must be provided to publish"/>
-    <fail
-        unless="wtp.builder.home"
-        message="wtp.builder.home must be provided to publish"/>
-    <fail
-        unless="build.distribution"
-        message="build.distribution must be provided to publish"/>
-    <property
-        name="resultDir"
-        value="${buildDirectory}/${buildLabel}"/>
-    <!--name of generated index page-->
-    <property
-        name="indexFileName"
-        value="index.php"/>
-    <property
-        name="templateDir"
-        value="${wtp.builder.home}/distribution/${build.distribution}.site"/>
-    <property
-        name="resultingIndex"
-        value="${resultDir}/${indexFileName}"/>
-    <echo
-        level="debug"
-        message="resultDir: ${resultDir}"/>
-    <echo
-        level="debug"
-        message="templateDir: ${templateDir}"/>
-    <echo
-        level="debug"
-        message="resultingIndex: ${resultingIndex}"/>
-    <target
-        name="default">
-        <copy
-            overwrite="true"
-            file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/${indexTemplateFilename}"
-            tofile="${resultingIndex}"/>
-        <antcall
-            target="countFiles"/>
-        <antcall
-            target="generateCompileIndex"/>
-        <antcall
-            target="generateJUnitTestsIndex"/>
-        <antcall
-            target="getStaticFiles"/>
-    </target>
-    <target
-        name="generateCompileIndex">
-        <!--
-            <taskdef name="indexResults"
-            classname="org.eclipse.wtp.releng.tools.ResultsSummaryGenerator"
-            />
-        -->
-        <!--
-            isBuildTested: true|false should JUnit plugin test results
-            be used to generate index page dropTokenList: comma
-            separated list of strings which should be replaced by the
-            fileName attribute settings in the testManifest.xml.
-            xmlDirectoryName: path to directory containing JUnit plugin
-            test results in xml format (see doc is org.eclipse.test).
-            dropDirectoryName: path to directory containing the result
-            of the build. testResultsTemplateFileName: path to template
-            file used to generate page with links to JUnit test results
-            testResultsHtmlFileName: name of file which will be
-            generated with links to JUnit test results dropHtmlFileName:
-            name of generated index page hrefTestResultsTargetPath:
-            relative path from index page to directory containing JUnit
-            html test results hrefCompileLogsTargetPath: relative path
-            from index page directory containing compilelogs
-            testManifestFileName: name of xml file containing
-            descriptions of zip types and log files
-        -->
-        <property
-            file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-
-        <!-- create tables of test plugin compiles first -->
-        <antcall
-            target="generateTestCompileOutput">
-            <param
-                name="outputDirectory"
-                value="${resultDir}/testcompilelogs"/>
-        </antcall>
-
-        <!-- create table of code plugins compiles -->
-        <antcall
-            target="generateCompileOutput">
-            <param
-                name="outputDirectory"
-                value="${resultDir}/compilelogs"/>
-        </antcall>
-        <tstamp>
-            <format
-                property="TODAY"
-                pattern="MMMM d, yyyy"/>
-        </tstamp>
-
-        <!--  Insert Build Type descriptor  -->
-        <antcall
-            target="${buildType}"/>
-        <antcall
-            target="writeData"/>
-        <!--
-            Update timestamp on file to permit overwrite through Ant
-            copy task
-        -->
-        <touch
-            file="${resultingIndex}"/>
-    </target>
-    <target
-        name="generateTestCompileOutput"
-        depends="checkIfCompileLogs"
-        if="doCompileLogs">
-        <summarizeResults
-            isBuildTested="false"
-            includeAll="true"
-            dropTokenList="${dropTokenList}"
-            xmlDirectoryName=""
-            dropDirectoryName="${resultDir}"
-            testResultsTemplateFileName="${templateDir}/templateFiles/testCompileResults.php.template"
-            testResultsHtmlFileName="testCompileResults.php"
-            hrefTestResultsTargetPath=""
-            hrefCompileLogsTargetPath="testcompilelogs"
-            compileLogsDirectoryName="${outputDirectory}"/>
-        <antcall
-            target="compilerXMLToHTML"/>
-    </target>
-    <target
-        name="generateCompileOutput"
-        depends="checkIfCompileLogs"
-        if="doCompileLogs">
-        <summarizeResults
-            isBuildTested="false"
-            includeAll="true"
-            dropTokenList="${dropTokenList}"
-            xmlDirectoryName=""
-            dropDirectoryName="${resultDir}"
-            testResultsTemplateFileName="${templateDir}/templateFiles/compileResults.php.template"
-            testResultsHtmlFileName="compileResults.php"
-            hrefTestResultsTargetPath="testResults/html"
-            hrefCompileLogsTargetPath="compilelogs"
-            compileLogsDirectoryName="${outputDirectory}"/>
-        <antcall
-            target="compilerXMLToHTML"/>
-    </target>
-    <target
-        name="compilerXMLToHTML">
-        <xslt
-            basedir="${outputDirectory}"
-            destdir="${outputDirectory}"
-            includes="**/*.xml"
-            scanincludeddirectories="true"
-            style="compilerXMLOutputToHTML.xsl"
-            force="true"/>
-    </target>
-    <target
-        name="generateJUnitTestsIndex"
-        depends="checkIfTested"
-        if="doTests">
-        <!--
-            isBuildTested: true|false should JUnit plugin test results
-            be used to generate index page dropTokenList: comma
-            separated list of strings which should be replaced by the
-            fileName attribute settings in the testManifest.xml.
-            xmlDirectoryName: path to directory containing JUnit plugin
-            test results in xml format (see doc is org.eclipse.test).
-            dropDirectoryName: path to directory containing the result
-            of the build. testResultsTemplateFileName: path to template
-            file used to generate page with links to JUnit test results
-            testResultsHtmlFileName: name of file which will be
-            generated with links to JUnit test results dropHtmlFileName:
-            name of generated index page hrefTestResultsTargetPath:
-            relative path from index page to directory containing JUnit
-            html test results hrefCompileLogsTargetPath: relative path
-            from index page directory containing compilelogs
-            testManifestFileName: name of xml file containing
-            descriptions of zip types and log files
-        -->
-        <property
-            file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-
-        <!-- create table of test plugin compiles first -->
-        <!-- set isBuildTested to true for the "compile only" results -->
-        <summarizeResults
-            isBuildTested="true"
-            dropTokenList="${dropTokenList}"
-            dropDirectoryName="${resultDir}"
-            xmlDirectoryName="${resultDir}/testResults/xml"
-            testResultsTemplateFileName="${templateDir}/templateFiles/testResults.php.template"
-            testResultsHtmlFileName="testResults.php"
-            hrefTestResultsTargetPath="testResults/html"
-            compileLogsDirectoryName=""/>
-        <tstamp>
-            <format
-                property="TODAY"
-                pattern="MMMM d, yyyy"/>
-        </tstamp>
-
-        <!--  Insert Build Type descriptor  -->
-        <antcall
-            target="${buildType}"/>
-        <antcall
-            target="writeData"/>
-        <!--
-            Update timestamp on file to permit overwrite through Ant
-            copy task
-        -->
-        <touch
-            file="${resultingIndex}"/>
-    </target>
-    <target
-        name="getStaticFiles">
-        <!--get static files required in the buildLabel directory-->
-        <copy
-            todir="${resultDir}">
-            <fileset
-                dir="${templateDir}/staticDropFiles"/>
-        </copy>
-
-        <!--copy buildnotes from plugin directories-->
-        <mkdir
-            dir="${resultDir}/buildnotes"/>
-        <copy
-            todir="${resultDir}/buildnotes"
-            flatten="true">
-            <fileset
-                dir="${buildDirectory}/plugins"
-                includes="**/buildnotes_*.html"/>
-            <fileset
-                dir="${buildDirectory}/features"
-                includes="**/buildnotes_*.html"/>
-        </copy>
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/full/logIndex.php"/>
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/testLogs/logIndex.php"/>
-        <copy
-            file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/testSysErrorLogs/logIndex.php"/>
-    </target>
-    <target
-        name="updateSite">
-
-
-        <!-- get our authored, tokenized site.xml file -->
-        <copy
-            file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/siteWTP.xml"
-            tofile="${buildDirectory}/${buildLabel}/updateSite/site.xml"
-            overwrite="true"
-            failonerror="true"/>
-        <!--
-            get the ${buildDirectory}/finalPluginsVersions.properties,
-            and read as properties
-        -->
-        <!-- substitute property value for tokens -->
-        <replace
-            file="${buildDirectory}/${buildLabel}/updateSite/site.xml"
-            propertyfile="${buildDirectory}/finalFeaturesVersions.properties">
-            <replacefilter
-                token="@org.eclipse.wtp@"
-                property="org.eclipse.wtp"/>
-            <replacefilter
-                token="@org.eclipse.wtp.sdk@"
-                property="org.eclipse.wtp.sdk"/>
-            <replacefilter
-                token="@org.eclipse.jst@"
-                property="org.eclipse.jst"/>
-            <replacefilter
-                token="@org.eclipse.jst.sdk@"
-                property="org.eclipse.jst.sdk"/>
-            <replacefilter
-                token="@org.eclipse.jpt.feature@"
-                property="org.eclipse.jpt.feature"/>
-            <replacefilter
-                token="@org.eclipse.jpt_sdk.feature@"
-                property="org.eclipse.jpt_sdk.feature"/>
-        </replace>
-    </target>
-    <target
-        name="countFiles">
-        <!--
-            files.count is a file that should exist in the drop
-            directory with a count of the zip files in the same
-            directory. It is required to generate a link to the build on
-            the downloads page.
-        -->
-        <countBuildFiles
-            sourceDirectory="${resultDir}"
-            filterString=".zip,.tar.gz"
-            outputFile="${resultDir}/files.count"/>
-    </target>
-
-    <!--Build type descriptors-->
-    <target
-        name="I">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Integration"/>
-    </target>
-    <target
-        name="S">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Stable"/>
-    </target>
-    <target
-        name="N">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Nightly"/>
-    </target>
-    <target
-        name="M">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Maintenance"/>
-    </target>
-    <target
-        name="R">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Release"/>
-    </target>
-    <target
-        name="T">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Test"/>
-    </target>
-    <target
-        name="P">
-        <replace
-            file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
-            token="@type@"
-            value="Patches"/>
-    </target>
-    <target
-        name="checkIfTested">
-        <echo
-            level="debug"
-            message="isBuildTested: ${isBuildTested}"/>
-        <condition
-            property="doTests">
-            <equals
-                arg1="${isBuildTested}"
-                arg2="true"
-                trim="true"
-                casesensitive="false"/>
-        </condition>
-    </target>
-    <target
-        name="checkIfCompileLogs">
-        <condition
-            property="doCompileLogs">
-            <available
-                file="${outputDirectory}"/>
-        </condition>
-    </target>
-    <target
-        name="writeData">
-        <!--  Insert Build Date  -->
-        <replace
-            file="${resultingIndex}"
-            token="@date@"
-            value="${TODAY}"/>
-
-        <!--  Insert Build Name  -->
-        <replace
-            file="${resultingIndex}"
-            token="@build@"
-            value="${buildLabel}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@buildBranch@"
-            value="${buildBranch}"/>
-
-        <!--  Insert PreRequsites  -->
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformFile@"
-            value="${eclipseplatform.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformURL@"
-            value="${eclipseplatform.url}/${eclipseplatform.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformBuildURL@"
-            value="${eclipseplatform.url}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformfilelinux@"
-            value="${eclipseplatform.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformfilewindows@"
-            value="${eclipseplatform.file.win32-win32-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformfilemacos@"
-            value="${eclipseplatform.file.macosx-carbon-ppc}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatformBuildHome@"
-            value="${eclipseplatform.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatform.mirror.prefixuri@"
-            value="${eclipseplatform.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseplatform.fspath.prefix@"
-            value="${eclipseplatform.fspath.prefix}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseFile@"
-            value="${eclipse.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseURL@"
-            value="${eclipse.url}/${eclipse.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseBuildURL@"
-            value="${eclipse.url}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilelinux@"
-            value="${eclipse.file.linux-gtk-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilewindows@"
-            value="${eclipse.file.win32-win32-x86}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipsefilemacos@"
-            value="${eclipse.file.macosx-carbon-ppc}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseBuildHome@"
-            value="${eclipse.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipse.mirror.prefixuri@"
-            value="${eclipse.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipse.fspath.prefix@"
-            value="${eclipse.fspath.prefix}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@testURL@"
-            value="${eclipseTestFramework.url}/${eclipseTestFramework.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@testFile@"
-            value="${eclipseTestFramework.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfName@"
-            value="${emf.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfDescription@"
-            value="${emf.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfFile@"
-            value="${emf.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfURL@"
-            value="${emf.url}/${emf.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfBuildHome@"
-            value="${emf.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emf.mirror.prefixuri@"
-            value="${emf.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsourceURL@"
-            value="${emfsourcedoc.url}/${emfsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsourceFile@"
-            value="${emfsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsourceName@"
-            value="${emfsourcedoc.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsourceDescription@"
-            value="${emfsourcedoc.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsourceBuildHome@"
-            value="${emfsourcedoc.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfsource.mirror.prefixuri@"
-            value="${emfsourcedoc.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsourceURL@"
-            value="${emfxsdsourcedoc.url}/${emfsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsourceFile@"
-            value="${emfxsdsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsourceName@"
-            value="${emfxsdsourcedoc.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsourceDescription@"
-            value="${emfxsdsourcedoc.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsourceBuildHome@"
-            value="${emfxsdsourcedoc.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdsource.mirror.prefixuri@"
-            value="${emfxsdsourcedoc.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdFile@"
-            value="${emfxsd.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdName@"
-            value="${emfxsd.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdDescription@"
-            value="${emfxsd.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdURL@"
-            value="${emfxsd.url}/${emfxsd.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsdBuildHome@"
-            value="${emfxsd.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfxsd.mirror.prefixuri@"
-            value="${emfxsd.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationFile@"
-            value="${emfvalidation.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationURL@"
-            value="${emfvalidation.url}/${emfvalidation.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationBuildHome@"
-            value="${emfvalidation.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidation.mirror.prefixuri@"
-            value="${emfvalidation.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationName@"
-            value="${emfvalidation.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationDescription@"
-            value="${emfvalidation.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsourceFile@"
-            value="${emfvalidationsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsourceURL@"
-            value="${emfvalidationsourcedoc.url}/${emfvalidationsourcedoc.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsourceBuildHome@"
-            value="${emfvalidationsourcedoc.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsource.mirror.prefixuri@"
-            value="${emfvalidationsourcedoc.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsourceName@"
-            value="${emfvalidationsourcedoc.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@emfvalidationsourceDescription@"
-            value="${emfvalidationsourcedoc.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstName@"
-            value="${wst.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstDescription@"
-            value="${wst.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstFile@"
-            value="${wst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstURL@"
-            value="${wst.url}/${wst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wstBuildHome@"
-            value="${wst.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wst.mirror.prefixuri@"
-            value="${wst.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstName@"
-            value="${jst.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstDescription@"
-            value="${jst.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstFile@"
-            value="${jst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstURL@"
-            value="${jst.url}/${jst.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jstBuildHome@"
-            value="${jst.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jst.mirror.prefixuri@"
-            value="${jst.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpName@"
-            value="${wtp.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpDescription@"
-            value="${wtp.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpFile@"
-            value="${wtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpURL@"
-            value="${wtp.url}/${wtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtpBuildHome@"
-            value="${wtp.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@wtp.mirror.prefixuri@"
-            value="${wtp.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefFile@"
-            value="${gef.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefURL@"
-            value="${gef.url}/${gef.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefBuildHome@"
-            value="${gef.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gef.mirror.prefixuri@"
-            value="${gef.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefName@"
-            value="${gef.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@gefDescription@"
-            value="${gef.description}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipserelengFile@"
-            value="${eclipsereleng.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@eclipserelengURL@"
-            value="${eclipsereleng.url}/${eclipsereleng.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipFile@"
-            value="${orbitthirdpartyzip.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipURL@"
-            value="${orbitthirdpartyzip.url}/${orbitthirdpartyzip.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzipBuildHome@"
-            value="${orbitthirdpartyzip.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@orbitthirdpartyzip.mirror.prefixuri@"
-            value="${orbitthirdpartyzip.mirror.prefixuri}"/>
-
-
-        <!-- no longer used. Post 1.5.5 -->
-        <replace
-            file="${resultingIndex}"
-            token="@jemFile@"
-            value="${jem.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jemURL@"
-            value="${jem.url}/${jem.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jemBuildHome@"
-            value="${jem.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@jem.mirror.prefixuri@"
-            value="${jem.mirror.prefixuri}"/>
-        <!--
-            these token/s should not exist in maintenance stream, but do
-            no harm done, so in the interests of keeping builder streams
-            in sync, we'll leave them here as place hold
-        -->
-        <replace
-            file="${resultingIndex}"
-            token="@dtpFile@"
-            value="${dtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtpURL@"
-            value="${dtp.url}/${dtp.file}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtpBuildHome@"
-            value="${dtp.build.home}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtp.mirror.prefixuri@"
-            value="${dtp.mirror.prefixuri}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtpName@"
-            value="${dtp.name}"/>
-        <replace
-            file="${resultingIndex}"
-            token="@dtpDescription@"
-            value="${dtp.description}"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/access_err.gif b/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/access_err.gif
deleted file mode 100644
index 4f0748a..0000000
--- a/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/access_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/access_warn.gif b/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/access_warn.gif
deleted file mode 100644
index 8386e3e..0000000
--- a/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/access_warn.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/buildNotes.php b/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/buildNotes.php
deleted file mode 100644
index f666887..0000000
--- a/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/buildNotes.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<html>
-<head>
-<?php
-$parts = explode("/", getcwd());
-$parts2 = explode("-", $parts[count($parts) - 1]);
-$buildName = $parts2[1];
-
-echo "<title>Build Notes for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Build Notes</font></b></p>
-
-<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"> Build Notes for <?php echo "$buildName"; ?></font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$hasNotes = false;
-$aDirectory = dir("buildnotes");
-while ($anEntry = $aDirectory->read()) {
-	if ($anEntry != "." && $anEntry != "..") {
-		//print_r($anEntry);
-		//echo "<br />";
-
-		$subject = $anEntry;
-		$pattern = '/^buildnotes_(.*)/i';
-		preg_match($pattern, $subject, $matches);
-		$subject = $matches[1];
-		//print_r($subject);
-		//echo "<br />";
-		$pattern = '/^(.*)\.html$/';
-		preg_match($pattern, $subject, $matches);
-		//print_r($matches);
-		//echo "<br />";
-
-		$component = $matches[1];
-
-		$line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
-		echo "<tr>";
-		echo "$line";
-		echo "</tr>";
-		$hasNotes = true;
-
-	}
-}
-$aDirectory.closedir();
-if (!$hasNotes) {
-	echo "<br>There are no build notes for this build.";
-}
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/compile_err.gif b/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/compile_err.gif
deleted file mode 100644
index c2bfdd6..0000000
--- a/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/compile_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/compile_warn.gif b/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/compile_warn.gif
deleted file mode 100644
index cf4fdf9..0000000
--- a/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/compile_warn.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/consoleLogs.php b/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/consoleLogs.php
deleted file mode 100644
index 2ee3c36..0000000
--- a/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/consoleLogs.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<html>
-<head>
-<?php
-$parts = explode("/", getcwd());
-$parts2 = explode("-", $parts[count($parts) - 1]);
-$buildName = $parts2[1];
-
-echo "<title>Test Console Output for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-<title>Console Logs from Running JUnit Plug-in Tests</title>
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b></p>
-
-<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">Console output from running
-		JUnit plugin tests for <?php echo "$buildName"; ?> </font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$rootDir = "testResults/consolelogs";
-$hasNotes = false;
-$aDirectory = dir($rootDir);
-$index = 0;
-$dirindex = 0;
-while ($anEntry = $aDirectory->read()) {
-	if ($anEntry != "." && $anEntry != "..") {
-		if (is_file("$rootDir/$anEntry")) {
-			$entries[$index] = $anEntry;
-			$index++;
-		} else if (is_dir("$rootDir/$anEntry")) {
-			$direntries[$dirindex] = $anEntry;
-			$dirindex++;
-		}
-	}
-}
-$aDirectory->close();
-
-
-sort($entries);
-sort($direntries);
-
-for ($i = 0; $i < $dirindex; $i++) {
-	$anEntry = $direntries[$i];
-	$line = "<td><a href=\"testResults/consolelogs/$anEntry/logIndex.php\">$anEntry</a></td>";
-	echo "<tr>";
-	echo "$line";
-	echo "</tr>";
-}
-for ($i = 0; $i < $index; $i++) {
-	$anEntry = $entries[$i];
-	$logsize = filesize("testResults/consolelogs/$anEntry");
-
-
-	$level = 0;
-	if ($logsize > 20000) {
-		$level = 2;
-	}
-	else if ($logsize > 2000) {
-		$level = 1;
-	}
-
-	if ($level == 0) {
-		$line = "<td><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-	}
-	else if ($level == 1) {
-		$line = "<td><em><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-	} else if ($level == 2) {
-		$line = "<td><strong><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-	}
-
-
-	echo "<tr>";
-	echo "$line";
-	echo "</tr>";
-	$hasNotes = true;
-}
-
-if (!$hasNotes) {
-	echo "<br>There are no test logs for this build.";
-}
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/junit_err.gif b/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/junit_err.gif
deleted file mode 100644
index 1b7ff9d..0000000
--- a/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/junit_err.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/logIndex.php b/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/logIndex.php
deleted file mode 100644
index 721ca00..0000000
--- a/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/logIndex.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<html>
-<head>
-<?php
-
-function endsWith( $str, $sub ) {
-
-	return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub );
-}
-
-$parts = explode("/", getcwd());
-$parts2 = explode("-", $parts[count($parts) - 1]);
-$buildName = $parts2[1];
-
-echo "<title>Test Console Output for $buildName </title>";
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-<title>Console Logs from Running JUnit Plug-in Tests</title>
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b></p>
-
-<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">Console output from running
-		JUnit plugin tests for <?php echo "$buildName"; ?> </font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$hasNotes = false;
-$aDirectory = dir(".");
-$index = 0;
-while ($anEntry = $aDirectory->read()) {
-	if ($anEntry != "." && $anEntry != ".." && !endsWith(__FILE__, $anEntry)) {
-		$entries[$index] = $anEntry;
-		$index++;
-	}
-}
-aDirectory.closedir();
-
-
-sort($entries);
-
-for ($i = 0; $i < $index; $i++) {
-	$anEntry = $entries[$i];
-	$logsize = filesize("$anEntry");
-
-
-	$level = 0;
-	if ($logsize > 20000) {
-		$level = 2;
-	}
-	else if ($logsize > 2000) {
-		$level = 1;
-	}
-
-	if ($level == 0) {
-		$line = "<td><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-	}
-	else if ($level == 1) {
-		$line = "<td><em><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-	} else if ($level == 2) {
-		$line = "<td><strong><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-	}
-
-
-	echo "<tr>";
-	echo "$line";
-	echo "</tr>";
-	$hasNotes = true;
-}
-
-if (!$hasNotes) {
-	echo "<br>There are no test logs for this build.";
-}
-?>
-
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/miscUtil.php b/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/miscUtil.php
deleted file mode 100644
index 5001f38..0000000
--- a/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/miscUtil.php
+++ /dev/null
@@ -1,219 +0,0 @@
-<?php
-
-// todo: unsure if can handle filenames that are URLs?
-// handy constant to compute file size in megabytes
-
-function fileSizeInMegs($filename) {
-	$onemeg=1024*1024;
-	$zipfilesize=filesize($filename);
-	$zipfilesize=round($zipfilesize/$onemeg, 0);
-	return $zipfilesize;
-}
-
-function fileSizeForDisplay($filename) {
-	$onekilo=1024;
-	$onemeg=$onekilo * $onekilo;
-	$criteria = 10 * $onemeg;
-	$scaleChar = "M";
-	if (file_exists($filename)) {
-		$zipfilesize=filesize($filename);
-		if ($zipfilesize > $criteria) {
-			$zipfilesize=round($zipfilesize/$onemeg, 0);
-			$scaleChar = "M";
-		}
-		else {
-			$zipfilesize=round($zipfilesize/$onekilo, 0);
-			$scaleChar = "K";
-		}
-	}
-	else {
-		$zipfilesize = 0;
-	}
-	$result =  "(" . $zipfilesize . $scaleChar . ")";
-	return $result;
-}
-
-
-function displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription) {
-	echo "<td align=\"right\" valign=\"top\" width=\"30%\">";
-	echo "<a href=\"$downloadprefix$filename\">" . $fileShortDescription . "</a>";
-	echo "</td><td align=\"right\" valign=\"top\" width=\"3%\">";
-	echo $zipfilesize;
-	echo "</td>";
-	echo "<td align=\"right\" valign=\"top\" width=\"2%\">";
-	echo "[<a href=\"checksum/$filename.md5\">md5</a>]";
-	echo "</td>";
-}
-
-function resourceExist($url, $mirrorPrefixuri, $prereqfilename, $eclipseFSpathPrefix)
-{
-	$result = false;
-
-	$allowURLopen = ini_get('allow_url_fopen');
-
-	if ($allowURLopen && stream_last_modified($url)) {
-		$result = true;
-	}
-	else {
-		// TODO: for now, we'll do a raw check on the whole file name, since enable_url_open
-		// is off. better would be to check if we are on build.eclipse.org or download.eclipse.org?
-		$wholePath = trim($eclipseFSpathPrefix) . "/" . trim($mirrorPrefixuri) . "/" . trim($prereqfilename);
-		if (file_exists($wholePath)) {
-			$result = true;
-		}
-	}
-	return $result;
-}
-
-function stream_last_modified($url)
-{
-	if (function_exists('version_compare') && version_compare(phpversion(), '4.3.0') > 0)
-	{
-		if (!($fp = @fopen($url, 'r')))
-		return NULL;
-
-		$meta = stream_get_meta_data($fp);
-		for ($j = 0; isset($meta['wrapper_data'][$j]); $j++)
-		{
-			if (strstr(strtolower($meta['wrapper_data'][$j]), 'last-modified'))
-			{
-				$modtime = substr($meta['wrapper_data'][$j], 15);
-				break;
-			}
-		}
-		fclose($fp);
-	}
-	else
-	{
-		$parts = parse_url($url);
-		$host  = $parts['host'];
-		$path  = $parts['path'];
-
-		if (!($fp = @fsockopen($host, 80)))
-		return NULL;
-
-		$req = "HEAD $path HTTP/1.0\r\nUser-Agent: PHP/".phpversion()."\r\nHost: $host:80\r\nAccept: */*\r\n\r\n";
-		fputs($fp, $req);
-
-		while (!feof($fp))
-		{
-			$str = fgets($fp, 4096);
-			if (strstr(strtolower($str), 'last-modified'))
-			{
-				$modtime = substr($str, 15);
-				break;
-			}
-		}
-		fclose($fp);
-	}
-	return isset($modtime) ? strtotime($modtime) : time();
-}
-
-function isMirrored($uriToCheck) {
-	global $debugScript;
-	global $debugFunctions;
-	$localuri = $uriToCheck;
-
-	$debugMirrorList = false;
-	if ($debugScript) {
-		echo "uriToCheck: " . $localuri . "<br />";
-	}
-
-	$xmlcount = 0;
-
-	/* This method true and accurate method of parsing mirror results
-	 * may be expensive, and would
-	 * likely cause artificially high counts of "downloads".
-	 * Could maybe use if somehow only checked once ever 5 minutes or something.
-
-
-	 // turn off warnings, as sometimes HTML is returned, which causes lots of warnings
-	 $holdLevel = error_reporting(E_ERROR);
-	 $mirrorsxml=simplexml_load_file(rawurlencode($localuri) . urlencode("&format=xml"));
-	 error_reporting($holdLevel);
-
-
-	 if ($mirrorsxml) {
-	 if ($debugFunctions) {
-	 echo "root node: " . $mirrorsxml->getName() . "<br />";
-	 }
-	 if (strcmp($mirrorsxml->getName(), "mirrors") == 0) {
-	 foreach ($mirrorsxml->children() as $mirror) {
-	 if (strcmp($mirror->getName(),"mirror") == 0) {
-	 $xmlcount=$xmlcount+1;
-	 }
-	 if ($debugMirrorList) {
-	 print_r($mirror);
-	 echo "<br />";
-	 }
-	 }
-	 }
-	 if ($debugFunctions) {
-	 echo "Mirror count: " . $xmlcount . "<br />";
-	 }
-	 }
-	 */
-	/*
-	 * Use simple heuristic based on pattern
-	 * in the URI ... if it contains "/downloads/" then assume it's mirrored
-	 */
-	if (strpos($uriToCheck, "webtools/downloads/") > 0) {
-		$xmlcount = 1;
-	}
-	return ($xmlcount > 0);
-
-}
-
-// TODO: replace with Phoenix variables
-function getPlatform () {
-	global $debugScript;
-	global $debugFunctions;
-	// getBrowser is expensive, so cache the data
-	static $browser;
-	$platform = "unknown";
-
-
-	if(ini_get("browscap")) {
-		if(!isset($browser)){
-			$browser = get_browser(null, true);
-		}
-
-		if ($browser) {
-			$rawPlatform = $browser['platform'];
-			if ($debugFunctions) {
-				echo "browser platfrom: " . $rawPlatform . "<br />" ;
-			}
-
-			if ($debugFunctions) {
-				$browserKeys = array_keys($browser);
-				foreach ($browserKeys as $key) {
-					echo $key . ": " . $browser[$key] . "<br />";
-				}
-			}
-		}
-		if (strpos($rawPlatform, "Win") === 0) {
-			$platform="windows";
-		} else if (strpos($rawPlatform, "Linux") === 0) {
-			$platform="linux";
-		} else if (strpos($rawPlatform, "Mac") === 0) {
-			$platform="mac";
-		}
-	}
-	return $platform;
-}
-
-
-function getPrereqReferenceOrName($eclipseMirrorScript, $mirrorPrefixuri, $prerequrl, $prereqfilename, $eclipseFSpathPrefix) {
-	// todo: we really only need "if exists" so could make a bit more efficient
-	// I tried "file_exists" but is didn't seem to work on my test server
-	// For these pre-reqs, we assume if they exist, they are mirrored. This is true
-	// 99% of the time.
-
-	if (resourceExist($prerequrl, $mirrorPrefixuri, $prereqfilename, $eclipseFSpathPrefix)) {
-		$reflink="<a href=\"" . $eclipseMirrorScript . $mirrorPrefixuri . "/" . $prereqfilename . "\">" . $prereqfilename . "</a>";
-	} else {
-		$reflink=$prereqfilename;
-	}
-	return $reflink;
-}
-?>
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/pending.gif b/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/pending.gif
deleted file mode 100644
index 66db2a6..0000000
--- a/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/pending.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/pending1.gif b/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/pending1.gif
deleted file mode 100644
index 1b2ea6e..0000000
--- a/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/pending1.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/report2.php b/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/report2.php
deleted file mode 100644
index cb68e7b..0000000
--- a/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/report2.php
+++ /dev/null
@@ -1,45 +0,0 @@
-
-<?php
-
-function parse_testResults($filename)
-{
-	$junitFailures = 0;
-	if (is_file($filename)) {
-		$handle = @fopen($filename, "r");
-		if ($handle)
-		{
-			$size = filesize($filename);
-			$content = fread($handle, $size);
-			fclose($handle);
-			$junitStart = strpos($content, "Errors &amp; Failures");
-			$junitEnd = strpos($content, "</table>", $junitStart);
-			$junitInfo = substr($content, $junitStart, $junitEnd - $junitStart);
-			$start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">");
-			while ($start !== false)
-			{
-				$start += 29;
-				$stop = strpos($junitInfo, "</font></b></td>", $start);
-				if ($stop !== false)
-				{
-					$result = substr($junitInfo, $start, $stop - $start);
-					if (is_numeric($result))
-					{
-						$junitFailures += $result;
-					}
-					else if (strcmp($result, "DNF") == 0)
-					{
-						$junitFailures++;
-					}
-				}
-				$start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">", $stop);
-			}
-			$results = array($junitFailures);
-			return $results;
-		}
-	}
-}
-
-
-?>
-
-
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/templateFiles/compileResults.php.template b/releng.wtpbuilder/distribution/xmlsec.site/templateFiles/compileResults.php.template
deleted file mode 100644
index f785771..0000000
--- a/releng.wtpbuilder/distribution/xmlsec.site/templateFiles/compileResults.php.template
+++ /dev/null
@@ -1,76 +0,0 @@
-<html>
-<head>
-
-<?php
-        $parts = explode("/", getcwd());
-        $parts2 = explode("-", $parts[count($parts) - 1]);
-        $buildName = $parts2[1];
-
-        echo "<title>Compile Logs: Code Bundles for $buildName</title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2%;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-}
-</style>
-</head>
-<body>
-
-<?php
-        echo "<h1>Compile Logs: Code Bundles for $buildName</h1>";
-?>
-
-
-<table id=tabledata align = "center" width="75%" border="1">
-  <tr>
-    <td class="bold" align="center">Compile Logs</td>
-    <td class="bold" align="center">Compile Errors</td>
-    <td class="bold" align="center">Compiler Warnings</td>
-    <td class="bold" align="center">Access Violations</td>
-    <td class="bold" align="center">Access Warnings</td>
-  </tr>
-
-  %compilelogs%
-
-</table>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/xmlsec.site/templateFiles/index.html.template.php
deleted file mode 100644
index 556e62a..0000000
--- a/releng.wtpbuilder/distribution/xmlsec.site/templateFiles/index.html.template.php
+++ /dev/null
@@ -1,850 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<?php
-
-ini_set("display_errors", "true");
-error_reporting (E_ALL);
-
-
-$buildBranch="@buildBranch@";
-$build="@build@";
-$type="@type@";
-$builddate="@date@";
-
-$eclipseMirrorPrefixuri="@eclipse.mirror.prefixuri@";
-$eclipseFSpathPrefix="@eclipse.fspath.prefix@";
-
-$eclipsefilelinux="@eclipsefilelinux@";
-$eclipsefilewindows="@eclipsefilewindows@";
-$eclipsefilemacosx="@eclipsefilemacos@";
-
-$eclipseURL="@eclipseURL@";
-$eclipseFile="@eclipseFile@";
-$eclipseBuildURL="@eclipseBuildURL@";
-$eclipseBuildHome="@eclipseBuildHome@";
-$eclipseName="@eclipseName@";
-$eclipseDescription="@eclipseDescription@";
-
-$eclipseplatformMirrorPrefixuri="@eclipseplatform.mirror.prefixuri@";
-$eclipseplatformFSpathPrefix="@eclipse.fspath.prefix@";
-
-$eclipseplatformfilelinux="@eclipseplatformfilelinux@";
-$eclipseplatformfilewindows="@eclipseplatformfilewindows@";
-$eclipseplatformfilemacosx="@eclipseplatformfilemacos@";
-
-$eclipseplatformURL="@eclipseplatformURL@";
-$eclipseplatformFile="@eclipseplatformFile@";
-$eclipseplatformBuildURL="@eclipseplatformBuildURL@";
-$eclipseplatformBuildHome="@eclipseplatformBuildHome@";
-$eclipseplatformName="@eclipseplatformName@";
-$eclipseplatformDescription="@eclipseplatformDescription@";
-
-$testURL="@testURL@";
-$testFile="@testFile@";
-
-$wstURL="@wstURL@";
-$wstFile="@wstFile@";
-$wstMirrorPrefixuri="@wst.mirror.prefixuri@";
-$wstBuildHome="@wstBuildHome@";
-$wstName="@wstName@";
-$wstDescription="@wstDescription@";
-
-$jstURL="@jstURL@";
-$jstFile="@jstFile@";
-$jstMirrorPrefixuri="@jst.mirror.prefixuri@";
-$jstBuildHome="@jstBuildHome@";
-$jstName="@jstName@";
-$jstDescription="@jstDescription@";
-
-$wtpURL="@wtpURL@";
-$wtpFile="@wtpFile@";
-$wtpMirrorPrefixuri="@wtp.mirror.prefixuri@";
-$wtpBuildHome="@wtpBuildHome@";
-$wtpName="@wtpName@";
-$wtpDescription="@wtpDescription@";
-
-$gefURL="@gefURL@";
-$gefFile="@gefFile@";
-$gefMirrorPrefixuri="@gef.mirror.prefixuri@";
-$gefBuildHome="@gefBuildHome@";
-$gefName="@getName@";
-$gefDescription="@gefDescription@";
-
-$emfURL="@emfURL@";
-$emfFile="@emfFile@";
-$emfMirrorPrefixuri="@emf.mirror.prefixuri@";
-$emfBuildHome="@emfBuildHome@";
-$emfName="@emfName@";
-$emfDescription="@emfDescription@";
-
-$emfsourceURL="@emfsourceURL@";
-$emfsourceFile="@emfsourceFile@";
-$emfsourceMirrorPrefixuri="@emfsource.mirror.prefixuri@";
-$emfsourceBuildHome="@emfsourceBuildHome@";
-$emfsourceName="@emfsourceName@";
-$emfsourceDescription="@emfsourceDescription@";
-
-
-$emfxsdURL="@emfxsdURL@";
-$emfxsdFile="@emfxsdFile@";
-$emfxsdMirrorPrefixuri="@emfxsd.mirror.prefixuri@";
-$emfxsdBuildHome="@emfxsdBuildHome@";
-$emfxsdName="@emfxsdName@";
-$emfxsdDescription="@emfxsdDescription@";
-
-$emfxsdsourceURL="@emfxsdsourceURL@";
-$emfxsdsourceFile="@emfxsdsourceFile@";
-$emfxsdsourceMirrorPrefixuri="@emfxsdsource.mirror.prefixuri@";
-$emfxsdsourceBuildHome="@emfxsdsourceBuildHome@";
-$emfxsdsourceName="@emfxsdsourceName@";
-$emfxsdsourceDescription="@emfxsdsourceDescription@";
-
-
-$emfvalidationURL="@emfvalidationURL@";
-$emfvalidationFile="@emfvalidationFile@";
-$emfvalidationMirrorPrefixuri="@emfvalidation.mirror.prefixuri@";
-$emfvalidationBuildHome="@emfvalidationBuildHome@";
-$emfvalidationName="@emfvalidationName@";
-$emfvalidationDescription="@emfvalidationDescription@";
-
-$emfvalidationsourceURL="@emfvalidationsourceURL@";
-$emfvalidationsourceFile="@emfvalidationsourceFile@";
-$emfvalidationsourceMirrorPrefixuri="@emfvalidationsource.mirror.prefixuri@";
-$emfvalidationsourceBuildHome="@emfvalidationsourceBuildHome@";
-$emfvalidationsourceName="@emfvalidationsourceName@";
-$emfvalidationsourceDescription="@emfvalidationsourceDescription@";
-
-
-$dtpURL="@dtpURL@";
-$dtpFile="@dtpFile@";
-$dtpMirrorPrefixuri="@dtp.mirror.prefixuri@";
-$dtpBuildHome="@dtpBuildHome@";
-$dtpName="@dtpName@";
-$dtpDescription="@dtpDescription@";
-
-
-$eclipserelengFile="@eclipserelengFile@";
-$eclipserelengURL="@eclipserelengURL@";
-$orbitthirdpartyzipFile="@orbitthirdpartyzipFile@";
-$orbitthirdpartyzipURL="@orbitthirdpartyzipURL@";
-$orbitthirdpartyzipBuildHome="@orbitthirdpartyzipBuildHome@";
-$orbitthirdpartyzipMirrorPrefixuri="@orbitthirdpartyzip.mirror.prefixuri@";
-
-
-$prereq_eclipse="true";
-$prereq_eclipseplatform="false";
-$prereq_emf="true";
-$prereq_emfxsd="true";
-$prereq_emfvalidation="false";
-$prereq_gef="true";
-$prereq_dtp="false";
-$prereq_wst="true";
-$prereq_jst="false";
-$prereq_wtp="false";
-
-
-include("miscUtil.php");
-
-
-
-
-$debugScript = false;
-$debugFunctions = false;
-
-$defaultMirrorScript="";
-$defaultWTPMirrorPrefix="./";
-
-$eclipseMirrorScript="http://www.eclipse.org/downloads/download.php?file=";
-
-// TODO: improve so this hard coding isn't required.
-// This depends on the declare script changing webtools/committers to webtools/downloads
-// And, the logic is such that if it is not mirrored, this URI is not used at all, just
-// a relative reference only
-$eclipseWTPMirrorPrefix="/webtools/committers/drops/$buildBranch/$build/";
-
-
-$mirrorScript=$defaultMirrorScript;
-$downloadprefix=$defaultWTPMirrorPrefix;
-
-
-$keytestMirrorString=$eclipseMirrorScript . "$eclipseWTPMirrorPrefix/wtp-incubator-xmlsecurity-sdk-$build.zip";
-if (isMirrored($keytestMirrorString) ) {
-	$mirrorScript=$eclipseMirrorScript;
-	$downloadprefix="${mirrorScript}${eclipseWTPMirrorPrefix}";
-}
-
-if ($debugScript)  {
-	echo "inferred platform: " . getPlatform();
-}
-
-
-// our summary results handling requires php 5 (for simple xml file loading)
-// so, if not php 5, just don't display any summary results
-// This was found to be required, since some mirror our whole site (e.g. IBM)
-// and not all mirrors use PHP 5
-$displayTestSummary=false;
-if (phpversion() >= 5) {
-
-	$code_totalBundles=0;
-	$code_totalErrors=0;
-	$code_totalWarnings=0;
-	$code_totalforbiddenAccessWarningCount=0;
-	$code_totaldiscouragedAccessWarningCount=0;
-
-	$test_totalBundles=0;
-	$test_totalErrors=0;
-	$test_totalWarnings=0;
-	$test_totalforbiddenAccessWarningCount=0;
-	$test_totaldiscouragedAccessWarningCount=0;
-
-
-	$displayTestSummary=true;
-	// expecting grandTotalErrors and grandTotalTests
-	$filename = "unitTestsSummary.xml";
-	if (file_exists($filename)) {
-		$prefix = "unitTests_";
-		$unitTestsSummary = simplexml_load_file($filename);
-		foreach ($unitTestsSummary->summaryItem as $summaryItem) {
-			$name = $summaryItem->name;
-			$value = $summaryItem->value;
-			$code= "\$" . $prefix . $name . " = " . $value . ";";
-			//echo "<br />code: " . $code;
-			eval($code);
-		}
-	}
-
-	$filename = "compilelogsSummary.xml";
-	if (file_exists($filename)) {
-		$prefix = "code_";
-		$compileSummary = simplexml_load_file($filename);
-		foreach ($compileSummary->summaryItem as $summaryItem) {
-			$name = $summaryItem->name;
-			$value = $summaryItem->value;
-			$code= "\$" . $prefix . $name . " = " . $value . ";";
-			//echo "<br />code: " . $code;
-			eval($code);
-		}
-	}
-
-	$filename = "testcompilelogsSummary.xml";
-	if (file_exists($filename)) {
-		$prefix = "test_";
-		$compileSummary = simplexml_load_file($filename);
-		foreach ($compileSummary->summaryItem as $summaryItem) {
-			$name = $summaryItem->name;
-			$value = $summaryItem->value;
-			$code= "\$" . $prefix . $name . " = " . $value . ";";
-			//echo "<br />code: " . $code;
-			eval($code);
-		}
-	}
-}
-
-$incubating="true";
-
-
-
-if ($incubating) {
-	echo '<title>WTP Incubator Downloads</title>';
-}
-else {
-	echo '<title>WTP Downloads</title>';
-}
-
-
-?>
-
-
-</head>
-
-<body>
-
-
-<?php
-
-// tiny banner to remind when looking at "local" machine results
-$serverName = $_SERVER["SERVER_NAME"];
-
-if (!stristr($serverName, "eclipse.org") && !stristr($serverName,"you.are.at.eclipsecon.org")) {
-	echo '<center>
-          <p>
-          Reminder: this is <font color="#FF0000">' .
-	$serverName .
-        '</font>
-          See also
-          <a href="http://download.eclipse.org/webtools/downloads" target="_top">the live public Eclipse site</a>.
-          </p>
-          <hr />
-          </center>';
-
-}
-?>
-
-<?php if ("true" === $incubating) {
-	echo "<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH=\"100%\">";
-	echo "	<tr>";
-	echo "		<td ALIGN=left><font face=\"'Bitstream Vera',Helvetica,Arial\" size=\"+2\"><b><?php echo \"$type\";?>";
-	echo "        Build: $build</b></font></td>";
-	echo "		<td align=\"right\" rowspan=\"3\"><a";
-	echo "			href=\"http://www.eclipse.org/projects/what-is-incubation.php\"><img";
-	echo "			src=\"http://www.eclipse.org/images/egg-incubation.png\"";
-	echo "			alt=\"Incubation\" align=\"middle\" border=\"0\"></a></td>";
-
-
-	echo "	<tr valign=\"top\">";
-	echo "		<td><font size=\"-1\">" . $builddate . "</font></td>";
-	echo "	</tr>";
-	echo "	<tr valign=\"top\">";
-	echo "		<td>";
-	echo "		<p>The Eclipse Web Tools Platform (WTP) Incubator Project provides";
-	echo "		tools for development that are just getting started, or are";
-	echo "		experimental in some fashion.</p>";
-	echo "		</td>";
-	echo "	</tr>";
-	echo "</table>";
-
-} else {
-
-	echo "<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH=\"100%\">";
-	echo "	<tr>";
-	echo "		<td ALIGN=left><font face=\"'Bitstream Vera',Helvetica,Arial\" size=\"+2\"><b>$type";
-	echo "		Build: " . $build . "</b></font></td>";
-
-	echo "	<tr valign=\"top\">";
-	echo "		<td><font size=\"-1\">" . $builddate . "</font></td>";
-	echo "	</tr>";
-	echo "	<tr valign=\"top\">";
-	echo "		<td>";
-	echo "		<p>Component build from the Eclipse Web Tools Platform (WTP) Project.</p>";
-	echo "		</td>";
-	echo "	</tr>";
-	echo "</table>";
-
-} ?>
-
-<!-- ***********  Prerequisites **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-	<tr>
-		<td align="left" valign="top" bgcolor="#0080C0"><font
-			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Prerequisites
-		and Handy Extras</font></td>
-	</tr>
-	<tr>
-		<td>
-		<p>These are the prerequisites to build or run these packages. All are
-		not necessarily required, but instead some subset. Also listed are
-		some frequently needed links for committer-required packages when
-		creating new development environments, or targets to run against.</p>
-		<p>Note that WTP requires Java 5 or higher (and, for some things,
-		actually requires a JDK rather than only a JRE) even though many other
-		<a href="http://www.eclipse.org/downloads/">Eclipse Projects</a> can
-		run with <a href="http://www.eclipse.org/downloads/moreinfo/jre.php">other
-		JRE levels</a>.</p>
-		<p></p>
-		</td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=1 cellpadding=1 width="90%" align="center">
-
-		<?php
-		if ("true" === $prereq_eclipseplatform) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td width=\"40%\">Eclipse Platform</td>";
-
-
-			//customize page depending on user's browser/platform, if we can detect it
-			$usersPlatform = getPlatform();
-			// assume windows by default, since likely most frequent, even for cases where
-			// platform is "unknown". I've noticed Opera reports 'unknown' :(
-			$recommendedFile=$eclipseplatformfilewindows;
-			if (strcmp($usersPlatform,"linux")== 0) {
-				$recommendedFile=$eclipseplatformfilelinux;
-			} else if (strcmp($usersPlatform,"mac") == 0) {
-				$recommendedFile=$eclipseplatformfilemacosx;
-			}
-
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $eclipseplatformBuildURL . "\">appropriate platform</a>";
-			echo " or <a href=\"" . $eclipseplatformBuildHome . "\">equivalent</a></td>";
-
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_eclipse) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td width=\"40%\">Eclipse SDK (Platform, JDT)</td>";
-
-
-			//customize page depending on user's browser/platform, if we can detect it
-			$usersPlatform = getPlatform();
-			// assume windows by default, since likely most frequent, even for cases where
-			// platform is "unknown". I've noticed Opera reports 'unknown' :(
-			$recommendedFile=$eclipsefilewindows;
-			if (strcmp($usersPlatform,"linux")== 0) {
-				$recommendedFile=$eclipsefilelinux;
-			} else if (strcmp($usersPlatform,"mac") == 0) {
-				$recommendedFile=$eclipsefilemacosx;
-			}
-
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $eclipseBuildURL . "\">appropriate platform</a>";
-			echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_emf) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $emfName . "&nbsp;" . $emfDescription ;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $emfMirrorPrefixuri, $emfURL, $emfFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $emfBuildHome . "\">equivalent</a></td>";
-			echo " </tr>";
-		}
-		?>
-
-
-		<?php
-		if ("true" === $prereq_emfxsd) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $emfxsdName . "&nbsp;" . $emfxsdDescription ;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdMirrorPrefixuri, $emfxsdURL, $emfxsdFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $emfxsdBuildHome . "\">equivalent</a></td>";
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_emfvalidation) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $emfvalidationName  . "&nbsp;" . $emfvalidationDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $emfvalidationMirrorPrefixuri, $emfvalidationURL, $emfvalidationFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $emfvalidationBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_gef) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $gefName  . "&nbsp;" . $gefDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $gefMirrorPrefixuri, $gefURL, $gefFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $gefBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_dtp) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $dtpName . "&nbsp;" . $dtpDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $dtpMirrorPrefixuri, $dtpURL, $dtpFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $dtpBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_wst) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $wstName . "&nbsp;" . $wstDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $wstMirrorPrefixuri, $wstURL, $wstFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $wstBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-
-		<?php
-		if ("true" === $prereq_jst) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $jstName . "&nbsp;" . $jstDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $jstMirrorPrefixuri, $jstURL, $jstFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $jstBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-		<?php
-		if ("true" === $prereq_wtp) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
-
-			echo $wtpName . "&nbsp;" . $wtpDescription;
-
-			echo "</td>";
-			echo "<td align=\"right\">";
-
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $wtpMirrorPrefixuri, $wtpURL, $wtpFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $wtpBuildHome . "\">equivalent</a></td>";
-
-			echo " </tr>";
-		}
-		?>
-			<tr valign="middle">
-				<td width="10%"></td>
-				<td colspan="2">
-				<hr />
-				</td>
-			</tr>
-
-
-
-			<?php
-			if ("true" === $prereq_emf) {
-				echo "<tr valign=\"top\">";
-				echo "<td width=\"10%\"></td>";
-				echo "<td>";
-				echo $emfsourceName . "&nbsp;" . $emfsourceDescription;
-				echo "</td> ";
-				echo "<td align=\"right\">";
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfsourceMirrorPrefixuri, $emfsourceURL, $emfsourceFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $emfsourceBuildHome . "\">equivalent</a></td>";
-				echo "</tr>";
-			}
-			?>
-			<?php
-			if ("true" === $prereq_emfxsd) {
-				echo "<tr valign=\"top\">";
-				echo "<td width=\"10%\"></td>";
-				echo "<td>";
-				echo $emfxsdsourceName . "&nbsp;" . $emfxsdsourceDescription;
-				echo "</td> ";
-				echo "<td align=\"right\">";
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdsourceMirrorPrefixuri, $emfxsdsourceURL, $emfxsdsourceFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $emfxsdsourceBuildHome . "\">equivalent</a></td>";
-				echo "</tr>";
-			}
-			?>
-
-			<?php
-			if ("true" === $prereq_emfvalidation) {
-				echo "<tr valign=\"top\">";
-				echo "<td width=\"10%\"></td>";
-				echo "<td>";
-				echo $emfvalidationsourceName . "&nbsp;" . $emfvalidationsourceDescription;
-				echo "</td> ";
-				echo "<td align=\"right\">";
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfvalidationsourceMirrorPrefixuri, $emfvalidationsourceURL, $emfvalidationsourceFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $emfvalidationsourceBuildHome . "\">equivalent</a></td>";
-				echo "</tr>";
-			}
-			?>
-
-			<?php
-			if (true) {
-				echo "<tr valign=\"top\">";
-				echo "<td width=\"10%\"></td>";
-				echo "<td>";
-				echo "Eclipse Test Framework (required only for Automated JUnit tests)";
-				echo "</td> ";
-				echo "<td align=\"right\">";
-
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $testURL, $testFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-				echo "</tr>";
-			}
-			?>
-
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>Eclipse releng tool (required only for committers to more easily
-				"release" code to a build)</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipserelengURL, $eclipserelengFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>Third Party code from Orbit. Not required and is currently much
-				more than needed for WTP, but some committers like using to create a
-				PDE target.</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $orbitthirdpartyzipMirrorPrefixuri, $orbitthirdpartyzipURL, $orbitthirdpartyzipFile,$eclipseFSpathPrefix);
-				echo " or <a href=\"" . $orbitthirdpartyzipBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-		</table>
-		</td>
-	</tr>
-</table>
-
-<!-- ***********  WTP **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-	<tr>
-		<td align=left valign=top colspan="5" bgcolor="#0080C0"><font
-			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF"> Web Tools
-		Platform</font></td>
-	</tr>
-
-	<tr>
-		<td align="left" valign="top" colspan="5">
-		<p>The Zip files includes the features and plugins for the WTP Incubator XML Security Component.</p>
-		</td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
-
-
-			<tr>
-				<td align="left" valign="top" width="10%"><b>Minimal</b></td>
-				<td align="left" valign="top">
-				<p>Executable code only.</p>
-				</td>
-				<?php
-				$zipfilename="wtp-incubator-xmlsecurity-${build}";
-				$filename=$zipfilename.".zip";
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription="xmlsec";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-				?>
-			</tr>
-
-			<tr>
-				<td align="left" valign="top" width="10%"><b>SDK</b></td>
-				<td align="left" valign="top">
-				<p>Executable code and source code.</p>
-				</td>
-				<?php
-				$zipfilename="wtp-incubator-xmlsecurity-sdk-${build}";
-				$filename=$zipfilename.".zip";
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription="xmlsec sdk";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-				?>
-			</tr>
-			<tr>
-				<td align="left" valign="top" width="10%"><b>Tests</b></td>
-				<td align="left" valign="top">
-				<p>Unit tests.</p>
-				</td>
-				<?php
-				$zipfilename="wtp-incubator-xmlsecurity-tests-${build}";
-				$filename=$zipfilename.".zip";
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription="xmlsec tests";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-				?>
-			</tr>
-		</table>
-		</td>
-	
-	
-	<tr>
-
-</table>
-
-
-
-
-
-
-
-<!-- ***********  Build Status **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-	<tr>
-		<td align=left valign=top bgcolor="#0080C0"><font
-			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Status, tests
-		and other interesting details</font></td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
-
-			<tr>
-				<td><!-- 
-				Its silly to always display 'Build notes', but hard to 
-				compute if required or not. 
-				<a href="buildNotes.php">Build notes</a> <br /> 
-				--> <a href="directory.txt">map files</a> <br />
-				<?php
-
-				if ($displayTestSummary) {
-
-
-					if (isset($unitTests_grandTotalErrors)) {
-						$errorColor="green";
-						if ($unitTests_grandTotalErrors > 0) {
-							$errorColor="red";
-						}
-						echo "<a href=\"testResults.php\">Unit test results</a>&nbsp;";
-						echo "<img src=\"junit_err.gif\"/><font color=\"" . $errorColor . "\">" . $unitTests_grandTotalErrors . "</font>&nbsp;&nbsp;Total: " . $unitTests_grandTotalTests;
-					}
-					else {
-						// we hardly ever "pend" anymore ... abscense usually signifies no tests or a build error.
-						echo "<br /><font color=\"orange\">Unit tests don't exists, are pending, or there's a build error.</font>";
-						//&nbsp;&nbsp;<img src=\"pending.gif\"/>";
-					}
-
-					echo "<br />";
-					echo "<a href=\"compileResults.php\">Compile logs: Code Bundles</a>";
-
-					echo "&nbsp;&nbsp;($code_totalBundles)&nbsp;&nbsp;";
-					echo "<img src=\"compile_err.gif\"/><font color=red>$code_totalErrors</font>&nbsp;";
-					echo "<img src=\"compile_warn.gif\"/><font color=orange>$code_totalWarnings</font>&nbsp;";
-					echo "<img src=\"access_err.gif\"/><font color=red>$code_totalforbiddenAccessWarningCount</font>&nbsp;";
-					echo "<img src=\"access_warn.gif\"/><font color=orange>$code_totaldiscouragedAccessWarningCount</font>&nbsp;";
-
-					echo "<br />";
-					echo "<a href=\"testCompileResults.php\">Compile logs: Test Bundles</a>";
-
-					echo "&nbsp;&nbsp;($test_totalBundles)&nbsp;&nbsp;";
-					echo "<img src=\"compile_err.gif\"/><font color=red>$test_totalErrors</font>&nbsp;";
-					echo "<img src=\"compile_warn.gif\"/><font color=orange>$test_totalWarnings</font>&nbsp;";
-					echo "<img src=\"access_err.gif\"/><font color=red>$test_totalforbiddenAccessWarningCount</font>&nbsp;";
-					echo "<img src=\"access_warn.gif\"/><font color=orange>$test_totaldiscouragedAccessWarningCount</font>&nbsp;";
-				}
-
-				?> <br />
-
-				<?php
-				if (file_exists("versioningReportName.php")) {
-					include "versioningReportName.php";
-					$fname="${versionReportFilename}.html";
-					if (file_exists($fname)) {
-						echo "<br /> <a href='$fname'>Versioning Information</a>";
-					}
-}
-?> <?php
-echo "<br />";
-if (file_exists("./apiresults/api-progress.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-progress.html\">API Progress Report</a>";
-}
-if (file_exists("./apiresults/api-info-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-info-summary.html\">APIs Defined by Each Component</a>";
-}
-if (file_exists("./apiresults/api-ref-compatibility.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-ref-compatibility.html\">Adopter Breakage Report</a>";
-}
-if (file_exists("./apiresults/api-violation-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-violation-summary.html\">API Violations</a>";
-}
-if (file_exists("./apiresults/component-api-violation-all.html"))
-{
-	echo "<br /> <a href=\"apiresults/component-api-violation-all.html\">Non-API dependencies</a>";
-}
-if (file_exists("./apiresults/api-tc-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-tc-summary.html\">API Test Coverage</a>";
-}
-if (file_exists("./apiresults/api-javadoc-summary.html"))
-{
-	echo "<br /> <a href=\"apiresults/api-javadoc-summary.html\">API Javadoc Coverage</a>";
-}
-if (file_exists("./apiresults/api-tc-summary.html"))
-{
-	echo "<br /><br /> <a href=\"apiresults/full_test_coverage/api-tc-summary.html\">Test Coverage for All Classes and Methods</a>";
-}
-?> <?php
-if (file_exists("./perfresults/graph/performance.php"))
-{
-	echo "<br />";
-	echo "<br /> <a href=\"perfresults/graph/performance.php\">Performance Results</a>";
-	echo "<br />";
-}
-?></td>
-			</tr>
-
-
-		</table>
-		</td>
-	</tr>
-</table>
-
-
-
-<!-- footer -->
-<center>
-<hr>
-<p>All downloads are provided under the terms and conditions of the <a
-	href="http://www.eclipse.org/legal/notice.html">Eclipse.org Software
-User Agreement</a> unless otherwise specified.</p>
-
-<p>If you have problems downloading the drops, contact the <font
-	face="'Bitstream Vera',Helvetica,Arial" size="-1"><a
-	href="mailto:webmaster@eclipse.org">webmaster</a></font>.</p>
-
-</center>
-<!-- end footer -->
-
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/templateFiles/siteEnablingFeatures.xml b/releng.wtpbuilder/distribution/xmlsec.site/templateFiles/siteEnablingFeatures.xml
deleted file mode 100644
index cc3ed81..0000000
--- a/releng.wtpbuilder/distribution/xmlsec.site/templateFiles/siteEnablingFeatures.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-    <description> The update site contains the enabling features. </description>
-    <category-def
-        name="Enabling Features"
-        label="Enabling Features">
-        <description> This category contains features used by several
-            projects that enable some functionality, but which by
-            themselves are not very interesting. </description>
-    </category-def>
-</site>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/templateFiles/siteWTP.xml b/releng.wtpbuilder/distribution/xmlsec.site/templateFiles/siteWTP.xml
deleted file mode 100644
index f94e83f..0000000
--- a/releng.wtpbuilder/distribution/xmlsec.site/templateFiles/siteWTP.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site
-    pack200="true"
-    mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/webtools/testUpdates/site.xml&amp;format=xml"
-    digestURL="http://download.eclipse.org/webtools/testUpdates/">
-    <description
-        url="http://download.eclipse.org/webtools/declaredUpdates/index.html"> The update site contains the features of the of Eclipse Web
-        Tools Project (WTP) </description>
-    <feature
-        url="features/org.eclipse.wst_@org.eclipse.wst@.jar"
-        id="org.eclipse.wst"
-        version="@org.eclipse.wst@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.wst.sdk_@org.eclipse.wst.sdk@.jar"
-        id="org.eclipse.wst.sdk"
-        version="@org.eclipse.wst.sdk@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jst_@org.eclipse.jst@.jar"
-        id="org.eclipse.jst"
-        version="@org.eclipse.jst@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jst.sdk_@org.eclipse.jst.sdk@.jar"
-        id="org.eclipse.jst.sdk"
-        version="@org.eclipse.jst.sdk@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jpt.feature_@org.eclipse.jpt.feature@.jar"
-        id="org.eclipse.jpt.feature"
-        version="@org.eclipse.jpt.feature@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jpt_sdk.feature_@org.eclipse.jpt_sdk.feature@.jar"
-        id="org.eclipse.jpt_sdk.feature"
-        version="@org.eclipse.jpt_sdk.feature@">
-        <category
-            name="Web Tools Platform (WTP)"/>
-    </feature>
-    <category-def
-        name="Web Tools Platform (WTP)"
-        label="Web Tools Platform (WTP)">
-        <description> This category contains the features of the Eclipse
-            Web Tools Project (WTP). </description>
-    </category-def>
-</site>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/templateFiles/testCompileResults.php.template b/releng.wtpbuilder/distribution/xmlsec.site/templateFiles/testCompileResults.php.template
deleted file mode 100644
index 42d6f65..0000000
--- a/releng.wtpbuilder/distribution/xmlsec.site/templateFiles/testCompileResults.php.template
+++ /dev/null
@@ -1,76 +0,0 @@
-<html>
-<head>
-
-<?php
-        $parts = explode("/", getcwd());
-        $parts2 = explode("-", $parts[count($parts) - 1]);
-        $buildName = $parts2[1];
-
-        echo "<title>Compile Logs: Test Bundles for $buildName</title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2em;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:Bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-}
-</style>
-</head>
-<body>
-
-<?php
-        echo "<h1>Compile Logs: Test Bundles for $buildName</h1>";
-?>
-
-
-<table id=tabledata align = "center" width="75%" border="1">
-  <tr>
-    <td class="bold" align="center">Compile Logs</td>
-    <td class="bold" align="center">Compile Errors</td>
-    <td class="bold" align="center">Compiler Warnings</td>
-    <td class="bold" align="center">Access Violations</td>
-    <td class="bold" align="center">Access Warnings</td>
-  </tr>
-
-  %compilelogs%
-
-</table>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/templateFiles/testResults.php.template b/releng.wtpbuilder/distribution/xmlsec.site/templateFiles/testResults.php.template
deleted file mode 100644
index ddad0b7..0000000
--- a/releng.wtpbuilder/distribution/xmlsec.site/templateFiles/testResults.php.template
+++ /dev/null
@@ -1,119 +0,0 @@
-<html>
-<head>
-
-<?php
-	$parts = explode("/", getcwd());
-	$parts2 = explode("-", $parts[count($parts) - 1]);
-	$buildName = $parts2[1];
-	
-	echo "<title>Test Results for $buildName </title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2em;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:Bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-
-}
-</style>
-
-
-</head>
-<body>
-<p><b><font face="Verdana" size="+3">Test Results</font></b> </p>
-
-<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">
-    Unit Test Results for <?php echo "$buildName"; ?> on Various Platforms and JRE</font></b></td>
-  </tr>
-</table>
-
-<?php
-if (file_exists("testResults"))
-{
-$dir = dir("testResults");
-while ($anEntry = $dir->read())
-{
-  if ($anEntry != "." && $anEntry != ".." && $anEntry != "consolelogs" && $anEntry != "html" && $anEntry != "xml")
-  {
-    $link = "testResults/".$anEntry."/results/index.php";
-    echo "<p><a href=\"$link\">$anEntry</a></p>";
-  }
-}
-}
-?>
-
-<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">Unit 
-      Test Results for <?php echo "$buildName"; ?> </font></b></td>
-  </tr>
-</table>
-
-<table id=tableunittestdata align = "center" width="75%" border="1">
-  <tr> 
-    <td class="bold" align="center" width="70%">Test Suite</td>
-    <td class="bold" align="center" width="10%">Errors &amp; Failures</td>
-    <td class="bold" align="center" width="10%">Total Tests</td>
-    <td class="bold" align="center" width="10%">Total Time (s)</td>
-  </tr>
-  
-  
-  %testresults%
-  
-</table>
-<p></p>
-<br>
-<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"> 
-      Console output logs 
-      <?php echo "$buildName"; ?>
-      </font></b></td>
-  </tr>
-</table>
-<br>
-These <a href="consoleLogs.php">logs</a> contain the console output captured while 
-running the JUnit automated tests. <br>
-<br>
-
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/transformReportToHTML.xml b/releng.wtpbuilder/distribution/xmlsec.site/transformReportToHTML.xml
deleted file mode 100644
index b72f6cd..0000000
--- a/releng.wtpbuilder/distribution/xmlsec.site/transformReportToHTML.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-    name="xsl-conversion"
-    default="main"
-    basedir=".">
-    <target
-        name="main"
-        description="example.@dot.xml to produce example.@dot.html">
-        <xslt
-            destdir="${resultDir}/compilelogs"
-            scanincludeddirectories="true"
-            style="compilerXMLOutputToHTML.xsl"
-            force="true">
-            <fileset
-                dir="${resultDir}/compilelogs"
-                includes="**/*.xml"/>
-        </xslt>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/xmlsec.tests/build.xml b/releng.wtpbuilder/distribution/xmlsec.tests/build.xml
deleted file mode 100644
index fe78906..0000000
--- a/releng.wtpbuilder/distribution/xmlsec.tests/build.xml
+++ /dev/null
@@ -1,330 +0,0 @@
-<project
-    name="Build specific targets and properties"
-    default="runTest">
-    <!--
-        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"/>
-    <fail
-        message="testRoot must be set for this task"
-        unless="testRoot"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-
-
-    <!-- 
-        typcially already set, but in case of standalone tests, may not
-        be
-    -->
-    <property
-        name="buildLabel"
-        value="${buildType}-${buildId}-${timestamp}"/>
-
-
-    <!-- 
-	   Steps to do after the build is done. 
-	 -->
-    <target
-        name="test">
-        <dirname
-            file="${ant.file}"
-            property="currentDirectory"/>
-        <ant
-            antfile="${ant.file}"
-            target="runTest"
-            dir="${currentDirectory}"/>
-    </target>
-
-    <!-- 
-	  Steps to do to test the build results
-   -->
-    <target
-        name="runTest">
-        <dirname
-            file="${ant.file}"
-            property="test.component.dir"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-        <property
-            file="${buildDirectory}/label.properties"/>
-        <property
-            file="${wtp.builder.home}/build.properties"/>
-        <fail
-            message="testRoot must be set for this task"
-            unless="testRoot"/>
-        <mkdir
-            dir="${testRoot}"/>
-
-        <!-- if results already exist, delete them -->
-        <delete
-            dir="${testRoot}/results"
-            failOnError="false"/>
-        <mkdir
-            dir="${testRoot}/results"/>
-        <mkdir
-            dir="${testRoot}/results/consolelogs"/>
-        <copy
-            todir="${testRoot}"
-            overwrite="true">
-            <fileset
-                dir="${test.component.dir}/testScripts"/>
-        </copy>
-        <echo
-            message="BASEOS: ${env.BASEOS}   BASEWS: ${env.BASEWS}   BASEARCH: ${env.BASEARCH} "/>
-        <ant
-            antfile="${test.component.dir}/testdependency.xml"
-            target="get">
-            <property
-                name="dependency.properties"
-                value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-            <property
-                name="base.install.dir"
-                value="${testRoot}"/>
-        </ant>
-        <antcall
-            target="unzipTests"/>
-        <antcall
-            target="runTestEclipse">
-            <param
-                name="testTarget"
-                value="all"/>
-        </antcall>
-        <antcall
-            target="postRunTestEclipse">
-            <param
-                name="testTarget"
-                value="all"/>
-        </antcall>
-    </target>
-    <target
-        name="unzipTests">
-        <!--
-            unzip the builds and junit tests we use 'unzip' here, so we
-            can continue on error, if desired. (such as if zip was not
-            created, due to other failures or options).
-        -->
-        <echo
-            message="installing sdk"/>
-        <exec
-            dir="${buildDirectory}/${buildLabel}"
-            executable="unzip"
-            failonerror="true">
-            <arg
-                line="-o -qq  wtp-incubator-xmlsecurity-sdk-${buildLabel}.zip -d ${testRoot}${dropinsFolder}"/>
-        </exec>
-        <echo
-            message="installing tests"/>
-        <exec
-            dir="${buildDirectory}/${buildLabel}"
-            executable="unzip"
-            failonerror="false">
-            <arg
-                line="-o -qq wtp-incubator-xmlsecurity-tests-${buildLabel}.zip -d ${testRoot}${dropinsFolder}"/>
-        </exec>
-    </target>
-    <!--
-        time out may need to be set/adjust for api or performance tests?
-        This testTimeLimit is the whole, overall limit on tests. There's
-        a shorter one for individual suites. some common values, of
-        milliseconds to more recognizable units: 7200000: 2 hours
-        3600000: 1 hour 1800000: 30 minutes 600000: 10 minutes
-    -->
-    <property
-        name="testTimeLimit"
-        value="7200000"/>
-    <property
-        name="testFailOnError"
-        value="false"/>
-    <target
-        name="runTestEclipse"
-        description="Run our JUnit's within an instance of antRunner">
-        <property
-            name="test-vm"
-            value="${env.JAVA_6_HOME}/bin/java"/>
-
-        <property
-            name="vmargs"
-            value="-Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm}  -Dperf.buildId=${buildType}${date}-${time}"/>
-        <!--
-            set path to eclipse folder. If local folder, use '.';
-            otherwise, use c:\path\to\eclipse or /path/to/eclipse/
-        -->
-        <property
-            name="eclipse.home"
-            value="${testRoot}"/>
-        <echo
-            message="Running junits"/>
-        <!--
-            Remember: using -debug for org.eclipse.ant.core.antRunner
-            produces ant debug info to be output ... which is a TON of
-            stuff
-        -->
-        <echo
-            message="eclipse.launcher: ${eclipse.launcher}"/>
-        <java
-            taskname="unit-test-masterprocess"
-            fork="true"
-            resultProperty="wtpmasterjunitresult"
-            failonerror="false"
-            timeout="${testTimeLimit}"
-            dir="${testRoot}/eclipse"
-            jvm="${env.JAVA_6_HOME}/bin/java"
-            classname="org.eclipse.equinox.launcher.Main">
-            <classpath>
-                <fileset
-                    dir="${testRoot}/eclipse/plugins">
-                    <include
-                        name="org.eclipse.equinox.launcher_*.jar"/>
-                </fileset>
-            </classpath>
-            <jvmarg
-                value="-Xmx512m"/>
-            <jvmarg
-                value="-Dosgi.ws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dosgi.os=${env.BASEOS}"/>
-            <jvmarg
-                value="-Dosgi.arch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-Dws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dos=${env.BASEOS}"/>
-            <jvmarg
-                value="-Darch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-Dnoclean=true"/>
-            <jvmarg
-                value="-DbuildBranch=${buildBranch}"/>
-            <jvmarg
-                value="-DbuildType=${buildType}"/>
-            <jvmarg
-                value="-DbuildId=${buildId}"/>
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <jvmarg
-                value="-Dprojectname=${projectname}"/>
-            <arg
-                value="-nosplash"/>
-            <arg
-                value="-consolelog"/>
-            <arg
-                value="-data"/>
-            <arg
-                value="${testRoot}/overallTestWorkspace"/>
-            <arg
-                value="-application"/>
-            <arg
-                value="org.eclipse.ant.core.antRunner"/>
-            <arg
-                value="-file"/>
-            <arg
-                value="${testRoot}/test.xml"/>
-            <arg
-                value="-logger"/>
-            <arg
-                value="org.apache.tools.ant.DefaultLogger"/>
-            <env
-                key="DISPLAY"
-                value="${env.DISPLAY}"/>
-            <redirector
-                output="${testRoot}/results/fullOutput.txt"
-                error="${testRoot}/results/fullErrorLog.txt"/>
-            <sysproperty
-                key="build.home"
-                value="${env.BUILD_HOME}"/>
-            <sysproperty
-                key="buildDirectory"
-                value="${buildDirectory}"/>
-            <sysproperty
-                key="buildLabel"
-                value="${buildLabel}"/>
-            <sysproperty
-                key="baseLocation"
-                value="${baseLocation}"/>
-            <sysproperty
-                key="testRoot"
-                value="${testRoot}"/>
-            <sysproperty
-                key="testDir"
-                value="${testRoot}"/>
-            <sysproperty
-                key="perf.buildId"
-                value="${buildType}${date}-${time}"/>
-            <sysproperty
-                key="eclipseBuilderDirectory"
-                value="${pde.builder.path}"/>
-            <sysproperty
-                key="buildLabel"
-                value="${buildLabel}"/>
-        </java>
-        <echo
-            message="wtpmasterjunitresult ${wtpmasterjunitresult}"/>
-    </target>
-    <target
-        name="postRunTestEclipse">
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/consolelogs/testLogs"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results">
-                <include
-                    name="*output.txt"/>
-            </fileset>
-        </copy>
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/consolelogs/testSysErrorLogs"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results">
-                <include
-                    name="*error.txt"/>
-            </fileset>
-        </copy>
-        <copy
-            file="${testRoot}/results/fullOutput.txt"
-            toDir="${buildDirectory}/${buildLabel}/testResults/consolelogs/full"
-            overwrite="true"
-            failonerror="false">
-        </copy>
-        <copy
-            file="${testRoot}/results/fullErrorLog.txt"
-            toDir="${buildDirectory}/${buildLabel}/testResults/consolelogs/full"
-            overwrite="true"
-            failonerror="false">
-        </copy>
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/xml"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results/xml">
-                <include
-                    name="*.xml"/>
-            </fileset>
-        </copy>
-        <copy
-            todir="${buildDirectory}/${buildLabel}/testResults/html"
-            overwrite="true"
-            failonerror="false">
-            <fileset
-                dir="${testRoot}/results/html">
-                <include
-                    name="*.html"/>
-            </fileset>
-        </copy>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/xmlsec.tests/templateFiles/index.php b/releng.wtpbuilder/distribution/xmlsec.tests/templateFiles/index.php
deleted file mode 100644
index a42c883..0000000
--- a/releng.wtpbuilder/distribution/xmlsec.tests/templateFiles/index.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<html>
-<head>
-
-<?php
-$parts = explode("/", realpath(".."));
-$label = $parts[count($parts) - 1];
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
-</head>
-<body>
-<p><b><font face="Verdana" size="+3">Test Results</font></b></p>
-<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">Unit Test Results for <?php echo "$label"; ?>
-		</font></b></td>
-	</tr>
-</table>
-<p></p>
-<table border="0">
-</table>
-
-<table width="77%" border="1">
-	<tr>
-		<td width="81%"><b>Tests Performed</b></td>
-		<td width="19%"><b>Errors &amp; Failures</b></td>
-	</tr>
-
-	<?
-	$dir = dir("html");
-	while ($anEntry = $dir->read())
-	{
-		if ($anEntry != "." && $anEntry != "..")
-		{
-			$link = "html/".$anEntry;
-			$xml = "xml/".substr($anEntry, 0, strlen($anEntry)-4)."xml";
-			$count = 0;
-			$fileHandle = fopen($xml, "r");
-			while (!feof($fileHandle))
-			{
-				$aLine = fgets($fileHandle, 4096); // Length parameter only optional after 4.2.0
-				$count = $count + substr_count($aLine, '<error');
-			}
-			fclose($fileHandle);
-			if ($count > 0)
-			{
-				echo "<tr><td><a href=\"$link\"><b><font color=\"red\">";
-				echo "$anEntry";
-				echo "</font></b></a></td>";
-				echo "<td><b><font color=\"red\">$count</font></b></td></tr>";
-			}
-			else
-			{
-				echo "<tr><td><a href=\"$link\">";
-				echo "$anEntry";
-				echo "</a></td>";
-				echo "<td>$count</td></tr>";
-			}
-		}
-	}
-	?>
-
-</table>
-<p></p>
-<br>
-<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"> Console output logs <?php echo "$label"; ?>
-		</font></b></td>
-	</tr>
-</table>
-<br>
-These
-<a href="consolelogs/wtptestlog.txt">logs</a>
-contain the console output captured while running the JUnit automated
-tests.
-<br>
-<br>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/xmlsec.tests/testScripts/JUNIT.XSL b/releng.wtpbuilder/distribution/xmlsec.tests/testScripts/JUNIT.XSL
deleted file mode 100644
index 9cdd80e..0000000
--- a/releng.wtpbuilder/distribution/xmlsec.tests/testScripts/JUNIT.XSL
+++ /dev/null
@@ -1,703 +0,0 @@
-<xsl:stylesheet
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="1.0">
-    <xsl:output
-        method="html"
-        indent="yes"/>
-    <xsl:decimal-format
-        decimal-separator="."
-        grouping-separator=","/>
-    <xsl:template
-        match="testsuites">
-        <HTML>
-            <HEAD>
-                <style
-                    type="text/css"> body { font:normal 68%
-                    verdana,arial,helvetica; color:#000000; } table tr
-                    td, table tr th { font-size: 68%; } table.details tr
-                    th{ font-weight: bold; text-align:left;
-                    background:#a6caf0; } table.details tr td{
-                    background:#eeeee0; } p { line-height:1.5em;
-                    margin-top:0.5em; margin-bottom:1.0em; } h1 {
-                    margin: 0px 0px 5px; font: 165%
-                    verdana,arial,helvetica } h2 { margin-top: 1em;
-                    margin-bottom: 0.5em; font: bold 125%
-                    verdana,arial,helvetica } h3 { margin-bottom: 0.5em;
-                    font: bold 115% verdana,arial,helvetica } h4 {
-                    margin-bottom: 0.5em; font: bold 100%
-                    verdana,arial,helvetica } h5 { margin-bottom: 0.5em;
-                    font: bold 100% verdana,arial,helvetica } h6 {
-                    margin-bottom: 0.5em; font: bold 100%
-                    verdana,arial,helvetica } .Error { font-weight:bold;
-                    color:red; } .Failure { font-weight:bold;
-                    color:purple; } .Properties { text-align:right; } </style>
-                <script
-                    language="JavaScript">
-                    var TestCases = new Array(); var cur;
-                    <xsl:for-each
-                        select="./testsuite">
-                        <xsl:apply-templates
-                            select="properties"/>
-                    </xsl:for-each>
-                </script>
-                <script
-                    language="JavaScript"><![CDATA[
-        function displayProperties (name) {
-          var win = window.open('','JUnitSystemProperties','scrollbars=1,resizable=1');
-          var doc = win.document.open();
-          doc.write("<html><head><title>Properties of " + name + "</title>");
-          doc.write("<style>")
-          doc.write("body {font:normal 68% verdana,arial,helvetica;	color:#000000; }");
-          doc.write("table tr td, table tr th { font-size: 68%; }");
-          doc.write("table.properties { border-collapse:collapse; border-left:solid 1 #cccccc; border-top:solid 1 #cccccc; padding:5px; }");
-          doc.write("table.properties th { text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#eeeeee; }");
-          doc.write("table.properties td { font:normal; text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#fffffff; }");
-          doc.write("h3 { margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica }");
-          doc.write("</style>");
-          doc.write("</head><body>");
-          doc.write("<h3>Properties of " + name + "</h3>");
-          doc.write("<div align=\"right\"><a href=\"javascript:window.close();\">Close</a></div>");
-          doc.write("<table class='properties'>");
-          doc.write("<tr><th>Name</th><th>Value</th></tr>");
-          for (prop in TestCases[name]) {
-            doc.write("<tr><th>" + prop + "</th><td>" + TestCases[name][prop] + "</td></tr>");
-          }
-          doc.write("</table>");
-          doc.write("</body></html>");
-          doc.close();
-          win.focus();
-        }
-      ]]>
-                </script>
-            </HEAD>
-            <body>
-                <a
-                    name="top"></a>
-                <xsl:call-template
-                    name="pageHeader"/>
-
-                <!-- Summary part -->
-                <xsl:call-template
-                    name="summary"/>
-                <hr
-                    size="1"
-                    width="95%"
-                    align="left"/>
-
-                <!-- Package List part -->
-                <xsl:call-template
-                    name="packagelist"/>
-                <hr
-                    size="1"
-                    width="95%"
-                    align="left"/>
-
-                <!-- For each package create its part -->
-                <xsl:call-template
-                    name="packages"/>
-                <hr
-                    size="1"
-                    width="95%"
-                    align="left"/>
-
-                <!-- For each class create the  part -->
-                <xsl:call-template
-                    name="classes"/>
-            </body>
-        </HTML>
-    </xsl:template>
-    <!--
-        ==================================================================
-    -->
-    <!--
-        Write a list of all packages with an hyperlink to the anchor of
-    -->
-    <!--
-        of the package name.
-    -->
-    <!--
-        ==================================================================
-    -->
-    <xsl:template
-        name="packagelist">
-        <h2>Packages</h2>
-        Note: package statistics are not computed recursively, they only
-        sum up all of its testsuites numbers.
-        <table
-            class="details"
-            border="0"
-            cellpadding="5"
-            cellspacing="2"
-            width="95%">
-            <xsl:call-template
-                name="testsuite.test.header"/>
-            <!-- list all packages recursively -->
-            <xsl:for-each
-                select="./testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
-                <xsl:sort
-                    select="@package"/>
-                <xsl:variable
-                    name="testsuites-in-package"
-                    select="/testsuites/testsuite[./@package = current()/@package]"/>
-                <xsl:variable
-                    name="testCount"
-                    select="sum($testsuites-in-package/@tests)"/>
-                <xsl:variable
-                    name="errorCount"
-                    select="sum($testsuites-in-package/@errors)"/>
-                <xsl:variable
-                    name="failureCount"
-                    select="sum($testsuites-in-package/@failures)"/>
-                <xsl:variable
-                    name="timeCount"
-                    select="sum($testsuites-in-package/@time)"/>
-
-                <!-- write a summary for the package -->
-                <tr
-                    valign="top">
-                    <!-- set a nice color depending if there is an error/failure -->
-                    <xsl:attribute
-                        name="class">
-						<xsl:choose>
-							<xsl:when
-                        test="$failureCount &gt; 0">Failure</xsl:when>
-							<xsl:when
-                        test="$errorCount &gt; 0">Error</xsl:when>
-						</xsl:choose>
-					</xsl:attribute>
-                    <td>
-                        <a
-                            href="#{@package}">
-                            <xsl:value-of
-                                select="@package"/>
-                        </a>
-                    </td>
-                    <td>
-                        <xsl:value-of
-                            select="$testCount"/>
-                    </td>
-                    <td>
-                        <xsl:value-of
-                            select="$errorCount"/>
-                    </td>
-                    <td>
-                        <xsl:value-of
-                            select="$failureCount"/>
-                    </td>
-                    <td>
-                        <xsl:call-template
-                            name="display-time">
-                            <xsl:with-param
-                                name="value"
-                                select="$timeCount"/>
-                        </xsl:call-template>
-                    </td>
-                </tr>
-            </xsl:for-each>
-        </table>
-    </xsl:template>
-    <!--
-        ==================================================================
-    -->
-    <!--
-        Write a package level report
-    -->
-    <!--
-        It creates a table with values from the document:
-    -->
-    <!--
-        Name | Tests | Errors | Failures | Time
-    -->
-    <!--
-        ==================================================================
-    -->
-    <xsl:template
-        name="packages">
-        <!-- create an anchor to this package name -->
-        <xsl:for-each
-            select="/testsuites/testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
-            <xsl:sort
-                select="@package"/>
-            <a
-                name="{@package}"></a>
-            <h3>
-                Package
-                <xsl:value-of
-                    select="@package"/>
-            </h3>
-            <table
-                class="details"
-                border="0"
-                cellpadding="5"
-                cellspacing="2"
-                width="95%">
-                <xsl:call-template
-                    name="testsuite.test.header"/>
-
-                <!-- match the testsuites of this package -->
-                <xsl:apply-templates
-                    select="/testsuites/testsuite[./@package = current()/@package]"
-                    mode="print.test"/>
-            </table>
-            <a
-                href="#top">Back to top</a>
-            <p/>
-            <p/>
-        </xsl:for-each>
-    </xsl:template>
-    <xsl:template
-        name="classes">
-        <xsl:for-each
-            select="testsuite">
-            <xsl:sort
-                select="@name"/>
-            <!-- create an anchor to this class name -->
-            <a
-                name="{@name}"></a>
-            <h3>
-                TestCase
-                <xsl:value-of
-                    select="@name"/>
-            </h3>
-            <table
-                class="details"
-                border="0"
-                cellpadding="5"
-                cellspacing="2"
-                width="95%">
-                <xsl:call-template
-                    name="testcase.test.header"/>
-                <!--
-                    test can even not be started at all (failure to load
-                    the class) so report the error directly
-                -->
-                <xsl:if
-                    test="./error">
-                    <tr
-                        class="Error">
-                        <td
-                            colspan="4">
-                            <xsl:apply-templates
-                                select="./error"/>
-                        </td>
-                    </tr>
-                </xsl:if>
-                <xsl:apply-templates
-                    select="./testcase"
-                    mode="print.test"/>
-            </table>
-            <div
-                class="Properties">
-                <a>
-                    <xsl:attribute
-                        name="href">javascript:displayProperties('<xsl:value-of
-                        select="@package"/>.<xsl:value-of
-                        select="@name"/>');</xsl:attribute>
-                    Properties &gt;&gt;
-                </a>
-            </div>
-            <p/>
-            <a
-                href="#top">Back to top</a>
-        </xsl:for-each>
-    </xsl:template>
-    <xsl:template
-        name="summary">
-        <h2>Summary</h2>
-        <xsl:variable
-            name="testCount"
-            select="sum(testsuite/@tests)"/>
-        <xsl:variable
-            name="errorCount"
-            select="sum(testsuite/@errors)"/>
-        <xsl:variable
-            name="failureCount"
-            select="sum(testsuite/@failures)"/>
-        <xsl:variable
-            name="timeCount"
-            select="sum(testsuite/@time)"/>
-        <xsl:variable
-            name="successRate"
-            select="($testCount - $failureCount - $errorCount) div $testCount"/>
-        <table
-            class="details"
-            border="0"
-            cellpadding="5"
-            cellspacing="2"
-            width="95%">
-            <tr
-                valign="top">
-                <th>Tests</th>
-                <th>Failures</th>
-                <th>Errors</th>
-                <th>Success rate</th>
-                <th>Time</th>
-            </tr>
-            <tr
-                valign="top">
-                <xsl:attribute
-                    name="class">
-				<xsl:choose>
-					<xsl:when
-                    test="$failureCount &gt; 0">Failure</xsl:when>
-					<xsl:when
-                    test="$errorCount &gt; 0">Error</xsl:when>
-				</xsl:choose>
-			</xsl:attribute>
-                <td>
-                    <xsl:value-of
-                        select="$testCount"/>
-                </td>
-                <td>
-                    <xsl:value-of
-                        select="$failureCount"/>
-                </td>
-                <td>
-                    <xsl:value-of
-                        select="$errorCount"/>
-                </td>
-                <td>
-                    <xsl:call-template
-                        name="display-percent">
-                        <xsl:with-param
-                            name="value"
-                            select="$successRate"/>
-                    </xsl:call-template>
-                </td>
-                <td>
-                    <xsl:call-template
-                        name="display-time">
-                        <xsl:with-param
-                            name="value"
-                            select="$timeCount"/>
-                    </xsl:call-template>
-                </td>
-            </tr>
-        </table>
-        <table
-            border="0"
-            width="95%">
-            <tr>
-                <td
-                    style="text-align: justify;">
-                    Note:
-                    <i>failures</i>
-                    are anticipated and checked for with assertions
-                    while
-                    <i>errors</i>
-                    are unanticipated.
-                </td>
-            </tr>
-        </table>
-    </xsl:template>
-    <!--
-        Write properties into a JavaScript data structure. This is based
-        on the original idea by Erik Hatcher (erik@hatcher.net)
-    -->
-    <xsl:template
-        match="properties">
-        cur = TestCases['
-        <xsl:value-of
-            select="../@package"/>
-        .
-        <xsl:value-of
-            select="../@name"/>
-        '] = new Array();
-        <xsl:for-each
-            select="property">
-            <xsl:sort
-                select="@name"/>
-            cur['
-            <xsl:value-of
-                select="@name"/>
-            '] = '
-            <xsl:call-template
-                name="JS-escape">
-                <xsl:with-param
-                    name="string"
-                    select="@value"/>
-            </xsl:call-template>
-            ';
-        </xsl:for-each>
-    </xsl:template>
-
-    <!-- Page HEADER -->
-    <xsl:template
-        name="pageHeader">
-        <h1>Unit Test Results</h1>
-        <table
-            width="100%">
-            <tr>
-                <td
-                    align="left"></td>
-                <td
-                    align="right">
-                    Designed for use with
-                    <a
-                        href='http://www.junit.org'>JUnit</a>
-                    and
-                    <a
-                        href='http://jakarta.apache.org/ant'>Ant</a>
-                    .
-                </td>
-            </tr>
-        </table>
-        <hr
-            size="1"/>
-    </xsl:template>
-    <xsl:template
-        match="testsuite"
-        mode="header">
-        <tr
-            valign="top">
-            <th
-                width="80%">Name</th>
-            <th>Tests</th>
-            <th>Errors</th>
-            <th>Failures</th>
-            <th
-                nowrap="nowrap">Time(s)</th>
-        </tr>
-    </xsl:template>
-
-    <!-- class header -->
-    <xsl:template
-        name="testsuite.test.header">
-        <tr
-            valign="top">
-            <th
-                width="80%">Name</th>
-            <th>Tests</th>
-            <th>Errors</th>
-            <th>Failures</th>
-            <th
-                nowrap="nowrap">Time(s)</th>
-        </tr>
-    </xsl:template>
-
-    <!-- method header -->
-    <xsl:template
-        name="testcase.test.header">
-        <tr
-            valign="top">
-            <th>Name</th>
-            <th>Status</th>
-            <th
-                width="80%">Type</th>
-            <th
-                nowrap="nowrap">Time(s)</th>
-        </tr>
-    </xsl:template>
-
-
-    <!-- class information -->
-    <xsl:template
-        match="testsuite"
-        mode="print.test">
-        <tr
-            valign="top">
-            <!-- set a nice color depending if there is an error/failure -->
-            <xsl:attribute
-                name="class">
-			<xsl:choose>
-				<xsl:when
-                test="@failures[.&gt; 0]">Failure</xsl:when>
-				<xsl:when
-                test="@errors[.&gt; 0]">Error</xsl:when>
-			</xsl:choose>
-		</xsl:attribute>
-
-            <!-- print testsuite information -->
-            <td>
-                <a
-                    href="#{@name}">
-                    <xsl:value-of
-                        select="@name"/>
-                </a>
-            </td>
-            <td>
-                <xsl:value-of
-                    select="@tests"/>
-            </td>
-            <td>
-                <xsl:value-of
-                    select="@errors"/>
-            </td>
-            <td>
-                <xsl:value-of
-                    select="@failures"/>
-            </td>
-            <td>
-                <xsl:call-template
-                    name="display-time">
-                    <xsl:with-param
-                        name="value"
-                        select="@time"/>
-                </xsl:call-template>
-            </td>
-        </tr>
-    </xsl:template>
-    <xsl:template
-        match="testcase"
-        mode="print.test">
-        <tr
-            valign="top">
-            <xsl:attribute
-                name="class">
-			<xsl:choose>
-				<xsl:when
-                test="failure | error">Error</xsl:when>
-			</xsl:choose>
-		</xsl:attribute>
-            <td>
-                <xsl:value-of
-                    select="@name"/>
-            </td>
-            <xsl:choose>
-                <xsl:when
-                    test="failure">
-                    <td>Failure</td>
-                    <td>
-                        <xsl:apply-templates
-                            select="failure"/>
-                    </td>
-                </xsl:when>
-                <xsl:when
-                    test="error">
-                    <td>Error</td>
-                    <td>
-                        <xsl:apply-templates
-                            select="error"/>
-                    </td>
-                </xsl:when>
-                <xsl:otherwise>
-                    <td>Success</td>
-                    <td></td>
-                </xsl:otherwise>
-            </xsl:choose>
-            <td>
-                <xsl:call-template
-                    name="display-time">
-                    <xsl:with-param
-                        name="value"
-                        select="@time"/>
-                </xsl:call-template>
-            </td>
-        </tr>
-    </xsl:template>
-    <xsl:template
-        match="failure">
-        <xsl:call-template
-            name="display-failures"/>
-    </xsl:template>
-    <xsl:template
-        match="error">
-        <xsl:call-template
-            name="display-failures"/>
-    </xsl:template>
-
-    <!-- Style for the error and failure in the tescase template -->
-    <xsl:template
-        name="display-failures">
-        <xsl:choose>
-            <xsl:when
-                test="not(@message)">
-                N/A
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of
-                    select="@message"/>
-            </xsl:otherwise>
-        </xsl:choose>
-        <!-- display the stacktrace -->
-        <code>
-            <p/>
-            <xsl:call-template
-                name="br-replace">
-                <xsl:with-param
-                    name="word"
-                    select="."/>
-            </xsl:call-template>
-        </code>
-        <!--
-            the later is better but might be problematic for non-21"
-            monitors...
-        -->
-        <!--pre><xsl:value-of select="."/></pre-->
-    </xsl:template>
-    <xsl:template
-        name="JS-escape">
-        <xsl:param
-            name="string"/>
-        <xsl:choose>
-            <!--
-                something isn't right here, basically all single quotes
-                need to be replaced with backslash-single-quote
-                <xsl:when test="contains($string,'&apos;')">
-                <xsl:value-of
-                select="substring-before($string,'&apos;')"/> \&apos;
-                <xsl:call-template name="JS-escape"> <xsl:with-param
-                name="string"
-                select="substring-after($string,'&apos;')"/>
-                </xsl:call-template> </xsl:when>
-            -->
-            <xsl:when
-                test="contains($string,'\')">
-                <xsl:value-of
-                    select="substring-before($string,'\')"/>
-                \\
-                <xsl:call-template
-                    name="JS-escape">
-                    <xsl:with-param
-                        name="string"
-                        select="substring-after($string,'\')"/>
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of
-                    select="$string"/>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-    <!--
-        template that will convert a carriage return into a br tag
-        @param word the text from which to convert CR to BR tag
-    -->
-    <xsl:template
-        name="br-replace">
-        <xsl:param
-            name="word"/>
-        <xsl:choose>
-            <xsl:when
-                test="contains($word,'&#xA;')">
-                <xsl:value-of
-                    select="substring-before($word,'&#xA;')"/>
-                <br/>
-                <xsl:call-template
-                    name="br-replace">
-                    <xsl:with-param
-                        name="word"
-                        select="substring-after($word,'&#xA;')"/>
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of
-                    select="$word"/>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-    <xsl:template
-        name="display-time">
-        <xsl:param
-            name="value"/>
-        <xsl:value-of
-            select="format-number($value,'0.000')"/>
-    </xsl:template>
-    <xsl:template
-        name="display-percent">
-        <xsl:param
-            name="value"/>
-        <xsl:value-of
-            select="format-number($value,'0.00%')"/>
-    </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/xmlsec.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/xmlsec.tests/testScripts/test.xml
deleted file mode 100644
index 96c6ddc..0000000
--- a/releng.wtpbuilder/distribution/xmlsec.tests/testScripts/test.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<project
-    name="Automated Eclipse Testing"
-    default="all"
-    basedir=".">
-    <property
-        environment="env"/>
-
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-    <echo
-        level="info"
-        message="starting Automated Eclipse Testing"/>
-    <echo
-        level="debug"
-        message="basedir: ${basedir}"/>
-    <echo
-        level="debug"
-        message="testRoot: ${testRoot}"/>
-    <fail
-        message="testRoot must be set"
-        unless="testRoot"/>
-
-    <!--properties file containing the build information-->
-    <property
-        file="${buildDirectory}/label.properties"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-    <!--default directory where test-eclipse will be installed-->
-    <property
-        name="install"
-        value="${testRoot}"/>
-    <!--
-        name that can be added to report name to identify which platform
-        tests results come from
-    -->
-    <property
-        name="platform"
-        value=""/>
-
-    <!-- The root of the eclipse installation -->
-    <property
-        name="eclipse-home"
-        value="${testRoot}${dropinsFolder}/eclipse/"/>
-    <!--
-        The directory that will contain the xml and html results from
-        the tests that are run
-    -->
-    <property
-        name="results"
-        value="${testRoot}/results"/>
-    <property
-        name="library-file"
-        value="${testRoot}/wtp-junit-tests.xml"/>
-    <target
-        name="init">
-    </target>
-    <target
-        name="all"
-        depends="init">
-        <echo
-            level="info"
-            message="Starting Unit Tests"/>
-        <!--
-            unlike other ant tasks, subant defaults to false for
-            inheritall!
-        -->
-        <subant
-            target=""
-            inheritall="true">
-            <fileset
-                dir="${eclipse-home}/plugins/">
-                <exclude
-                    name="**/*performance*/test.xml"/>
-                <include
-                    name="**/test.xml"/>
-            </fileset>
-        </subant>
-        <echo
-            level="info"
-            message="Ended Unit Tests"/>
-        <antcall
-            target="genHtml"/>
-    </target>
-    <target
-        name="genHtml"
-        description="Generates HTML results with provided JUNIT.XSL provided"
-        unless="genHtml.disable">
-        <xslt
-            style="JUNIT.XSL"
-            basedir="${results}/xml"
-            destdir="${results}/html"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/xmlsec.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/xmlsec.tests/testScripts/wtp-junit-tests.xml
deleted file mode 100644
index 62f4501..0000000
--- a/releng.wtpbuilder/distribution/xmlsec.tests/testScripts/wtp-junit-tests.xml
+++ /dev/null
@@ -1,317 +0,0 @@
-<?xml version="1.0"?>
-<project
-    name="JUnit tests"
-    basedir=".">
-    <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-    <target
-        name="init">
-        <property
-            name="junit-report-output"
-            value="${testRoot}/results"/>
-        <mkdir
-            dir="${junit-report-output}/raw"/>
-        <!--
-            if not otherwise set, be sure extraVMargs is at least some
-            string, even if unused string. 
-            
-            Remember, though, extraVMArgs can contain more than one extra arg, 
-            so much be passed to VM as a "line", not "value". 
-        -->
-        <property
-            name="extraVMargs"
-            value="-DextraVMargsunused=notused"/>
-
-        <!-- if not otherwise set, use a unique workspace name -->
-        <property
-            name="data-dir"
-            value="${testRoot}/junitworkspaces/workspace-${classname}"/>
-        <property
-            name="testRoot"
-            value="${testRoot}"/>
-        <!--
-            Some common values, of milliseconds to more recognizable
-            units: 14400000: 4 hours 7200000: 2 hours 3600000: 1 hour
-            1800000: 30 minutes 600000: 10 minutes
-        -->
-        <property
-            name="timeout"
-            value="1800000"/>
-        <property
-            name="junit-report-output"
-            value="${junit-report-output}"/>
-        <property
-            name="formatter"
-            value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter"/>
-        <property
-            name="test-output"
-            value="${junit-report-output}/raw/${classname}.xml"/>
-        <property
-            name="jvm"
-            value="${env.JAVA_6_HOME}/bin/java"/>
-        <dirname
-            file="${ant.file}"
-            property="currentDir"/>
-        <echo
-            level="debug"
-            message="data-dir: ${data-dir}"/>
-        <echo
-            level="debug"
-            message="plugin-name: ${plugin-name}"/>
-        <echo
-            level="debug"
-            message="classname: ${classname}"/>
-        <echo
-            level="info"
-            message="extraVMargs: ${extraVMargs}"/>
-        <echo
-            level="debug"
-            message="timeout: ${timeout}"/>
-        <echo
-            level="debug"
-            message="testRoot: ${testRoot}"/>
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="debug"
-            message="eclipse-home: ${eclipse-home}"/>
-        <echo
-            level="debug"
-            message="junit-report-output: ${junit-report-output}"/>
-        <echo
-            level="debug"
-            message="test-output: ${test-output}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="buildLabel: ${buildLabel}"/>
-        <echo
-            level="debug"
-            message="jvm: ${jvm}"/>
-    </target>
-    <target
-        name="core-test"
-        depends="init">
-        <echo
-            level="info"
-            message="test-type: core-test"/>
-        <ant
-            antfile="${ant.file}"
-            dir="${currentDir}"
-            target="eclipse-test">
-            <property
-                name="application"
-                value="org.eclipse.test.coretestapplication"/>
-        </ant>
-    </target>
-    <target
-        name="ui-test"
-        depends="init">
-        <echo
-            level="info"
-            message="test-type: ui-test"/>
-        <ant
-            antfile="${ant.file}"
-            dir="${currentDir}"
-            target="eclipse-test">
-            <property
-                name="application"
-                value="org.eclipse.test.uitestapplication"/>
-        </ant>
-    </target>
-    <target
-        name="eclipse-test"
-        description="Runs the specified classname as a plug-in test.">
-        <echo
-            level="info"
-            message="Running ${classname}"/>
-        <echo
-            level="debug"
-            message="Result file: ${junit-report-output}/${classname}.xml."/>
-        <echo
-            level="debug"
-            message="DISPLAY: ${env.DISPLAY}"/>
-        <mkdir
-            dir="${buildDirectory}/${buildLabel}/httplogstest"/>
-        <echo
-            message="http log messages to: ${buildDirectory}/${buildLabel}/httplogstest"/>
-    	
-       <condition
-           property="xulRunnerParam"
-           value="org.eclipse.swt.browser.XULRunnerPath"
-           else="XULRunnerPathNotSpecified">
-           <isset
-               property="env.WTP_XULRUNNER"/>
-       </condition>
-        <echo
-            message="xulRunnerParam: ${xulRunnerParam}"/>
-        <echo
-            message="WTP_XULRUNNER: ${env.WTP_XULRUNNER}"/>
-        <!--
-            If there is not exactly one launcher in the stack, we'd best
-            fail fast, since we are not expecting that, and may indicate
-            an installation that would produce unpredictable results
-        -->
-        <!--
-            requires ant 1.7, and at this point, we're running 1.6 from
-            eclipse ... <condition property="expectedNumberOfLaunchers">
-            <resourcecount when="equal" count="1" > <fileset
-            dir="${testRoot}/eclipse/plugins"> <include
-            name="org.eclipse.equinox.launcher_*.jar" /> </fileset>
-            </resourcecount> </condition> <fail message="Did not find
-            expected number of launcher jars. Check installation."
-            unless="expectedNumberOfLaunchers" />
-        -->
-        <java
-            taskname="suiteUnitTest"
-            fork="true"
-            resultProperty="suitejunitresult"
-            failonerror="false"
-            timeout="${timeout}"
-            dir="${testRoot}/eclipse"
-            jvm="${jvm}"
-            classname="org.eclipse.equinox.launcher.Main">
-            <classpath>
-                <fileset
-                    dir="${testRoot}/eclipse/plugins">
-                    <include
-                        name="org.eclipse.equinox.launcher_*.jar"/>
-                </fileset>
-            </classpath>
-            <jvmarg
-                value="-Xmx512m"/>
-            <jvmarg
-                value="-Dosgi.ws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dosgi.os=${env.BASEOS}"/>
-            <jvmarg
-                value="-Dosgi.arch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-DbuildLabel=${buildLabel}"/>
-            <jvmarg
-                value="-DbuildDirectory=${buildDirectory}"/>
-            <jvmarg
-                value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
-            <jvmarg
-                value="-DurlLogLocation=${buildDirectory}/${buildLabel}/httplogstest/outgoinghttplog-${plugin-name}.log"/>
-            <jvmarg
-                value="-Dwtp.autotest.noninteractive=true"/>
-            <jvmarg
-                line="${extraVMargs}"/>
-            <jvmarg
-                value="-Declipse.consolelog=true"/>
-            <jvmarg
-                value="-Dosgi.debug"/>
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <jvmarg
-                value="-Dprojectname=${projectname}"/>
-        	
-              <jvmarg
-                  value="-D${xulRunnerParam}=${env.WTP_XULRUNNER}"/> 	
-        	
-        	
-            <arg
-                value="-nosplash"/>
-            <arg
-                value="-data"/>
-            <arg
-                value="${data-dir}"/>
-            <arg
-                value="-application"/>
-            <arg
-                value="${application}"/>
-            <arg
-                value="formatter=${formatter},${test-output}"/>
-            <arg
-                value="-testPluginName"/>
-            <arg
-                value="${plugin-name}"/>
-            <arg
-                value="-className"/>
-            <arg
-                value="${classname}"/>
-            <env
-                key="DISPLAY"
-                value="${env.DISPLAY}"/>
-            <redirector
-                output="${junit-report-output}/${classname}.output.txt"
-                error="${junit-report-output}/${classname}.error.txt"/>
-        </java>
-        <echo
-            level="info"
-            message="suitejunitresult: ${suitejunitresult}"/>
-        <antcall
-            target="summarizeFailure"/>
-        <antcall
-            target="collect-results"/>
-    </target>
-    <target
-        name="collect-results">
-        <dirname
-            property="output-dir"
-            file="${test-output}"/>
-        <basename
-            property="output-file-name"
-            file="${test-output}"/>
-        <mkdir
-            dir="${junit-report-output}/xml"/>
-        <junitreport
-            todir="${junit-report-output}/xml"
-            tofile="${classname}.xml">
-            <fileset
-                dir="${output-dir}">
-                <include
-                    name="${output-file-name}"/>
-            </fileset>
-        </junitreport>
-        <mkdir
-            dir="${junit-report-output}/html"/>
-        <xslt
-            style="${testRoot}/JUNIT.XSL"
-            basedir="${junit-report-output}"
-            includes="${classname}.xml"
-            destdir="${junit-report-output}/html"/>
-    </target>
-    <target
-        name="collect">
-        <!--
-            deprecated, each test.xml uses it, and we should remove,
-            eventually
-        -->
-        <echo
-            message="Deprecated. There is no need to call the collect task. It no longer does anything. Please remove from your test.xml file"/>
-    </target>
-    <target
-        name="summarizeFailure"
-        depends="checkFailure"
-        if="doFailure">
-        <echo
-            append="true"
-            file="${buildDirectory}/junitFailureList.log">${plugin-name}${line.separator}</echo>
-    </target>
-    <target
-        name="checkFailure">
-        <condition
-            property="doFailure">
-            <not>
-                <equals
-                    arg1="${suitejunitresult}"
-                    arg2="0"
-                    trim="true"/>
-            </not>
-        </condition>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/xmlsec.tests/testdependency.xml b/releng.wtpbuilder/distribution/xmlsec.tests/testdependency.xml
deleted file mode 100644
index 74590a0..0000000
--- a/releng.wtpbuilder/distribution/xmlsec.tests/testdependency.xml
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-    <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <fail
-        message="Required property file does not exist: ${keyCfgFile}">
-        <condition>
-            <not>
-                <available
-                    file="${keyCfgFile}"/>
-            </not>
-        </condition>
-    </fail>
-    <property
-        file="${keyCfgFile}"/>
-    <condition
-        property="getprereq.eclipse">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.eclipseplatform">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.emf">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.emfxsd">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.emfvalidation">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.gef">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.dtp">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.wst">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.jst">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.wtp">
-        <istrue
-            value="false"/>
-    </condition>
-    <target
-        name="get">
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined, which we do later with
-            statements such if="${groupId}.url"
-        -->
-        <property
-            file="${dependency.properties}"/>
-        <antcall
-            target="prereq.emf"/>
-        <antcall
-            target="prereq.emfxsd"/>
-        <antcall
-            target="prereq.emfvalidation"/>
-        <antcall
-            target="prereq.gef"/>
-        <antcall
-            target="prereq.dtp"/>
-        <antcall
-            target="prereq.wst"/>
-        <antcall
-            target="prereq.jst"/>
-        <antcall
-            target="prereq.wtp"/>
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="eclipseTestFramework"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.eclipse"
-        if="getprereq.eclipse">
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.eclipseplatform"
-        if="getprereq.eclipseplatform">
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="eclipseplatform"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emf"
-        if="getprereq.emf">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfxsd"
-        if="getprereq.emfxsd">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfvalidation"
-        if="getprereq.emfvalidation">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="emfvalidation"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.gef"
-        if="getprereq.gef">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.dtp"
-        if="getprereq.dtp">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="dtp"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wst"
-        if="getprereq.wst">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="wst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.jst"
-        if="getprereq.jst">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="jst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wtp"
-        if="getprereq.wtp">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="wtp"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstallBase"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-    <target
-        name="getAndInstallDropins"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}${dropinsFolder}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/launchReadme.txt b/releng.wtpbuilder/launchReadme.txt
deleted file mode 100644
index 738df00..0000000
--- a/releng.wtpbuilder/launchReadme.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-The launch file provided in this directory is 
-an example only. It will need to be cusomized for 
-particular machines, and particular needs. 
-It is an example of how to run the build.xml file from the IDE, 
-for local developer tests. It is not used as part of production builds.
-
-In addition to the environment variables and properties in this launch config, 
-the directory pointed to by LOCAL_BUILD_PROPERTIES_DIR can be used 
-to supply many other properties. See the directorty 'localBuildExample' 
-for a set of example files and properties. 
-
diff --git a/releng.wtpbuilder/localBuildExample/cc_project_build.properties b/releng.wtpbuilder/localBuildExample/cc_project_build.properties
deleted file mode 100644
index 927beb0..0000000
--- a/releng.wtpbuilder/localBuildExample/cc_project_build.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-# 	committer.properties
-
-mapVersionTag=HEAD
-buildType=I
-buildBranch=R3.0
-build.distribution=wtp
-
-
-# 	build.donottagmaps is always false for production 
-# 	builds. 
-build.donottagmaps=true
-
-
-# 		This controls whether java files are re-fetched 
-# 		clean according to releng tags, or simply the 
-# 		local versions used. 
-build.clean=true
-
-
-# skipUnitTests=yes
-# skipCleanBuild=yes
diff --git a/releng.wtpbuilder/localBuildExample/checkout.properties b/releng.wtpbuilder/localBuildExample/checkout.properties
deleted file mode 100644
index 10817bc..0000000
--- a/releng.wtpbuilder/localBuildExample/checkout.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-# 		checkout.propererties
-
-# 		Its handy to set this value to false, 
-# 		to test new versions of releng.wtpbuilder
-# 		If set to false, local edits to wtpbuilder files
-# 		are not over written each time a 
-# 		build starts. 
-# 		Normally always 'true' for "production" builds, 
-# 		in which case the version of releng.wtpbuilder 
-# 		specificed in releng/build.cfg is used for the build.
-
-checkout.builder.clean=true
-
diff --git a/releng.wtpbuilder/localBuildExample/javadoc.properties b/releng.wtpbuilder/localBuildExample/javadoc.properties
deleted file mode 100644
index 68f1226..0000000
--- a/releng.wtpbuilder/localBuildExample/javadoc.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-
-# will cause java doc generation to be skipped, for 
-# those java doc plugins that support it
-# (as of this writing, jst.doc.isv and wst.doc.isv
-# Note: some parts of the javadoc generation will still 
-# occur, but plugin's created, some files copied, etc., 
-# but just not the very expensive javadoc task itself.
-skipJavaDoc=true
-
diff --git a/releng.wtpbuilder/localBuildExample/runbuild.properties b/releng.wtpbuilder/localBuildExample/runbuild.properties
deleted file mode 100644
index a349c8f..0000000
--- a/releng.wtpbuilder/localBuildExample/runbuild.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-
-# adjust classpaths depending on which VM's 
-# are being used on this build machine. 
-
-
-# some standard ones for Sun
-J2SE-1.4=${env.JAVA_4_HOME}/jre/lib/rt.jar:${env.JAVA_4_HOME}/jre/lib/jsse.jar
-J2SE-1.5=${env.JAVA_5_HOME}/jre/lib/rt.jar:${env.JAVA_5_HOME}/jre/lib/jsse.jar
-
-# some standard ones for IBM's JRE
-#J2SE-1.4=${env.JAVA_4_HOME}/jre/lib/core.jar:${env.JAVA_4_HOME}/jre/lib/xml.jar:${env.JAVA_4_HOME}/jre/lib/graphics.jar:${env.JAVA_4_HOME}/jre/lib/server.jar:${env.JAVA_4_HOME}/jre/lib/ibmorbapi.jar:${env.JAVA_4_HOME}/jre/lib/security.jar
-#J2SE-1.5=${env.JAVA_5_HOME}/jre/lib/core.jar:${env.JAVA_5_HOME}/jre/lib/vm.jar:${env.JAVA_5_HOME}/jre/lib/xml.jar:${env.JAVA_5_HOME}/jre/lib/graphics.jar:${env.JAVA_5_HOME}/jre/lib/server.jar:${env.JAVA_5_HOME}/jre/lib/ibmorbapi.jar:${env.JAVA_5_HOME}/jre/lib/security.jar
-
-# Other Execution Environment classpaths should be added, if/when we need them
-
-normalizeJarFiles=false
diff --git a/releng.wtpbuilder/localBuildExample/upload.properties b/releng.wtpbuilder/localBuildExample/upload.properties
deleted file mode 100644
index d275e5a..0000000
--- a/releng.wtpbuilder/localBuildExample/upload.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-# upload.properties
-
-
-
-# These are some properties needed to upload builds from 
-# a build machine to some download machine. These are 
-# ignored if UPLOAD_BUILD environment variable is set to false.
-# 
-uploadUser=davidw
-uploadPassword="This is not really used since ssh login is assumed (required)"
-uploadServer=localhost
-uploadRemoteDirectory=/var/www/html/buildhome/webtools/${site-sub-dir}/drops/${buildBranch}
-
-# rsyncRootPrefix should be empty for Linux machines.
-# But, Windows using cygwin will need something like /cygdrive/G/
-# for what ever drive or directory is parent of build home.
-# This is allow rsync to work (using cygwin).
-#
-# rsyncRootPrefix=
diff --git a/releng.wtpbuilder/one_time_use_scripts/description b/releng.wtpbuilder/one_time_use_scripts/description
deleted file mode 100644
index 8af3150..0000000
--- a/releng.wtpbuilder/one_time_use_scripts/description
+++ /dev/null
@@ -1,13 +0,0 @@
-This directory hold scripts which, for one reason or another, had to be created 
-to do some work, but which are not part of our automated builds. 
-
-They are kept in for documentation, illustration, examples, or future 
-re-use in case a situation comes up again, where some 
-similar one-time work needs to be done. 
-
-They may be changed "at any time" without notice, etc. 
-
-If/when any scripts here evolve to become part of an automated task, 
-they should be moved or copied to a more appropriate folder. 
-
- 
\ No newline at end of file
diff --git a/releng.wtpbuilder/one_time_use_scripts/fixzips.sh b/releng.wtpbuilder/one_time_use_scripts/fixzips.sh
deleted file mode 100644
index 1619a2b..0000000
--- a/releng.wtpbuilder/one_time_use_scripts/fixzips.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-mv /shared/webtools/committers/wtp-R3.0-R/20080616152118/R-3.0-20080616152118/wtp-jpt-sdk-R-3.0-20080616152118.zip /shared/webtools/committers/wtp-R3.0-R/20080616152118/R-3.0-20080616152118/wtp-jpt-sdk-R-3.0-20080616152118ORIG.zip
-mv /shared/webtools/committers/wtp-R3.0-R/20080616152118/R-3.0-20080616152118/wtp-sdk-noop-R-3.0-20080616152118.zip /shared/webtools/committers/wtp-R3.0-R/20080616152118/R-3.0-20080616152118/wtp-sdk-noop-R-3.0-20080616152118ORIG.zip
-mv /shared/webtools/committers/wtp-R3.0-R/20080616152118/R-3.0-20080616152118/wtp-sdk-R-3.0-20080616152118.zip /shared/webtools/committers/wtp-R3.0-R/20080616152118/R-3.0-20080616152118/wtp-sdk-R-3.0-20080616152118ORIG.zip
-
-mv /shared/webtools/committers/wtp-R3.0-R/20080616152118/R-3.0-20080616152118/checksum/wtp-jpt-sdk-R-3.0-20080616152118.zip.md5 /shared/webtools/committers/wtp-R3.0-R/20080616152118/R-3.0-20080616152118/checksum/wtp-jpt-sdk-R-3.0-20080616152118ORIG.zip.md5
-mv /shared/webtools/committers/wtp-R3.0-R/20080616152118/R-3.0-20080616152118/checksum/wtp-sdk-noop-R-3.0-20080616152118.zip.md5 /shared/webtools/committers/wtp-R3.0-R/20080616152118/R-3.0-20080616152118/checksum/wtp-sdk-noop-R-3.0-20080616152118ORIG.zip.md5
-mv /shared/webtools/committers/wtp-R3.0-R/20080616152118/R-3.0-20080616152118/checksum/wtp-sdk-R-3.0-20080616152118.zip.md5 /shared/webtools/committers/wtp-R3.0-R/20080616152118/R-3.0-20080616152118/checksum/wtp-sdk-R-3.0-20080616152118ORIG.zip.md5
-
-mv /shared/webtools/committers/wtp-R3.0-R/20080616152118/R-3.0-20080616152118/checksum/wtp-jpt-sdk-R-3.0-20080616152118.zip.md5antformat /shared/webtools/committers/wtp-R3.0-R/20080616152118/R-3.0-20080616152118/checksum/wtp-jpt-sdk-R-3.0-20080616152118ORIG.zip.md5antformat
-mv /shared/webtools/committers/wtp-R3.0-R/20080616152118/R-3.0-20080616152118/checksum/wtp-sdk-noop-R-3.0-20080616152118.zip.md5antformat /shared/webtools/committers/wtp-R3.0-R/20080616152118/R-3.0-20080616152118/checksum/wtp-sdk-noop-R-3.0-20080616152118ORIG.zip.md5antformat
-mv /shared/webtools/committers/wtp-R3.0-R/20080616152118/R-3.0-20080616152118/checksum/wtp-sdk-R-3.0-20080616152118.zip.md5antformat /shared/webtools/committers/wtp-R3.0-R/20080616152118/R-3.0-20080616152118/checksum/wtp-sdk-R-3.0-20080616152118ORIG.zip.md5antformat
-
-fromString="20080616152118"
-toString="20080616152118ORIG"
-replaceCommand="s!${fromString}!${toString}!g"
-
-perl -w -pi -e ${replaceCommand} /shared/webtools/committers/wtp-R3.0-R/20080616152118/R-3.0-20080616152118/checksum/*.md5
diff --git a/releng.wtpbuilder/one_time_use_scripts/fixzips.xml b/releng.wtpbuilder/one_time_use_scripts/fixzips.xml
deleted file mode 100644
index fffc009..0000000
--- a/releng.wtpbuilder/one_time_use_scripts/fixzips.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<project
-    default="fixzips"
-    basedir=".">
-    <target
-        name="fixzips">
-        <property
-            name="buildDirectory"
-            value="/shared/webtools/committers/wtp-R3.0-R/20080616152118"/>
-        <property
-            name="buildLabel"
-            value="R-3.0-20080616152118"/>
-        <antcall
-            target="fixzip">
-            <param
-                name="newarchiveName"
-                value="wtp-jpt-sdk-R-3.0-20080616152118.zip"/>
-            <param
-                name="archiveName"
-                value="wtp-jpt-sdk-R-3.0-20080616152118ORIG.zip"/>
-        </antcall>
-        <antcall
-            target="fixzip">
-            <param
-                name="newarchiveName"
-                value="wtp-sdk-noop-R-3.0-20080616152118.zip"/>
-            <param
-                name="archiveName"
-                value="wtp-sdk-noop-R-3.0-20080616152118ORIG.zip"/>
-        </antcall>
-        <antcall
-            target="fixzip">
-            <param
-                name="newarchiveName"
-                value="wtp-sdk-R-3.0-20080616152118.zip"/>
-            <param
-                name="archiveName"
-                value="wtp-sdk-R-3.0-20080616152118ORIG.zip"/>
-        </antcall>
-    </target>
-    <target
-        name="fixzip">
-        <zip
-            destfile="${buildDirectory}/${buildLabel}/${newarchiveName}">
-            <zipfileset
-                src="${buildDirectory}/${buildLabel}/${archiveName}"
-                excludes="eclipse/features/org.eclipse.jpt.sdk*/**"/>
-        </zip>
-        <antcall
-            target="createChecksums">
-            <param
-                name="archiveName"
-                value="${newarchiveName}"/>
-        </antcall>
-    </target>
-    <target
-        name="createChecksums">
-        <!--
-            This createChecksums task creates two files, for use in two
-            contexts. a. an x.md5 file, that has the name of the file in
-            the contents. This is good for some "third party"
-            executables, like md5summ, that expects the name in the
-            file. b. since ant does not deal well with md5 files with
-            anything in them other than the checksum, we provide same
-            thing in a file with an md5antformat extension, that has
-            only the checksum.
-        -->
-        <mkdir
-            dir="${buildDirectory}/${buildLabel}/checksum"/>
-        <checksum
-            file="${buildDirectory}/${buildLabel}/${archiveName}"
-            property="md5"/>
-        <echo
-            message="${md5} *${archiveName}"
-            file="${buildDirectory}/${buildLabel}/checksum/${archiveName}.md5"/>
-        <echo
-            message="${md5}"
-            file="${buildDirectory}/${buildLabel}/checksum/${archiveName}.md5antformat"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/one_time_use_scripts/fixzips2.xml b/releng.wtpbuilder/one_time_use_scripts/fixzips2.xml
deleted file mode 100644
index 67742f5..0000000
--- a/releng.wtpbuilder/one_time_use_scripts/fixzips2.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<project default="fixzips" basedir=".">
-	<target name="fixzips">
-		<property name="buildDirectory" value="/shared/webtools/committers/wtp-R3.0-R/20080616152118" />
-		<property name="buildLabel" value="R-3.0-20080616152118" />
-    <antcall target="fixzip">
-      <param name="newarchiveName" value="wtp-sdk-noop-R-3.0-20080616152118a.zip" />
-      <param name="archiveName" value="wtp-sdk-noop-R-3.0-20080616152118ORIG.zip" />
-    </antcall>
-	</target>
-	<target name="fixzip">
-		<zip destfile="${buildDirectory}/${buildLabel}/${newarchiveName}">
-			<zipfileset src="${buildDirectory}/${buildLabel}/${archiveName}" excludes="eclipse/features/org.eclipse.jpt.sdk*/**,eclipse/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport*/**" />
-		</zip>
-		<antcall target="createChecksums">
-			<param name="archiveName" value="${newarchiveName}" />
-		</antcall>
-	</target>
-	<target name="createChecksums">
-		<!-- This createChecksums task creates two files, for use in two contexts.
-          a. an x.md5 file, that has the name of the file in the contents.
-          This is good for some "third party" executables, like md5summ, that
-          expects the name in the file.
-          b. since ant does not deal well with md5 files with anything in them
-          other than the checksum, we provide same thing in a file with
-          an md5antformat extension, that has only the checksum.
-      -->
-		<mkdir dir="${buildDirectory}/${buildLabel}/checksum" />
-		<checksum file="${buildDirectory}/${buildLabel}/${archiveName}" property="md5" />
-		<echo message="${md5} *${archiveName}" file="${buildDirectory}/${buildLabel}/checksum/${archiveName}.md5" />
-		<echo message="${md5}" file="${buildDirectory}/${buildLabel}/checksum/${archiveName}.md5antformat" />
-	</target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/one_time_use_scripts/fixzips3.sh b/releng.wtpbuilder/one_time_use_scripts/fixzips3.sh
deleted file mode 100644
index 7331384..0000000
--- a/releng.wtpbuilder/one_time_use_scripts/fixzips3.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-mv /shared/webtools/committers/wtp-R3.0-R/20080616152118/R-3.0-20080616152118/wtp-jpt-R-3.0-20080616152118.zip /shared/webtools/committers/wtp-R3.0-R/20080616152118/R-3.0-20080616152118/wtp-jpt-R-3.0-20080616152118ORIG.zip
-mv /shared/webtools/committers/wtp-R3.0-R/20080616152118/R-3.0-20080616152118/wtp-noop-R-3.0-20080616152118.zip /shared/webtools/committers/wtp-R3.0-R/20080616152118/R-3.0-20080616152118/wtp-noop-R-3.0-20080616152118ORIG.zip
-mv /shared/webtools/committers/wtp-R3.0-R/20080616152118/R-3.0-20080616152118/wtp-R-3.0-20080616152118.zip /shared/webtools/committers/wtp-R3.0-R/20080616152118/R-3.0-20080616152118/wtp-R-3.0-20080616152118ORIG.zip
-
-mv /shared/webtools/committers/wtp-R3.0-R/20080616152118/R-3.0-20080616152118/checksum/wtp-jpt-R-3.0-20080616152118.zip.md5 /shared/webtools/committers/wtp-R3.0-R/20080616152118/R-3.0-20080616152118/checksum/wtp-jpt-R-3.0-20080616152118ORIG.zip.md5
-mv /shared/webtools/committers/wtp-R3.0-R/20080616152118/R-3.0-20080616152118/checksum/wtp-noop-R-3.0-20080616152118.zip.md5 /shared/webtools/committers/wtp-R3.0-R/20080616152118/R-3.0-20080616152118/checksum/wtp-noop-R-3.0-20080616152118ORIG.zip.md5
-mv /shared/webtools/committers/wtp-R3.0-R/20080616152118/R-3.0-20080616152118/checksum/wtp-R-3.0-20080616152118.zip.md5 /shared/webtools/committers/wtp-R3.0-R/20080616152118/R-3.0-20080616152118/checksum/wtp-R-3.0-20080616152118ORIG.zip.md5
-
-mv /shared/webtools/committers/wtp-R3.0-R/20080616152118/R-3.0-20080616152118/checksum/wtp-jpt-R-3.0-20080616152118.zip.md5antformat /shared/webtools/committers/wtp-R3.0-R/20080616152118/R-3.0-20080616152118/checksum/wtp-jpt-R-3.0-20080616152118ORIG.zip.md5antformat
-mv /shared/webtools/committers/wtp-R3.0-R/20080616152118/R-3.0-20080616152118/checksum/wtp-noop-R-3.0-20080616152118.zip.md5antformat /shared/webtools/committers/wtp-R3.0-R/20080616152118/R-3.0-20080616152118/checksum/wtp-noop-R-3.0-20080616152118ORIG.zip.md5antformat
-mv /shared/webtools/committers/wtp-R3.0-R/20080616152118/R-3.0-20080616152118/checksum/wtp-R-3.0-20080616152118.zip.md5antformat /shared/webtools/committers/wtp-R3.0-R/20080616152118/R-3.0-20080616152118/checksum/wtp-R-3.0-20080616152118ORIG.zip.md5antformat
-
-fromString="20080616152118"
-toString="20080616152118ORIG"
-replaceCommand="s!${fromString}!${toString}!g"
-
-perl -w -pi -e ${replaceCommand} /shared/webtools/committers/wtp-R3.0-R/20080616152118/R-3.0-20080616152118/checksum/*.md5
diff --git a/releng.wtpbuilder/one_time_use_scripts/fixzips3.xml b/releng.wtpbuilder/one_time_use_scripts/fixzips3.xml
deleted file mode 100644
index 6e83b51..0000000
--- a/releng.wtpbuilder/one_time_use_scripts/fixzips3.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<project
-    default="fixzips"
-    basedir=".">
-    <target
-        name="fixzips">
-        <property
-            name="buildDirectory"
-            value="/shared/webtools/committers/wtp-R3.0-R/20080616152118"/>
-        <property
-            name="buildLabel"
-            value="R-3.0-20080616152118"/>
-        <antcall
-            target="fixzip">
-            <param
-                name="newarchiveName"
-                value="wtp-jpt-R-3.0-20080616152118a.zip"/>
-            <param
-                name="archiveName"
-                value="wtp-jpt-R-3.0-20080616152118ORIG.zip"/>
-        </antcall>
-        <antcall
-            target="fixzip">
-            <param
-                name="newarchiveName"
-                value="wtp-noop-R-3.0-20080616152118a.zip"/>
-            <param
-                name="archiveName"
-                value="wtp-noop-R-3.0-20080616152118ORIG.zip"/>
-        </antcall>
-        <antcall
-            target="fixzip">
-            <param
-                name="newarchiveName"
-                value="wtp-R-3.0-20080616152118a.zip"/>
-            <param
-                name="archiveName"
-                value="wtp-R-3.0-20080616152118ORIG.zip"/>
-        </antcall>
-    </target>
-    <target
-        name="fixzip">
-        <zip
-            destfile="${buildDirectory}/${buildLabel}/${newarchiveName}">
-            <zipfileset
-                src="${buildDirectory}/${buildLabel}/${archiveName}"
-                excludes="eclipse/features/org.eclipse.jpt_2*/**"/>
-        </zip>
-        <antcall
-            target="createChecksums">
-            <param
-                name="archiveName"
-                value="${newarchiveName}"/>
-        </antcall>
-    </target>
-    <target
-        name="createChecksums">
-        <!--
-            This createChecksums task creates two files, for use in two
-            contexts. a. an x.md5 file, that has the name of the file in
-            the contents. This is good for some "third party"
-            executables, like md5summ, that expects the name in the
-            file. b. since ant does not deal well with md5 files with
-            anything in them other than the checksum, we provide same
-            thing in a file with an md5antformat extension, that has
-            only the checksum.
-        -->
-        <mkdir
-            dir="${buildDirectory}/${buildLabel}/checksum"/>
-        <checksum
-            file="${buildDirectory}/${buildLabel}/${archiveName}"
-            property="md5"/>
-        <echo
-            message="${md5} *${archiveName}"
-            file="${buildDirectory}/${buildLabel}/checksum/${archiveName}.md5"/>
-        <echo
-            message="${md5}"
-            file="${buildDirectory}/${buildLabel}/checksum/${archiveName}.md5antformat"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/one_time_use_scripts/testrepo.xml b/releng.wtpbuilder/one_time_use_scripts/testrepo.xml
deleted file mode 100644
index 6b18598..0000000
--- a/releng.wtpbuilder/one_time_use_scripts/testrepo.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<project default="testrepo" basedir=".">
-	<target name="testrepo">
-		<p2.mirror source="/home/shared/webtools/committers/wtp-R3.2.0-I/20091028013433/I-3.2.0-20091028013433/wst-sdk" destination="./xmlrepo">
-			<slicingOptions followStrict="true" />
-			<iu id="org.eclipse.wst.xml_sdk.feature" />
-		</p2.mirror>
-	</target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/rootfiles/epl-v10.html b/releng.wtpbuilder/rootfiles/epl-v10.html
deleted file mode 100644
index 34bfd49..0000000
--- a/releng.wtpbuilder/rootfiles/epl-v10.html
+++ /dev/null
@@ -1,265 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Public License - Version 1.0</title>
-<style type="text/css">
-body {
-	size: 8.5in 11.0in;
-	margin: 0.25in 0.5in 0.25in 0.5in;
-	tab-interval: 0.5in;
-}
-
-p {
-	margin-left: auto;
-	margin-top: 0.5em;
-	margin-bottom: 0.5em;
-}
-
-p.list {
-	margin-left: 0.5in;
-	margin-top: 0.05em;
-	margin-bottom: 0.05em;
-}
-</style>
-
-</head>
-
-<body lang="EN-US">
-
-<p align=center><b>Eclipse Public License - v 1.0</b></p>
-
-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS
-ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</p>
-
-<p><b>1. DEFINITIONS</b></p>
-
-<p>&quot;Contribution&quot; means:</p>
-
-<p class="list">a) in the case of the initial Contributor, the
-initial code and documentation distributed under this Agreement, and</p>
-<p class="list">b) in the case of each subsequent Contributor:</p>
-<p class="list">i) changes to the Program, and</p>
-<p class="list">ii) additions to the Program;</p>
-<p class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</p>
-
-<p>&quot;Contributor&quot; means any person or entity that
-distributes the Program.</p>
-
-<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</p>
-
-<p>&quot;Program&quot; means the Contributions distributed in
-accordance with this Agreement.</p>
-
-<p>&quot;Recipient&quot; means anyone who receives the Program under
-this Agreement, including all Contributors.</p>
-
-<p><b>2. GRANT OF RIGHTS</b></p>
-
-<p class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</p>
-
-<p class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</p>
-
-<p class="list">c) Recipient understands that although each
-Contributor grants the licenses to its Contributions set forth herein,
-no assurances are provided by any Contributor that the Program does not
-infringe the patent or other intellectual property rights of any other
-entity. Each Contributor disclaims any liability to Recipient for claims
-brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights
-and licenses granted hereunder, each Recipient hereby assumes sole
-responsibility to secure any other intellectual property rights needed,
-if any. For example, if a third party patent license is required to
-allow Recipient to distribute the Program, it is Recipient's
-responsibility to acquire that license before distributing the Program.</p>
-
-<p class="list">d) Each Contributor represents that to its knowledge
-it has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</p>
-
-<p><b>3. REQUIREMENTS</b></p>
-
-<p>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</p>
-
-<p class="list">a) it complies with the terms and conditions of this
-Agreement; and</p>
-
-<p class="list">b) its license agreement:</p>
-
-<p class="list">i) effectively disclaims on behalf of all
-Contributors all warranties and conditions, express and implied,
-including warranties or conditions of title and non-infringement, and
-implied warranties or conditions of merchantability and fitness for a
-particular purpose;</p>
-
-<p class="list">ii) effectively excludes on behalf of all
-Contributors all liability for damages, including direct, indirect,
-special, incidental and consequential damages, such as lost profits;</p>
-
-<p class="list">iii) states that any provisions which differ from
-this Agreement are offered by that Contributor alone and not by any
-other party; and</p>
-
-<p class="list">iv) states that source code for the Program is
-available from such Contributor, and informs licensees how to obtain it
-in a reasonable manner on or through a medium customarily used for
-software exchange.</p>
-
-<p>When the Program is made available in source code form:</p>
-
-<p class="list">a) it must be made available under this Agreement;
-and</p>
-
-<p class="list">b) a copy of this Agreement must be included with
-each copy of the Program.</p>
-
-<p>Contributors may not remove or alter any copyright notices
-contained within the Program.</p>
-
-<p>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</p>
-
-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
-
-<p>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-(&quot;Commercial Contributor&quot;) hereby agrees to defend and
-indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
-against any losses, damages and costs (collectively &quot;Losses&quot;)
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</p>
-
-<p>For example, a Contributor might include the Program in a
-commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes
-performance claims, or offers warranties related to Product X, those
-performance claims and warranties are such Commercial Contributor's
-responsibility alone. Under this section, the Commercial Contributor
-would have to defend claims against the other Contributors related to
-those performance claims and warranties, and if a court requires any
-other Contributor to pay any damages as a result, the Commercial
-Contributor must pay those damages.</p>
-
-<p><b>5. NO WARRANTY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</p>
-
-<p><b>6. DISCLAIMER OF LIABILITY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER
-RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
-
-<p><b>7. GENERAL</b></p>
-
-<p>If any provision of this Agreement is invalid or unenforceable
-under applicable law, it shall not affect the validity or enforceability
-of the remainder of the terms of this Agreement, and without further
-action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</p>
-
-<p>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</p>
-
-<p>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</p>
-
-<p>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</p>
-
-<p>This Agreement is governed by the laws of the State of New York
-and the intellectual property laws of the United States of America. No
-party to this Agreement will bring a legal action under this Agreement
-more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</p>
-
-</body>
-
-</html>
diff --git a/releng.wtpbuilder/rootfiles/notice.html b/releng.wtpbuilder/rootfiles/notice.html
deleted file mode 100644
index cc1ba4f..0000000
--- a/releng.wtpbuilder/rootfiles/notice.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION,
-INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-(COLLECTIVELY &quot;CONTENT&quot;). USE OF THE CONTENT IS GOVERNED BY
-THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS
-GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.
-IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND
-THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES
-INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the
-Eclipse Foundation is provided to you under the terms and conditions of
-the Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the
-EPL is provided with this Content and is also available at <a
-	href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object
-code, documentation and other files maintained in the Eclipse.org CVS
-repository (&quot;Repository&quot;) in CVS modules (&quot;Modules&quot;)
-and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-	<li>Content may be structured and packaged into modules to
-	facilitate delivering, extending, and upgrading the Content. Typical
-	modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments
-	(&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or
-	JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments
-	and associated material. Each Feature may be packaged as a
-	sub-directory in a directory named &quot;features&quot;. Within a
-	Feature, files named &quot;feature.xml&quot; may contain a list of the
-	names and version numbers of the Plug-ins and/or Fragments associated
-	with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included
-	Features&quot;). Within a Feature, files named &quot;feature.xml&quot;
-	may contain a list of the names and version numbers of Included
-	Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should
-be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;).
-The terms and conditions governing Features and Included Features should
-be contained in files named &quot;license.html&quot; (&quot;Feature
-Licenses&quot;). Abouts and Feature Licenses may be located in any
-directory of a Download or Module including, but not limited to the
-following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of
-	certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is
-installed using the Eclipse Update Manager, you must agree to a license
-(&quot;Feature Update License&quot;) during the installation process. If
-the Feature contains Included Features, the Feature Update License
-should either provide you with the terms and conditions governing the
-Included Features or inform you where you can locate them. Feature
-Update Licenses may be found in the &quot;license&quot; property of
-files named &quot;feature.properties&quot; found within a Feature. Such
-Abouts, Feature Licenses, and Feature Update Licenses contain the terms
-and conditions (or references to such terms and conditions) that govern
-your use of the associated Content in that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY
-REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND
-CONDITIONS. SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE
-NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a
-		href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a
-		href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a
-		href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a
-		href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>
-	<li>Metro Link Public License 1.00 (available at <a
-		href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a
-		href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND
-CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or
-Feature Update License is provided, please contact the Eclipse
-Foundation to determine what terms and conditions govern that particular
-Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you
-are currently may have restrictions on the import, possession, and use,
-and/or re-export to another country, of encryption software. BEFORE
-using any encryption software, please check the country's laws,
-regulations and policies concerning the import, possession, or use, and
-re-export of encryption software, to see if this is permitted.</p>
-
-<small>Java and all Java-based trademarks are trademarks of Sun
-Microsystems, Inc. in the United States, other countries, or both.</small>
-</body>
-</html>
diff --git a/releng.wtpbuilder/scripts/build/buildutilities.xml b/releng.wtpbuilder/scripts/build/buildutilities.xml
deleted file mode 100644
index 5353b55..0000000
--- a/releng.wtpbuilder/scripts/build/buildutilities.xml
+++ /dev/null
@@ -1,715 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-    name="buildutilities"
-    default="nodefault"
-    basedir=".">
-
-    <!-- = = = standard properties pattern = = = -->
-    <!--
-        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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- = = = end standard properties pattern = = = -->
-
-
-    <!-- if not otherwise set, use these default properties -->
-    <property
-        name="debugOptimization"
-        value="false"/>
-    <!--
-        We should not always normalize ("-repack") jars by default,
-        since in production we sign the jars (which does the -repack for
-        us) and not in production we don't really care so why spend the
-        extra time. For jars which are not supposed to be normalized,
-        such as pre-existing jars, they need to be added to the
-        pack.properties file (see the updatePackProperties task). Note:
-        signing does the -repack when we sign. This can be over-ridden
-        by the caller setting normalize to true, but there are know
-        known cases where we want to normalize (and eventually pack) the
-        jar files but not sign them.
-    -->
-    <property
-        name="normalizeJarFiles"
-        value="false"/>
-    <!--
-        we'll currently pack jar files, just as part of "debugging" to
-        help sanity check all is working as expected. Eventually we may
-        want to provide some service there jar files in the bundles
-        directory are packed ... but, there's no known use-case for this
-        so far
-    -->
-    <property
-        name="packJarFiles"
-        value="false"/>
-    <!--
-        Let tmp site be global. Note: we use this odd
-        "tmpsite-archiveName-temp" to make sure unique directories,
-        since in some cases these directories can not be deleted from
-        ant, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=142926,
-        and since directory names ending in .zip are misinterpreted by
-        jarProcessor, see
-        https://bugs.eclipse.org/bugs/show_bug.cgi?id=143385 But, its
-        handy to do as unique directories anyway, since if a larger
-        process calls this mulitiple times, on different zips, and if
-        debugging is turnned on, then all the tmpsite directories are
-        left on disk for post-build inspection.
-    -->
-    <property
-        name="tmpsite"
-        value="${buildDirectory}/tmpsite-${archiveName}-temp"/>
-    <!--
-        ==================================================================================
-        Primary Task: unpackUpdateJarsAndCreateZippedPackages This task
-        takes a zip file of update jars, which is created by PDE build
-        process, and "converts" it to a traditional zip file, processing
-        the jars with pack200 for better compression on update sites.
-        ==================================================================================
-    -->
-    <target
-        name="unpackUpdateJarsAndCreateZippedPackages"
-        depends="init">
-        <!--
-            ==================================================================================
-            1. make "backup" copy of original zip, if debugging, since
-            might be needed for comparison
-            ==================================================================================
-        -->
-        <antcall
-            target="makeBackupCopyForDebugging"/>
-        <!--
-            add pack.properties file that specifies effort level, and
-            files not to sign We don't have to do this if not
-            normalizing and not signing
-        -->
-        <antcall
-            target="updatePackPropertiesFile"/>
-        <!--
-            ==================================================================================
-            2. normalize jars here, from a zip file of update jars. The
-            normalized jars are put in zip file of same name, in a
-            directory named normalized
-            ==================================================================================
-        -->
-        <echo
-            level="info"
-            message="normalize jars if desired ..."/>
-        <antcall
-            target="normalizeJarFiles"/>
-        <echo
-            level="info"
-            message="normalized jars: ${normalizeJarFiles}"/>
-        <!--
-            ==================================================================================
-            3. sign the jars in archive file, if desired
-            ==================================================================================
-        -->
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/signjars.xml"/>
-        <!--
-            ==================================================================================
-            4. unzip the normalized jars in the zip file produced in
-            step 1., to the directory {tmpsite} for further processing.
-            plugins and features end up in {tmpsite}/eclipse
-            ==================================================================================
-        -->
-        <echo
-            level="info"
-            message="unzip normalized update jars to a holding place"/>
-        <echo
-            level="info"
-            message="tmpsite: ${tmpsite}"/>
-        <echo
-            level="info"
-            message="archiveDir: ${archiveDir}"/>
-        <echo
-            level="info"
-            message="archiveName: ${archiveName}"/>
-        <unzip
-            dest="${tmpsite}"
-            src="${archiveDir}/${archiveName}"/>
-        <!--
-            ==================================================================================
-            5. copy all update jars to a common update site directory,
-            if desired. Note: overwite is false to avoid "touching"
-            files already produced and processed by previous steps in a
-            larger build process. This means the updateSite *must* be
-            completely clean before the larger process starts.
-            ==================================================================================
-        -->
-        <antcall
-            target="makeCopyForUpdate"/>
-        <!--
-            ==================================================================================
-            6. for modularity, pack200 is done here, optionally. The
-            resulting gz files are produced in update site directory.
-            This is optional since processing is expensive to do for
-            every build. Only need when ready to declare an update site,
-            and, for exmaple, no need to do for "local" or HEAD builds
-            since developers wouldn't normally need it for a quick check
-            of a build.
-            ==================================================================================
-        -->
-        <echo
-            level="info"
-            message="create pack files if desired ..."/>
-        <antcall
-            target="createPackFilesIfDesired"/>
-        <echo
-            level="info"
-            message="created pack files: ${packJarFiles}"/>
-        <!--
-            7. create a site.xml file, by merging a template site.xml
-            with the feature versions produced by PDE build
-        -->
-        <antcall
-            target="createSiteFiles"/>
-
-        <!-- 8. now generate P2 meta data for that P2 repo -->
-        <echo
-            level="info"
-            message="Generating p2 metadata for P2 repo."/>
-        <antcall
-            target="generateP2Metadata"/>
-        <!--
-            ==================================================================================
-            9. now create traditional zip file of unpacked jars. This
-            type of "unpack" is not related to pack200, but instead
-            means to unpack those jars that are supposed to be unpacked
-            based on feature defintion, if the plugin's unpack attribute
-            is set to true in the feature
-            ==================================================================================
-        -->
-        <!--  use releng task of unpackUpdateJars -->
-        <unpackUpdateJars
-            site="${tmpsite}/eclipse"
-            output="${tmpsite}/unpacked/eclipse"/>
-        <!--
-            add copy of legal doc's here, product.ini, etc., before
-            re-zipping
-        -->
-        <copy
-            todir="${tmpsite}/unpacked/eclipse"
-            overwrite="false">
-            <fileset
-                dir="${wtp.builder.home}/rootfiles">
-            </fileset>
-        </copy>
-        <!--
-            delete the zip file of update jars we started with, which we
-            are about to re-create as traditional zip file
-        -->
-        <delete
-            file="${buildDirectory}/${buildLabel}/${archiveName}"/>
-        <mkdir
-            dir="${buildDirectory}/${buildLabel}"/>
-        <!--
-            recreate zip file now, same name, traditional content, which
-            is mix of folders and jars
-        -->
-        <!--
-            explicitly exclude any features with assembly anywhere in
-            directory names, as these are just for controlling what's
-            built, and are not intended for delivery
-        -->
-        <zip
-            destfile="${buildDirectory}/${buildLabel}/${archiveName}"
-            basedir="${tmpsite}/unpacked"
-            update="false"
-            duplicate="preserve"
-            excludes="**/*assembly*/**"/>
-        <!-- always produce checksum files for any zips produced -->
-        <antcall
-            target="createChecksums"/>
-        <!--
-            ==================================================================================
-            10. can now remove tmpsite as no longer needed, unless
-            debugging
-            ==================================================================================
-        -->
-        <antcall
-            target="deleteTmpSite"/>
-    </target>
-    <!--
-        ==============================================================================================
-        Utility and Helper tasks
-        ==============================================================================================
-    -->
-    <target
-        name="init"
-        depends="check.sign">
-        <condition
-            property="verboseIfDebug"
-            value="-verbose"
-            else="">
-            <istrue
-                value="${debugOptimization}"/>
-        </condition>
-        <condition
-            property="logIfDebug"
-            value="-debug -consolelog"
-            else="">
-            <istrue
-                value="${debugOptimization}"/>
-        </condition>
-        <condition
-            property="keepIfDebug"
-            value="true">
-            <istrue
-                value="${debugOptimization}"/>
-        </condition>
-        <!-- don't normalize if signing, since then it's done by signing -->
-        <condition
-            property="doNormalize"
-            value="true">
-            <and>
-                <istrue
-                    value="${normalizeJarFiles}"/>
-                <not>
-                    <equals
-                        arg1="${doSign}"
-                        arg2="true"
-                        trim="true"
-                        casesensitive="false"/>
-                </not>
-            </and>
-        </condition>
-        <condition
-            property="doPack"
-            value="true">
-            <and>
-                <istrue
-                    value="${packJarFiles}"/>
-                <istrue
-                    value="${createP2repo}"/>
-                <and>
-                    <or>
-                        <istrue
-                            value="${normalizeJarFiles}"/>
-                        <istrue
-                            value="${doSign}"/>
-                    </or>
-                </and>
-            </and>
-        </condition>
-        <condition
-            property="excludeFromRepoZip"
-            value="site.xml">
-            <isfalse
-                value="${doPack}"/>
-        </condition>
-        <condition
-            property="excludeFromRepoZip"
-            value="site.xml,plugins/*.jar,features/*.jar">
-            <istrue
-                value="${doPack}"/>
-        </condition>
-        <condition
-            property="archiveDir"
-            value="${tmpsite}/normalized">
-            <istrue
-                value="${doPack}"/>
-        </condition>
-        <condition
-            property="archiveDir"
-            value="${buildDirectory}/${buildLabel}">
-            <isfalse
-                value="${doPack}"/>
-        </condition>
-        <condition
-            property="doP2Repo"
-            value="true">
-            <available
-                file="${buildDirectory}/maps/webtools.maps/releng/sitefile/site.xml"/>
-        </condition>
-        <!-- echo important values, so it's documneted in build logs -->
-        <echo
-            message="doPack: ${doPack}"/>
-        <echo
-            message="packJarFiles: ${packJarFiles}"/>
-        <echo
-            message="normalizeJarFiles: ${normalizeJarFiles}"/>
-        <echo
-            message="doSign: ${doSign}"/>
-        <echo
-            message="doNormalize: ${doNormalize}"/>
-        <echo
-            message="doP2Repo: ${doP2Repo}"/>
-    </target>
-    <target
-        name="deleteTmpSite"
-        unless="keepIfDebug">
-        <delete
-            dir="${tmpsite}"/>
-    </target>
-    <target
-        name="normalizeJarFiles"
-        if="doNormalize"
-        depends="init">
-        <!--
-            stick with JAVA5 for signing/packing for now ... I've heard
-            rumors of some 'compatibility' issues with JAVA6?
-        -->
-        <echo
-            message="Starting normalizeJarFiles"/>
-        <echo
-            message="archiveDir: ${archiveDir}"/>
-        <java
-            jar="${eclipse.launcher}"
-            fork="true"
-            jvm="${env.JAVA_5_HOME}/bin/java"
-            failonerror="true"
-            maxmemory="512m"
-            dir="${buildDirectory}">
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <arg
-                line="${logIfDebug}"/>
-            <arg
-                line="-application org.eclipse.update.core.siteOptimizer"/>
-            <!--
-                note: this -processAll option is critical in this first
-                step. For various reasons, jarProcessor is written to
-                not act on any jar if the jar is not "marked", or if not
-                told explicitly to to processAll. There are ways where
-                not all are literally processed, such as using
-                pack.properties (and others, see
-                http://wiki.eclipse.org/JarProcessor_Options).
-            -->
-            <arg
-                line="-jarProcessor ${verboseIfDebug} -processAll -outputDir ${archiveDir}  -repack ${buildDirectory}/${buildLabel}/${archiveName}"/>
-        </java>
-    </target>
-    <target
-        name="createPackFilesIfDesired"
-        if="doPack"
-        depends="init">
-        <!--
-            stick with JAVA5 for signing/packing for now ... I've heard
-            rumors of some 'compatibility' issues with JAVA6?
-        -->
-        <!--
-            <java
-            jar="${pde.builder.path}/plugins/org.eclipse.equinox.launcher.jar"
-            fork="true" jvm="${env.JAVA_5_HOME}/bin/java"
-            failonerror="true" maxmemory="512m" dir="${buildDirectory}">
-            <jvmarg
-            value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/> <arg
-            line="${logIfDebug}"/> <arg line="-application
-            org.eclipse.update.core.siteOptimizer"/> <arg
-            line="-jarProcessor ${verboseIfDebug} -outputDir
-            ${buildDirectory}/${buildLabel}/updateSite -pack
-            ${buildDirectory}/${buildLabel}/updateSite"/> </java>
-        -->
-        <java
-            jar="${pde.builder.path}/plugins/org.eclipse.equinox.launcher.jar"
-            fork="true"
-            jvm="${env.JAVA_5_HOME}/bin/java"
-            failonerror="true"
-            maxmemory="512m"
-            dir="${buildDirectory}">
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <arg
-                line="${logIfDebug}"/>
-            <arg
-                line="-application org.eclipse.update.core.siteOptimizer"/>
-            <arg
-                line="-jarProcessor  ${verboseIfDebug} -outputDir ${buildDirectory}/${buildLabel}/${component}/updateSite -pack ${buildDirectory}/${buildLabel}/${component}/updateSite"/>
-        </java>
-    </target>
-    <!--
-        always make copy, since normally either normalized, or signed
-        (and normalized) TODO: (minor) tiny improvement in efficiency
-        could be made, for N-builds?, that are neither normalized nor
-        signed.
-    -->
-    <target
-        name="makeCopyForUpdate">
-        <mkdir
-            dir="${buildDirectory}/${buildLabel}/updateSite"/>
-        <copy
-            todir="${buildDirectory}/${buildLabel}/updateSite"
-            overwrite="false">
-            <fileset
-                dir="${tmpsite}/eclipse">
-                <exclude
-                    name="**/*assembly*/**"/>
-            </fileset>
-        </copy>
-        <mkdir
-            dir="${buildDirectory}/${buildLabel}/${component}/updateSite"/>
-        <copy
-            todir="${buildDirectory}/${buildLabel}/${component}/updateSite"
-            overwrite="false">
-            <fileset
-                dir="${tmpsite}/eclipse">
-                <exclude
-                    name="**/*assembly*/**"/>
-            </fileset>
-        </copy>
-    </target>
-    <target
-        name="makeBackupCopyForDebugging"
-        if="keepIfDebug">
-        <!--
-            temporary copy while confirming build to be able to do
-            side-by-side comparisons
-        -->
-        <mkdir
-            dir="${buildDirectory}/backuporiginalzips"/>
-        <copy
-            file="${buildDirectory}/${buildLabel}/${archiveName}"
-            todir="${buildDirectory}/backuporiginalzips"/>
-    </target>
-    <target
-        name="createChecksums">
-        <!--
-            This createChecksums task creates two files, for use in two
-            contexts. a. an x.md5 file, that has the name of the file in
-            the contents. This is good for some "third party"
-            executables, like md5summ, that expects the name in the
-            file. b. since ant does not deal well with md5 files with
-            anything in them other than the checksum, we provide same
-            thing in a file with an md5antformat extension, that has
-            only the checksum.
-        -->
-        <mkdir
-            dir="${buildDirectory}/${buildLabel}/checksum"/>
-        <checksum
-            file="${buildDirectory}/${buildLabel}/${archiveName}"
-            property="md5"/>
-        <echo
-            message="${md5} *${archiveName}"
-            file="${buildDirectory}/${buildLabel}/checksum/${archiveName}.md5"/>
-        <echo
-            message="${md5}"
-            file="${buildDirectory}/${buildLabel}/checksum/${archiveName}.md5antformat"/>
-    </target>
-    <target
-        name="check.sign">
-        <echo
-            message="sign: ${sign}"/>
-        <echo
-            message="env skip jar signing: ${env.SKIP_JAR_SIGNING}"/>
-        <echo
-            message="skip jar signing: ${SKIP_JAR_SIGNING}"/>
-        <condition
-            property="doSign">
-            <and>
-                <equals
-                    arg1="${sign}"
-                    arg2="true"
-                    trim="true"
-                    casesensitive="false"/>
-                <not>
-                    <equals
-                        arg1="${env.SKIP_JAR_SIGNING}"
-                        arg2="true"
-                        trim="true"
-                        casesensitive="false"/>
-                </not>
-                <not>
-                    <equals
-                        arg1="${SKIP_JAR_SIGNING}"
-                        arg2="true"
-                        trim="true"
-                        casesensitive="false"/>
-                </not>
-            </and>
-        </condition>
-        <echo
-            message="doSign: ${doSign}"/>
-    </target>
-
-    <!-- Call the p2 metadata generator on the update site. -->
-    <!-- TODO: do we need to pack200 files first? (create gz files?) -->
-    <target
-        name="generateP2Metadata"
-        depends="init"
-        if="doP2Repo">
-
-
-        <!-- 1. Generate the P2 metadata -->
-        <!--
-            ant version <p2.generator
-            updateSite="${buildDirectory}/${buildLabel}/${component}/updateSite"
-            compress="true"
-            metadataRepository="file:${buildDirectory}/${buildLabel}/${component}/updateSite"
-            artifactRepository="file:${buildDirectory}/${buildLabel}/${component}/updateSite"
-            metadataRepositoryName="Web Tools Platform Repository"
-            artifactRepositoryName="Web Tools Platform Repository"
-            noDefaultIUs="true"/>
-        -->
-        <!--
-            java invocation version (Orbit had trouble running ant
-            version, so used direct java call
-        -->
-        <!--
-            these shouldn't exist ... but, just in case something
-            changes in future we'll be sure
-        -->
-        <delete
-            quiet="true"
-            file="${buildDirectory}/${buildLabel}/${component}/updateSite/artifacts.jar"/>
-        <delete
-            quiet="true"
-            file="${buildDirectory}/${buildLabel}/${component}/updateSite/content.jar"/>
-        <java
-            jar="${eclipse.launcher}"
-            fork="true"
-            jvm="${env.JAVA_5_HOME}/bin/java"
-            failonerror="true"
-            maxmemory="512m"
-            dir="${buildDirectory}">
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <arg
-                line="-application org.eclipse.equinox.p2.metadata.generator.EclipseGenerator"/>
-            <arg
-                line="-consoleLog"/>
-            <arg
-                line="-nosplash"/>
-            <arg
-                line="--launcher.suppressErrors"/>
-            <arg
-                line="-metadataRepository file:${buildDirectory}/${buildLabel}/${component}/updateSite"/>
-            <arg
-                line="-artifactRepository file:${buildDirectory}/${buildLabel}/${component}/updateSite"/>
-            <arg
-                line="-metadataRepositoryName Web-Tools-Platform-${buildLabel}"/>
-            <arg
-                line="-artifactRepositoryName Web-Tools-Platform-${buildLabel}"/>
-            <arg
-                line="-updateSite ${buildDirectory}/${buildLabel}/${component}/updateSite"/>
-            <arg
-                line="-reusePack200Files"/>
-            <arg
-                line="-compress"/>
-            <arg
-                line="-noDefaultIUs"/>
-            <arg
-                line="-site file:${buildDirectory}/${buildLabel}/${component}/updateSite/site.xml"/>
-        </java>
-        <delete
-            quiet="true"
-            file="${buildDirectory}/${buildLabel}/updateSite/artifacts.jar"/>
-        <delete
-            quiet="true"
-            file="${buildDirectory}/${buildLabel}/updateSite/content.jar"/>
-        <java
-            jar="${eclipse.launcher}"
-            fork="true"
-            jvm="${env.JAVA_5_HOME}/bin/java"
-            failonerror="true"
-            maxmemory="512m"
-            dir="${buildDirectory}">
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <arg
-                line="-application org.eclipse.equinox.p2.metadata.generator.EclipseGenerator"/>
-            <arg
-                line="-consoleLog"/>
-            <arg
-                line="-nosplash"/>
-            <arg
-                line="--launcher.suppressErrors"/>
-            <arg
-                line="-metadataRepository file:${buildDirectory}/${buildLabel}/updateSite"/>
-            <arg
-                line="-artifactRepository file:${buildDirectory}/${buildLabel}/updateSite"/>
-            <arg
-                line="-metadataRepositoryName Web-Tools-Platform-${buildLabel}"/>
-            <arg
-                line="-artifactRepositoryName Web-Tools-Platform-${buildLabel}"/>
-            <arg
-                line="-updateSite ${buildDirectory}/${buildLabel}/updateSite"/>
-            <arg
-                line="-reusePack200Files"/>
-            <arg
-                line="-compress"/>
-            <arg
-                line="-noDefaultIUs"/>
-            <arg
-                line="-site file:${buildDirectory}/${buildLabel}/updateSite/site.xml"/>
-        </java>
-        <!--
-            2. Create zip of P2 repo. Note we put it in
-            'repoBaseLocation' for use by subsequent build steps TODO:
-            investigate a location outside a per-build location
-        -->
-        <mkdir
-            dir="${buildDirectory}/${buildLabel}/repos"/>
-        <zip
-            destfile="${buildDirectory}/${buildLabel}/repos/${component}-buildrepo-${buildLabel}.zip"
-            basedir="${buildDirectory}/${buildLabel}/${component}/updateSite/"
-            excludes="${excludeFromRepoZip}"
-            update="yes"
-            duplicate="preserve">
-        </zip>
-        <!--
-            <zip
-            destfile="${buildDirectory}/${buildLabel}/repos/${build.distribution}-buildrepo-${buildLabel}.zip"
-            basedir="${buildDirectory}/${buildLabel}/updateSite/"
-            excludes="${excludeFromRepoZip}" update="yes"
-            duplicate="preserve"> </zip>
-        -->
-        <!--
-            3. generate maps each step TODO: avoid double processing by
-            changing task so that if file exists, append to it
-        -->
-        <generateMapFiles
-            buildlabel="${buildLabel}"
-            inputFilePluginVersions="${buildDirectory}/finalPluginsVersions.properties"
-            inputFileFeatureVersions="${buildDirectory}/finalFeaturesVersions.properties"
-            p2MapFile="${buildDirectory}/${buildLabel}/Web-Tools-Platform-${buildLabel}.p2.map"
-            p2Repository="http://build.eclipse.org/webtools/committers/${projectname}/${buildLabel}/updateSite"/>
-    </target>
-    <target
-        name="createSiteFiles"
-        depends="init"
-        if="doP2Repo">
-        <property
-            name="sitexmlfile"
-            value="${buildDirectory}/maps/webtools.maps/releng/sitefile/site.xml"/>
-        <property
-            file="${buildDirectory}/finalFeaturesVersions.properties"/>
-        <loadfile
-            property="sitefiletext"
-            srcFile="${sitexmlfile}">
-            <filterchain>
-                <expandproperties/>
-            </filterchain>
-        </loadfile>
-        <echo
-            message="${sitefiletext}"
-            file="${buildDirectory}/${buildLabel}/updateSite/site.xml"/>
-        <echo
-            message="${sitefiletext}"
-            file="${buildDirectory}/${buildLabel}/${component}/updateSite/site.xml"/>
-    </target>
-    <target
-        name="updatePackPropertiesFile"
-        if="doNormalize">
-        <updatePackProperties
-            archiveFilename="${buildDirectory}/${buildLabel}/${archiveName}"/>
-    </target>
-    <target
-        name="nodefault">
-        <echo
-            level="error"
-            message="There is no default target for this buildutililites.xml ant script."/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/scripts/build/label.xml b/releng.wtpbuilder/scripts/build/label.xml
deleted file mode 100644
index 3911d10..0000000
--- a/releng.wtpbuilder/scripts/build/label.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<project
-    name="label"
-    default="label"
-    basedir=".">
-
-    <!-- = = = standard properties pattern = = = -->
-    <!-- 
-        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" />
-
-    <!-- 
-        Let users override standard properties, if desired.
-        If directory, file, or some properties do not exist,  
-        then standard properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties" />
-
-    <!-- = = = end standard properties pattern = = = -->
-
-
-    <!-- Capture the computer name in a cross-platform manner -->
-    <property
-        name="env.COMPUTERNAME"
-        value="${env.HOSTNAME}" />
-    <target
-        name="label">
-        <available
-            file="${buildDirectory}/label.properties"
-            property="label.properties.exists" />
-        <antcall
-            target="create.label.properties" />
-    </target>
-    <target
-        name="create.label.properties"
-        unless="label.properties.exists">
-        <mkdir
-            dir="${buildDirectory}" />
-        <tstamp>
-            <format
-                property="date"
-                pattern="yyyyMMdd"
-                timezone="UTC" />
-        </tstamp>
-        <tstamp>
-            <format
-                property="time"
-                pattern="HHmm"
-                timezone="UTC" />
-        </tstamp>
-        <echo
-            message="cctimestamp: ${cctimestamp}" />
-        <echo
-            message="datetime: ${date}${time} " />
-        <condition
-            property="timestamp"
-            value="${cctimestamp}"
-            else="${date}${time}">
-            <isset
-                property="cctimestamp" />
-        </condition>
-        <echo
-            message="timestamp: ${timestamp}" />
-        <property
-            name="timestamp"
-            value="${date}${time}" />
-        <fail
-            unless="buildType" />
-        <property
-            name="buildId"
-            value="${buildType}${timestamp}" />
-
-        <!--this naming convention used by php scripts on download server-->
-        <property
-            name="buildLabel"
-            value="${buildType}-${buildId}-${timestamp}" />
-
-        <!--store the build label information in a file-->
-        <!--note the line.separator is required to be immune to the exact formatting -->
-        <echo
-            file="${buildDirectory}/label.properties"
-            append="true"> buildType=${buildType}${line.separator}</echo>
-        <echo
-            file="${buildDirectory}/label.properties"
-            append="true"> buildId=${buildId}${line.separator}</echo>
-        <echo
-            file="${buildDirectory}/label.properties"
-            append="true"> timestamp=${timestamp}${line.separator}</echo>
-        <echo
-            file="${buildDirectory}/label.properties"
-            append="true"> buildLabel=${buildLabel}${line.separator}</echo>
-        <echo
-            file="${buildDirectory}/label.properties"
-            append="true"> date=${date}${line.separator}</echo>
-        <echo
-            file="${buildDirectory}/label.properties"
-            append="true"> time=${time}${line.separator}</echo>
-        <echo
-            file="${buildDirectory}/buildmachineinfo.properties"
-            append="true"> buildComputer=${env.COMPUTERNAME}${line.separator}
-            buildOS=${env.OS}${line.separator}</echo>
-        <echo
-            file="${buildDirectory}/label.properties"
-            append="true"> buildBranch=${buildBranch}${line.separator}</echo>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/scripts/build/maptasks.xml b/releng.wtpbuilder/scripts/build/maptasks.xml
deleted file mode 100644
index bd6f33a..0000000
--- a/releng.wtpbuilder/scripts/build/maptasks.xml
+++ /dev/null
@@ -1,338 +0,0 @@
-<project
-    name="maptasks"
-    default="noDefault"
-    basedir=".">
-
-    <!-- = = = standard properties pattern = = = -->
-    <!--
-        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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-    <property
-        name="cvsProtocol"
-        value="${env.BUILD_CVS_WRITE_PROTOCOL}"/>
-    <property
-        name="cvsUser"
-        value="${env.BUILD_CVS_WRITE_USER}"/>
-    <property
-        name="cvsServer"
-        value="${env.BUILD_CVS_SERVER}"/>
-    <property
-        name="cvsRoot"
-        value="${env.BUILD_CVS_ROOT}"/>
-
-
-    <!-- ***  assign repo info -->
-    <property
-        name="mapCvsRoot"
-        value=":${cvsProtocol}:${cvsUser}@${cvsServer}:${cvsRoot}"/>
-    <echo
-        level="info"
-        message="mapCvsRoot: ${mapCvsRoot}"/>
-    <!--
-        fetchAllMaps is pure convenience. If you are tempted to modify
-        fetchAllMaps, chances are you should just use more specific
-        calls to map util in your own code
-    -->
-    <target
-        name="fetchAllMaps">
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENG}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENGCOMMON}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENGSERVERTOOLS}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENGJSDT}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENGSOURCEEDITING}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENGWEBSERVICES}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENGJSF}"/>
-            <property
-                name="mapTag"
-                value="${releng.jsf-mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENGDALI}"/>
-            <property
-                name="mapTag"
-                value="${releng.dali-mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENGEJBTOOLS}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENGJEETOOLS}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENGINCUBATORVEX}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENGJAXWS}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENGPAVE}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
-    </target>
-    <target
-        name="maputil">
-        <!--
-            remember, for now, the check out and tagging operations are
-            seperate, since may have already been checked out, but not
-            tagged
-        -->
-        <fail
-            unless="mapcomponent"/>
-        <fail
-            unless="mapTag"/>
-        <antcall
-            target="checkOutMaps">
-            <param
-                name="cvsPackage"
-                value="${mapcomponent}"/>
-            <param
-                name="versionTagParam"
-                value="${mapTag}"/>
-        </antcall>
-        <antcall
-            target="tagMapFiles">
-            <param
-                name="cvsPackage"
-                value="${mapcomponent}"/>
-        </antcall>
-        <antcall
-            target="tagMapFiles">
-            <param
-                name="cvsPackage"
-                value="${mapcomponent}"/>
-        </antcall>
-        <antcall
-            target="rewriteMaps">
-            <param
-                name="cvsPackage"
-                value="${mapcomponent}"/>
-        </antcall>
-    </target>
-
-
-    <!-- 
-        Check out the cvsPackage
-    -->
-    <target
-        name="checkOutMaps"
-        depends="checkLocal"
-        unless="mapsLocal">
-        <echo
-            level="debug"
-            message="mapCvsRoot: ${mapCvsRoot}"/>
-        <echo
-            level="info"
-            message="cvsPackage = ${cvsPackage} "/>
-        <echo
-            level="info"
-            message="versionTagParam: ${versionTagParam}"/>
-
-        <!-- if not set, fail. There are no safe assumptions. -->
-        <fail
-            unless="mapCvsRoot"/>
-        <fail
-            unless="cvsPackage"/>
-        <fail
-            unless="versionTagParam"/>
-        <fail
-            unless="buildDirectory"/>
-        <cvs
-            cvsRoot="${mapCvsRoot}"
-            package="${cvsPackage}"
-            dest="${buildDirectory}/maps"
-            tag="${versionTagParam}"
-            quiet="${env.CVS_QUIET}"
-            reallyquiet="${env.CVS_REALLY_QUIET}"/>
-    </target>
-
-    <!-- 
-        Tag Map Files mapCvsRoot
-    -->
-    <target
-        name="tagMapFiles"
-        depends="checktagMaps"
-        if="tagMaps">
-        <cvs
-            cvsRoot="${mapCvsRoot}"
-            dest="${buildDirectory}/maps/${cvsPackage}"
-            command="tag v${buildType}${timestamp}"
-            quiet="${env.CVS_QUIET}"
-            reallyquiet="${env.CVS_REALLY_QUIET}"/>
-    </target>
-    <!--
-        rewriteMaps tasks changes the "standard" eclipse map protocol,
-        user, and host name Since this should not be required (or used)
-        during production builds, and since machine and user specific, a
-        good place to define the value, rewriteMapsLine, is in
-        ${env.LOCAL_BUILD_PROPERTIES_DIR}/maptasks.properties If
-        rewriteMapsLine exists, it is assume it is desired to rewrite,
-        and the value of rewriteMapsLine will be used. It must be a
-        complete replacement for :pserver:anonymous@dev.eclipse.org:
-        such as :ext:david_williams@dev.eclipse.org:
-    -->
-    <target
-        name="rewriteMaps"
-        if="rewriteMapsLine">
-        <echo
-            message="rewriteMapsLine: ${rewriteMapsLine}"/>
-    	<!-- we have to check for existence, since in some builds, such as maintenance, 
-    		we check out all maps, but not all maps have been branched. -->
-        <available
-            property="packageExists"
-            file="${buildDirectory}/maps/${cvsPackage}"/>
-        <antcall
-            target="rewritePackage"/>
-    </target>
-    <target
-        name="rewritePackage"
-        if="packageExists">
-        <replace
-            dir="${buildDirectory}/maps/${cvsPackage}"
-            token=":pserver:anonymous@dev.eclipse.org:"
-            value="${rewriteMapsLine}">
-            <include
-                name="**/*.map"/>
-        </replace>
-    </target>
-    <target
-        name="checktagMaps">
-        <condition
-            property="tagMaps">
-            <equals
-                arg1="${build.donottagmaps}"
-                arg2="false"/>
-        </condition>
-        <echo
-            level="info"
-            message="tagMaps: ${tagMaps}"/>
-    </target>
-    <target
-        name="checkLocal">
-        <condition
-            property="mapsLocal">
-            <available
-                file="${buildDirectory}/maps/${cvsPackage}"/>
-        </condition>
-        <echo
-            message="mapsLocal: ${mapsLocal}"/>
-    </target>
-    <!-- 
-        Default target
-    -->
-    <target
-        name="noDefault">
-        <echo
-            level="error"
-            message="You must specify a target when invoking this file"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/scripts/build/pack.properties b/releng.wtpbuilder/scripts/build/pack.properties
deleted file mode 100644
index 11255c8..0000000
--- a/releng.wtpbuilder/scripts/build/pack.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-pack200.default.args=-E4
-pack.excludes=eclipse/plugins/@excludejars@
-#this file is not actually used. 
-# similar file is created on the fly by ant task 'updatePackProperties'
\ No newline at end of file
diff --git a/releng.wtpbuilder/scripts/build/runAntRunner.xml b/releng.wtpbuilder/scripts/build/runAntRunner.xml
deleted file mode 100644
index c9279fc..0000000
--- a/releng.wtpbuilder/scripts/build/runAntRunner.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-    <!--
-        A utility ant script to invoke AntRunner application with
-        Eclipse. This is handy since some ant scripts are running in
-        plain ant, but we'd like to use Eclipse's ant tasks for things
-        like p2 operations.
-    -->
-<project
-    name="runAntRunner"
-    default="runAntRunner"
-    basedir=".">
-
-    <!-- = = = standard properties pattern = = = -->
-    <!--
-        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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- = = = end standard properties pattern = = = -->
-    <fail
-        unless="env.BUILD_HOME"
-        message="all scripts need a BUILD_HOME"/>
-    <echo
-        level="info"
-        message="buildDirectory: ${buildDirectory}"/>
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-    <fail
-        unless="builderVersion"
-        message="Could not get builderVersion. Probably could not checkout build.cfg?"/>
-    <fail
-        unless="eclipse.builder.version"
-        message="Could not get eclipse.builder.version. Perhaps an old format build.cfg?"/>
-    <property
-        name="basebuilder.path"
-        value="${env.BASE_BUILDERS}/${eclipse.builder.version}"/>
-    <property
-        name="failOnError"
-        value="true"/>
-
-    <!-- if not set by caller, be sure it is empty string -->
-    <property
-        name="antrunnertarget"
-        value="build"/>
-    <fail
-        unless="antrunnerfile"
-        message="Must provide ant file to run"/>
-    <target
-        name="runAntRunner">
-    	
-    	<!-- long term we should make this sensitive to if already running in eclipse, and if so, 
-    	just invoke the script? check if="eclipse.running" -->
-    	<mkdir dir="${buildDirectory}/${buildLabel}"/>
-       <mkdir
-           dir="${buildDirectory}/${buildLabel}/buildworkspaces"/>    	
-        <java
-            taskname="AntRunner"
-            jar="${eclipse.launcher}"
-            fork="true"
-            failonerror="${failOnError}">
-            <jvmarg
-                value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
-            <jvmarg
-                value="-DurlLogLocation=${buildDirectory}/${buildLabel}/outgoinghttplog-antrunner.log"/>
-            <jvmarg
-                value="-Dosgi.ws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dosgi.os=${env.BASEOS}"/>
-            <jvmarg
-                value="-Dosgi.arch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-Dbuild.home=${env.BUILD_HOME}"/>
-            <jvmarg
-                value="-DJAVA_6_HOME=${env.JAVA_6_HOME}"/>
-            <jvmarg
-                value="-DJAVA_5_HOME=${env.JAVA_5_HOME}"/>
-            <jvmarg
-                value="-DJAVA_4_HOME=${env.JAVA_4_HOME}"/>
-            <jvmarg
-                value="-Declipse.builder.version=${eclipse.builder.version}"/>
-            <jvmarg
-                value="-Declipse.builder=${eclipse.builder}"/>
-            <jvmarg
-                value="-Dprojectname=${projectname}"/>
-            <jvmarg
-            	  value="-DbuildDirectory=${buildDirectory}"/>
-            <jvmarg
-                value="-DbuildLabel=${buildLabel}"/>
-            <jvmarg
-                value="-Dwtp.builder.home=${wtp.builder.home}"/>
-            <jvmarg
-                value="-Dbuild.distribution=${build.distribution}"/>
-            <jvmarg
-                value="-Dcomponent=${component}"/>
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <jvmarg 
-                value="-Dosgi.instance.area=${buildDirectory}/${buildLabel}/buildworkspaces/workspace-runAntRunner-${antrunnerfile}-${antrunnertarget}" />
-            <arg
-                value="-application"/>
-            <arg
-                value="org.eclipse.ant.core.antRunner"/>
-            <arg
-                value="-buildfile"/>
-            <arg
-                value="${antrunnerfile}"/>
-            <arg
-                value="${antrunnertarget}"/>
-        </java>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/scripts/build/runbuild.xml b/releng.wtpbuilder/scripts/build/runbuild.xml
deleted file mode 100644
index cb47f60..0000000
--- a/releng.wtpbuilder/scripts/build/runbuild.xml
+++ /dev/null
@@ -1,504 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-    name="runbuild"
-    default="runbuild"
-    basedir=".">
-
-    <!-- = = = standard properties pattern = = = -->
-    <!--
-        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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <!-- = = = end standard properties pattern = = = -->
-    <fail
-        unless="env.BUILD_HOME"
-        message="all scripts need a BUILD_HOME"/>
-    <echo
-        level="info"
-        message="buildDirectory: ${buildDirectory}"/>
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="debug"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
-    <fail
-        unless="builderVersion"
-        message="Could not get builderVersion. Probably could not checkout build.cfg?"/>
-    <fail
-        unless="eclipse.builder.version"
-        message="Could not get eclipse.builder.version. Perhaps an old format build.cfg?"/>
-    <property
-        name="basebuilder.path"
-        value="${env.BASE_BUILDERS}/${eclipse.builder.version}"/>
-    <!--
-        if not explicitly set by caller, we'll assume we should fail
-        here on errors. In some cases, such as JUnit test compiles, or
-        even leaf components, the caller may want to set to false, so
-        that some part of the build is still made available
-    -->
-    <property
-        name="eclipseBuildFailOnError"
-        value="true"/>
-    <!--
-        We should not always normalize ("-repack") jars by default,
-        since in production we sign the jars (which does the -repack for
-        us) and not in production we don't really care so why spend the
-        extra time. For jars which are not supposed to be normalized,
-        such as pre-existing jars, they need to be added to the
-        pack.properties file (see the updatePackProperties task). Note:
-        signing does the -repack when we sign. This can be over-ridden
-        by the caller setting normalize to true, but there are know
-        known cases where we want to normalize (and eventually pack) the
-        jar files but not sign them.
-    -->
-    <property
-        name="normalizeJarFiles"
-        value="false"/>
-
-    <!-- main -->
-    <target
-        name="runbuild">
-        <dirname
-            file="${ant.file}"
-            property="scripts.build.dir"/>
-        <property
-            name="wtp.builder.home"
-            value="${scripts.build.dir}/../../.."/>
-
-        <!-- invoke runEclipseBuild to build -->
-        <antcall
-            target="runEclipseBuild"/>
-    </target>
-    <target
-        name="build"
-        depends="init"
-        if="doBuild">
-        <!--
-            this property required as of Eclipse 3.0 stream builds >
-            20031126
-        -->
-        <property
-            name="buildingOSGi"
-            value="true"/>
-        <!--
-            this generateFeatureVersionSuffix property causes feature
-            suffixes to be calcuated based on their own CVS tag, plus
-            the qualifier of their contained plugins
-        -->
-        <!--
-            https://bugs.eclipse.org/bugs/show_bug.cgi?id=138825 false
-            for builds intended for 3.1.2, since can generate
-            underscores true for builds instended for 3.2
-        -->
-        <property
-            name="generateFeatureVersionSuffix"
-            value="true"/>
-        <property
-            name="outputUpdateJars"
-            value="true"/>
-        <property
-            name="runPackager"
-            value="true"/>
-
-        <!--run the build for the specified component-->
-        <echo
-            level="debug"
-            message="basedir: ${basedir}"/>
-        <echo
-            level="debug"
-            message="component: ${component}"/>
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}"/>
-        <echo
-            level="debug"
-            message="wtp.builder.home: ${wtp.builder.home}"/>
-        <echo
-            level="debug"
-            message="buildBranch: ${buildBranch}"/>
-        <fail
-            unless="buildBranch"/>
-        <ant
-            antfile="build.xml"
-            dir="${pde.build.scripts}">
-            <property
-                name="builder"
-                value="${wtp.builder.home}/components/${component}"/>
-            <property
-                name="wtp.builder.home"
-                value="${wtp.builder.home}"/>
-            <property
-                name="buildBranch"
-                value="${buildBranch}"/>
-            <property
-                name="dependencyTargets"
-                value="${wtp.builder.home}/scripts/dependency/build.xml"/>
-            <property
-                name="local.cache.dir"
-                value="${env.LOCAL_PREREQS_CACHE}"/>
-            <property
-                name="baseLocation"
-                value="${env.PROJECT_PROJECTS}/${projectname}/eclipse"/>
-            <property
-                name="buildRoot"
-                value="${env.PROJECT_PROJECTS}/${projectname}"/>
-            <property
-                name="testRoot"
-                value="${env.PROJECT_TESTS}/${projectname}"/>
-        </ant>
-    </target>
-
-    <!-- check if PDE basebuilder and WTP builder is present -->
-    <target
-        name="checkBaseBuilder"
-        depends="checkWTPBaseBuilder">
-        <!--
-            we just check if both base, and our wtp specific one are
-            current, if either is not, we'll get them both
-        -->
-        <condition
-            property="basebuilderlocal">
-            <and>
-                <available
-                    file="${pde.builder.path}"/>
-                <!--
-                    should we check explicitly for "true" instead of
-                    just isset? either should work for this case, but
-                    which is better ant style?
-                -->
-                <isset
-                    property="wtpBuilderPresent"/>
-            </and>
-        </condition>
-        <echo
-            message="basebuilderlocal: ${basebuilderlocal}"/>
-        <echo
-            message="wtpBuilderPresent: ${wtpBuilderPresent}"/>
-    </target>
-    <!--
-        1)init -> set buildBranch, and create label.properties
-        2)checkBaseBuilder -> check is baseBuilder exists, if not
-        retrieve from CVS org.eclipse.releg.basebuilder 3)invoke
-        getWTPBaseBuilder -> checks if
-        org.eclipse.wtp.releng.tools_version.jar exist, if not download
-        from WTP build site
-    -->
-    <target
-        name="getBaseBuilder"
-        depends="init,checkBaseBuilder"
-        unless="basebuilderlocal">
-        <!-- ***  change the repo info -->
-        <property
-            name="builderCvsRoot"
-            value=":pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse"/>
-        <!--
-            note: untagged or some default version of base builder is
-            not good to use. in some cases, won't run at all, in the
-            best of cases, will simply be unstable, so we'll fail if we
-            forgot to specify it
-        -->
-        <fail
-            unless="eclipse.builder.version"/>
-        <mkdir
-            dir="${env.BASE_BUILDERS}/${eclipse.builder.version}"/>
-        <cvs
-            quiet="${env.CVS_QUIET}"
-            reallyquiet="${env.CVS_REALLY_QUIET}"
-            cvsRoot="${builderCvsRoot}"
-            package="${eclipse.builder}"
-            dest="${basebuilder.path}"
-            tag="${eclipse.builder.version}"/>
-        <fail
-            unless="wtpBuildTools.url"/>
-
-        <!-- now add our WTP base builder if not there -->
-        <antcall
-            target="getWTPBaseBuilder"/>
-    </target>
-    <!--
-        check wtpBulderPresent property if false, download WTP builder
-        file org.eclipse.wtp.releng.tools_version.jar into baseBuiders
-    -->
-    <target
-        name="getWTPBaseBuilder"
-        depends="checkWTPBaseBuilder"
-        unless="wtpBuilderPresent">
-        <get
-            dest="${basebuilder.path}/org.eclipse.releng.basebuilder/plugins/${wtpBuildTools.file}"
-            src="${wtpBuildTools.url}/${wtpBuildTools.file}"
-            usetimestamp="true"/>
-    </target>
-    <!--
-        check if WTP builder exists
-        org.eclipse.wtp.releng.tools_version.jar exist in basebuilder
-        set wtpBuilderPresent property
-    -->
-    <target
-        name="checkWTPBaseBuilder">
-        <condition
-            property="wtpBuilderPresent">
-            <available
-                file="${basebuilder.path}/org.eclipse.releng.basebuilder/plugins/${wtpBuildTools.file}"/>
-        </condition>
-    </target>
-
-    <!-- set buildBranch, and create label.properties-->
-    <target
-        name="init">
-        <condition
-            property="buildBranch"
-            value="R3.0.1">
-            <equals
-                arg1="${mapVersionTag}"
-                arg2="R3_0_1_patches"/>
-        </condition>
-        <condition
-            property="buildBranch"
-            value="R3.1">
-            <equals
-                arg1="${mapVersionTag}"
-                arg2="HEAD"/>
-        </condition>
-        <condition
-            property="buildBranch"
-            value="R3.0">
-            <equals
-                arg1="${mapVersionTag}"
-                arg2="R3_0_maintenance"/>
-        </condition>
-        <condition
-            property="buildBranch"
-            value="R0.7">
-            <equals
-                arg1="${mapVersionTag}"
-                arg2="R0_7_maintenance"/>
-        </condition>
-        <condition
-            property="buildBranch"
-            value="R1.0">
-            <equals
-                arg1="${mapVersionTag}"
-                arg2="R1_0_maintenance"/>
-        </condition>
-        <condition
-            property="buildBranch"
-            value="R1.5">
-            <equals
-                arg1="${mapVersionTag}"
-                arg2="R1_5_maintenance"/>
-        </condition>
-        <condition
-            property="buildBranch"
-            value="R1.5.5">
-            <equals
-                arg1="${mapVersionTag}"
-                arg2="R1_5_5_patches"/>
-        </condition>
-        <condition
-            property="buildBranch"
-            value="R2.0">
-            <equals
-                arg1="${mapVersionTag}"
-                arg2="R2_0_maintenance"/>
-        </condition>
-        <condition
-            property="buildBranch"
-            value="R2.0.2">
-            <equals
-                arg1="${mapVersionTag}"
-                arg2="R2_0_2_patches"/>
-        </condition>
-        <!-- if not set above, assume R3.0 -->
-        <!-- this happens, for example, when using a "tempTest" branch -->
-        <property
-            name="buildBranch"
-            value="R3.1"/>
-        <!--
-            strip trailing blanks. Seems either Eclipse, or CVS make it
-            hard to not have trailing spaces
-        -->
-        <replaceregexp
-            flags="gm"
-            file="${wtp.builder.home}/build.properties"
-            match=" *$"
-            replace=""/>
-        <property
-            file="${wtp.builder.home}/build.properties"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-        <property
-            file="${buildDirectory}/label.properties"/>
-        <!--
-            fetch the HEAD stream of all projects if build type
-            specified as N
-        -->
-        <condition
-            property="fetchTag"
-            value="HEAD">
-            <equals
-                arg1="${buildType}"
-                arg2="N"/>
-        </condition>
-        <!--
-            exit if the component directory doesn't exist (for example,
-            may not always be an "sdk" component, but we often generate
-            calls to it)
-        -->
-        <condition
-            property="doBuild">
-            <available
-                file="${wtp.builder.home}/components/${component}"
-                type="dir"/>
-        </condition>
-    </target>
-    <target
-        name="runEclipseBuild"
-        if="buildId">
-        <fail
-            unless="eclipse.builder.version"/>
-        <fail
-            message="dependency.properties must be specified by distribution script"
-            unless="dependency.properties"/>
-        <!--
-            if not otherwise set "externally", set the classpath jars
-            for the Execution Envirnonments we need in WTP. And other
-            parameters we need set. To successfully do local builds,
-            most of these do have to be provided externally, such as in
-            "localbuildproperties" directory
-        -->
-        <property
-            name="J2SE-1.4"
-            value="${env.JAVA_4_HOME}/jre/lib/core.jar:${env.JAVA_4_HOME}/jre/lib/xml.jar:${env.JAVA_4_HOME}/jre/lib/graphics.jar:${env.JAVA_4_HOME}/jre/lib/server.jar:${env.JAVA_4_HOME}/jre/lib/ibmorbapi.jar:${env.JAVA_4_HOME}/jre/lib/security.jar:${env.JAVA_4_HOME}/jre/lib/ibmpkcs.jar:${env.JAVA_4_HOME}/jre/lib/ibmjcefw.jar"/>
-        <property
-            name="J2SE-1.5"
-            value="${env.JAVA_5_HOME}/jre/lib/core.jar:${env.JAVA_5_HOME}/jre/lib/vm.jar:${env.JAVA_5_HOME}/jre/lib/xml.jar:${env.JAVA_5_HOME}/jre/lib/graphics.jar:${env.JAVA_5_HOME}/jre/lib/server.jar:${env.JAVA_5_HOME}/jre/lib/ibmorbapi.jar:${env.JAVA_5_HOME}/jre/lib/security.jar:${env.JAVA_4_HOME}/jre/lib/ibmpkcs.jar:${env.JAVA_5_HOME}/jre/lib/ibmjcefw.jar"/>
-        <property
-            name="JavaSE-1.6"
-            value="${env.JAVA_6_HOME}/jre/lib/core.jar:${env.JAVA_6_HOME}/jre/lib/vm.jar:${env.JAVA_6_HOME}/jre/lib/xml.jar:${env.JAVA_6_HOME}/jre/lib/graphics.jar:${env.JAVA_6_HOME}/jre/lib/server.jar:${env.JAVA_6_HOME}/jre/lib/ibmorbapi.jar:${env.JAVA_6_HOME}/jre/lib/security.jar:${env.JAVA_4_HOME}/jre/lib/ibmpkcs.jar:${env.JAVA_6_HOME}/jre/lib/ibmjcefw.jar"/>
-        <!--
-            local builds must set build.donottagmaps to true, in
-            runbuild.properties, to avoid erroneous time stamps
-        -->
-        <property
-            name="build.donottagmaps"
-            value="false"/>
-        <fail
-            unless="JavaSE-1.6"
-            message="classpath to JavaSE-1.6 Execution Environment must be set"/>
-        <fail
-            unless="J2SE-1.5"
-            message="classpath to J2SE-1.5 Execution Environment must be set"/>
-        <fail
-            unless="J2SE-1.4"
-            message="classpath to J2SE-1.4 Execution Environment must be set"/>
-        <!--
-            we read these in as ant properties, so in java call below,
-            we convert them to system (environment) properties, which is
-            where PDE expects to find them
-        -->
-        <echo
-            message="JavaSE-1.6=${JavaSE-1.6}"/>
-        <echo
-            message="J2SE-1.5=${J2SE-1.5}"/>
-        <echo
-            message="J2SE-1.4=${J2SE-1.4}"/>
-        <mkdir
-            dir="${buildDirectory}/${buildLabel}"/>
-    	 <mkdir
-    	     dir="${buildDirectory}/${buildLabel}/buildworkspaces"/>
-        <java
-            taskname="build-${build.distribution}-${component}"
-            jar="${eclipse.launcher}"
-            fork="true"
-            failonerror="${eclipseBuildFailOnError}">
-            <jvmarg
-                value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
-            <jvmarg
-                value="-DurlLogLocation=${buildDirectory}/${buildLabel}/outgoinghttplogfromcodebuild.log"/>
-            <jvmarg
-                value="-Dosgi.ws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dosgi.os=${env.BASEOS}"/>
-            <jvmarg
-                value="-Dosgi.arch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-Dbuild.home=${env.BUILD_HOME}"/>
-            <jvmarg
-                value="-DJAVA_6_HOME=${env.JAVA_6_HOME}"/>
-            <jvmarg
-                value="-DJAVA_5_HOME=${env.JAVA_5_HOME}"/>
-            <jvmarg
-                value="-DJAVA_4_HOME=${env.JAVA_4_HOME}"/>
-            <jvmarg
-                value="-DJavaSE-1.6=${JavaSE-1.6}"/>
-            <jvmarg
-                value="-DJ2SE-1.5=${J2SE-1.5}"/>
-            <jvmarg
-                value="-DJ2SE-1.4=${J2SE-1.4}"/>
-            <jvmarg
-                value="-Dbuild.donottagmaps=${build.donottagmaps}"/>
-            <jvmarg
-                value="-DbuildType=${buildType}"/>
-            <jvmarg
-                value="-DbuildId=${buildId}"/>
-            <jvmarg
-                value="-DmapVersionTag=${mapVersionTag}"/>
-            <jvmarg
-                value="-Declipse.builder.version=${eclipse.builder.version}"/>
-            <jvmarg
-                value="-Declipse.builder=${eclipse.builder}"/>
-            <jvmarg
-                value="-Dprojectname=${projectname}"/>
-            <jvmarg
-                value="-DbuildLabel=${buildLabel}"/>
-            <jvmarg
-                value="-Dreleng.jsf-mapVersionTag=${releng.jsf-mapVersionTag}"/>
-            <jvmarg
-                value="-Dreleng.dali-mapVersionTag=${releng.dali-mapVersionTag}"/>
-            <jvmarg
-                value="-Dwtp.builder.home=${wtp.builder.home}"/>
-            <jvmarg
-                value="-Dbuild.distribution=${build.distribution}"/>
-            <jvmarg
-                value="-Dcomponent=${component}"/>
-            <jvmarg
-                value="-Ddependency.properties=${dependency.properties}"/>
-            <jvmarg
-                value="-DwtpBuildTools.file=${wtpBuildTools.file}"/>
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <jvmarg
-                value="-DSKIP_JAR_SIGNING=${SKIP_JAR_SIGNING}"/>
-            <jvmarg
-                value="-DnormalizeJarFiles=${normalizeJarFiles}"/>
-            <jvmarg
-                value="-Dosgi.instance.area=${buildDirectory}/${buildLabel}/buildworkspaces/workspace-runbuild-${component}"/>
-            <arg
-                value="-application"/>
-            <arg
-                value="org.eclipse.ant.core.antRunner"/>
-            <arg
-                value="-buildfile"/>
-            <arg
-                value="${ant.file}"/>
-            <arg
-                value="build"/>
-        </java>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/scripts/build/signingReference.txt b/releng.wtpbuilder/scripts/build/signingReference.txt
deleted file mode 100644
index 5b92f6b..0000000
--- a/releng.wtpbuilder/scripts/build/signingReference.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-
-Following is standard "form letter" sent to those given signing privileges. 
-Has some good description of basic mechanics of the process. 
-
-See also http://wiki.eclipse.org/JAR_Signing
-
-
-See also 
-http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.phoenix/infra-scripts/jar_signing/?root=Technology_Project
-
-and Denis's description that "Essentially, sign puts it in the 
-queue, sign_queue_process.sh processes the queue, which calls 
-jarprocessor.jar, which then calls sign.sh, which 
-calls jarsigner."
-
-In particular, there I find the actual call to the jar processor is 
-
-java /home/admin/jarprocessor.jar -outputDir $DIR -repack -verbose -processAll -sign /home/admin/sign.sh $FILE 
-
-= = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = 
-
-Remember, to watch signer, use
-tail -F /tmp/jarsigner
-
-= = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = 
-
-Hello,
-
-You have been granted a privilege to sign JAR and ZIP files for your
-project.  The signing process will allow you to sign individual JAR
-files, or to sign all the JAR files recursively in a ZIP file. All the
-signing operations are performed using an SSH shell on the
-build.eclipse.org server.
-
-** PLEASE NOTE: this privilege enables you to sign code on behalf of the 
-Eclipse Foundation, using the Eclipse Foundation's code signing 
-certificate. Please ensure that the code you will sign is sanctioned by 
-your project lead, your PMC Lead or the EMO.
-
-Here's how it works:
-
-1. Using your favourite SSH application (such as Putty), log in to
-build.eclipse.org using your CVS committer credentials.
-
-2. Move or copy the files to be signed to the Downloads Staging area.
-You cannot sign files anywhere else. The Staging Area is at
-
-/opt/public/download-staging.priv/
-
-, and it is structured like the
-downloads area.  If you don't have a staging directory, or if you cannot 
-access it, please contact webmaster.
-
-3. Use the 'sign' command, as such:
-sign <file> <mail|nomail> [outputDir]
-where file is the name of the ZIP or JAR file you want signed.  Because
-signing is computationally intensive work, wildcards are not supported.
-mail|nomail will allow you to receive an e-mail notice that signing is
-completed.
-outputDir is optional: if specified, signed files will be placed in this
-directory.  If omitted, the original file will be overwritten with the
-signed one.
-
-4. When signing is complete, you can verify the signed JAR file with the
-following command (to verify ZIP files, unzip them first, then verify
-the JARs inside):
-jarsigner -verify <file>
-
-5. Move the signed files back to the downloads area, and delete any
-other files in the Staging Area.
-Please note: Files older than 14 days will be deleted from the staging
-area automatically.
\ No newline at end of file
diff --git a/releng.wtpbuilder/scripts/build/signjars.xml b/releng.wtpbuilder/scripts/build/signjars.xml
deleted file mode 100644
index e1ff41b..0000000
--- a/releng.wtpbuilder/scripts/build/signjars.xml
+++ /dev/null
@@ -1,315 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-    name="signJarsInArchive"
-    default="signJarsInArchive"
-    basedir=".">
-
-	<!-- = = = standard properties pattern = = = -->
-	<!-- 
-        Note to be cross-platform, "environment variables" are only appropriate for 
-        some variables, such as ones we create and 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" />
-
-	<!-- 
-        Let users override standard properties, if desired.
-        If directory, file, or some properties do not exist,  
-        then standard properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties" />
-
-	<!-- = = = end standard properties pattern = = = -->
-    
-    <!-- Our specific directory in the signing area -->
-    <property
-        name="stagingDirectory"
-        value="/opt/public/download-staging.priv/webtools/${archiveName}" />
-    <property
-        name="signingHistory"
-        value="${buildDirectory}/signing-${archiveName}.log" />
-
-        
-    <!-- Fail fast if variables are not provided as expected -->
-    <fail
-        unless="buildDirectory"
-        message="buildDirectory must be specified by caller" />
-    <fail
-        unless="archiveName"
-        message="archiveName must be specified by caller" />
-    <fail
-        unless="buildLabel"
-        message="buildLabel must be specified by caller" />
-    <fail
-        unless="buildId"
-        message="buildId must be specified by caller" />
-
-
-    <!-- 
-          ======= Primary task ========
-    -->
-    
-    <!--
-          == signJarsInArchive == 
-     -->
-    <target
-        name="signJarsInArchive"
-        depends="check.sign"
-        if="doSign">
-  	
-        <property
-            name="outputFile"
-            value="${stagingDirectory}/${archiveName}" />
-
-        <!--copy zip file to staging directory-->
-        <!-- but first make positive that staging area is completely clean, incase used before. In future, might want to fail if it's not? -->
-    	
-        <echo
-            message="deleting any possible files in staging area " />
-        <!-- this first output creates or replaces signingHistory file, all subsequent ones should append -->
-       <exec
-          executable="ssh"
-          output="${signingHistory}">
-          <arg
-              line="david_williams@build.eclipse.org mkdir -p ${stagingDirectory}/*" />
-       </exec>
-        <exec
-            executable="ssh"
-            output="${signingHistory}"
-        	  append="true">
-            <arg
-                line="david_williams@build.eclipse.org /bin/rm -rf ${stagingDirectory}/*" />
-        </exec>
-        
-        
-        <echo
-            message="copying zip file to staging directory" />
-        <exec
-            executable="scp"
-            output="${signingHistory}"
-        	  failonerror="true"
-            append="true">
-            <arg
-                line="${buildDirectory}/${buildLabel}/${archiveName} david_williams@build.eclipse.org:${stagingDirectory}" />
-        </exec>
-        
-        <!-- make sure it has correct permissions -->
-        <exec
-            executable="ssh"
-            output="${signingHistory}"
-            append="true">
-            <arg
-                line="david_williams@build.eclipse.org /bin/chmod ugo+rw ${outputFile} " />
-        </exec>
-        
-        
-        <!-- establish Original Attributes  -->
-        <!-- this first count is just to confirm there is only one file there ... 
-             in future, we may want to fail here, if not -->
-        <exec
-            executable="ssh"
-        	  failonerror="true"
-            outputProperty="originalNFiles">
-            <arg
-                line="david_williams@build.eclipse.org ls -l ${stagingDirectory} | wc -l" />
-        </exec>
-        <echo
-            message="original Number of Files: ${originalNFiles}" />
-            
-            
-        <exec
-            executable="ssh"
-        	  failonerror="true"
-            outputProperty="originalAttributes">
-            <arg
-                line="david_williams@build.eclipse.org ls -l ${outputFile}" />
-        </exec>
-        <echo
-            message="original: ${originalAttributes}" />
-        
-        
-        
-        <!--invoke sign script and wait-->
-        <echo
-            message="invoke sign script and wait" />
-        <exec
-            executable="ssh"
-            output="${signingHistory}"
-            append="true">
-            <arg
-                line="david_williams@build.eclipse.org /usr/bin/sign ${outputFile} nomail" />
-        </exec>
-
-        <!--Wait for signed build to be available -->
-        <antcall
-            target="waitForChangedAttributes"/>
-
-        <!--copy zip back to build machine -->
-        <echo
-            message="copy zip back to build machine" />
-        <exec
-            executable="scp"
-            output="${signingHistory}"
-            append="true">
-            <arg
-                line="david_williams@build.eclipse.org:${outputFile} ${buildDirectory}/${buildLabel}" />
-        </exec>
-
-        <!--delete files on build.eclipse.org-->
-        <echo
-            message="delete temp files on build.eclipse.org" />
-        <exec
-            executable="ssh"
-            output="${signingHistory}"
-            append="true">
-            <arg
-                line="david_williams@build.eclipse.org /bin/rm -rf ${outputFile}" />
-        </exec>
-      
-      <echo
-          message="delete signing directory we created on build.eclipse.org" />
-      <exec
-          executable="ssh"
-          output="${signingHistory}"
-          append="true">
-          <arg
-              line="david_williams@build.eclipse.org /bin/rm -rf ${stagingDirectory}" />
-      </exec>
-    	
-    </target>
-
-        
-    <!-- 
-              ======= Utility tasks ======== 
-    -->
-    
-    <!-- 
-          == compareAttributes ==
-          The compareAttributes task and the waitForChangedAttributes task call each other repeatedly, 
-          until attributes are cheanged. 
-          TODO: we might have to adjust "outer" timeouts, if this takes a lot longer, 
-          and we might want to have our own time or loop checks here. 
-     -->
-    <target
-        name="compareAttributes">
-		    <!--poll file for change in attributes-->
-        <exec
-            executable="ssh"
-            outputProperty="polledNFiles">
-            <arg
-                line="david_williams@build.eclipse.org ls -l ${stagingDirectory} | wc -l" />
-        </exec>
-        <echo
-            message="Polled Number of Files: ${polledNFiles}" />    
-        <exec
-            executable="ssh"
-            outputProperty="polledAttributes">
-            <arg
-                line="david_williams@build.eclipse.org ls -l ${outputFile}" />
-        </exec>
-        <echo
-            message="original:  ${originalAttributes}" />
-        <echo
-            message="polled:  ${polledAttributes}" />   
-            
-        <!-- 
-              We compare number of files, and attributes, for added safety. May not be necessary.
-              There should only be 1 files there, for the "count of lines" from ls -l command is 2, 
-              one for "total bytes". 
-              
-              Once there signing process starts, there will be a directory and file make in the 
-              staging area ... where the work is done ... and then that renamed to original name, 
-              hence replacing it, and it will have a new "owner" and a new file size.  
-        -->             
-        <condition
-            property="attributesChanged">
-            <and>
-                <equals
-                    arg1="2"
-                    arg2="${polledNFiles}"
-                    trim="true" />
-                <not>    
-                    <equals
-                        arg1="${originalAttributes}"
-                        arg2="${polledAttributes}" 
-                        trim="true" />
-                </not>
-            </and>
-        </condition>
-
-        <antcall
-            target="waitForChangedAttributes"/>
-    </target>
-
-
-    <!--
-        ==  waitForChangedAttributes == 
-        Wait and then compare attributes of file to see if changed.
-     -->
-    <target
-        name="waitForChangedAttributes"
-        unless="attributesChanged">
-        <!-- increase, say to 120 or so, after testing -->
-        <sleep
-            seconds="180" />
-        <antcall
-            target="compareAttributes"
-            inheritAll="false">
-            <param
-                name="originalAttributes"
-                value="${originalAttributes}" />
-            <param
-                name="stagingDirectory"
-                value="${stagingDirectory}"/>
-            <param
-                name="outputFile"
-                value="${outputFile}"/>                               
-        </antcall>
-    </target>
-    
-    <!--  
-         == check.sign == 
-         The property 'sign' is the critical attribute that determines if signing will be done. 
-         If false, or absent, signing is not done.
-         We do not only rely on absence, so the "master properties" can set to false, and individual
-         components remain set to 'true' (for example, to have quick local builds, without changing 
-         component properties - currently used "SKIP_JAR_SIGNING" instead, but that 
-         doesn't feel quite right, so may change in future. SKIP_JAR_SIGNING can be 
-         set as env variable or ant variable.
-    -->
-    <target
-        name="check.sign">
-        <echo
-            message="sign: ${sign}" />
-        <echo
-            message="env skip jar signing: ${env.SKIP_JAR_SIGNING}" />
-        <echo
-            message="skip jar signing: ${SKIP_JAR_SIGNING}" />
-        <condition
-            property="doSign">
-            <and>
-                 <equals
-                    arg1="${sign}"
-                    arg2="true"
-                    trim="true"
-                    casesensitive="false" />
-                 <not>
-                    <equals 
-                     arg1="${env.SKIP_JAR_SIGNING}"
-                     arg2="true" 
-                     trim="true"
-                     casesensitive="false" />
-                 </not>
-                 <not>
-                    <equals 
-                     arg1="${SKIP_JAR_SIGNING}"
-                     arg2="true" 
-                     trim="true"
-                     casesensitive="false" />
-                 </not>
-             </and>
-        </condition>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/scripts/dependency/build.xml b/releng.wtpbuilder/scripts/dependency/build.xml
deleted file mode 100644
index d3844e2..0000000
--- a/releng.wtpbuilder/scripts/dependency/build.xml
+++ /dev/null
@@ -1,314 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-    
-    
-    dependency    
-    This script get a library from a remote repository and stores it in a local cache.
-    
-    The following properties are used by this script:
-    
-    local.cache.dir - the absolute path to the local repository for the libraries
-    dependency.url :  Url to a remote repository that will be used to download the library 
-    dependency.file:  Name of the library that is used.  If the library is platform dependent
-    it must have suffixes such as: file.linux.gtk.x86
-    These suffixes are the same as those used by releng baseos,basews,base arch
-    baseos= linux or win32
-    basews= gtk or win32
-    base arch=x86 or ppc
-    dependency.name:  A short user readable name for the library.
-    dependency.description:  One line description for the library.
-    dependency.autodownload: [optional] default true.  Set this to false if the file cannot be
-    downloaded automatically (i.e. requies license accept click through).
-    If autodownload is false, and the library is not avaialbe in the local
-    repository (cache).  User must download the library and copy it into
-    the local repository. 
-    dependency.releng.url: [optional] A mirror of the original repository.  Useful for libraries
-    that can get deleted from their original URLs.  Releng will use
-    the local cache, original url, releng.url in that order to get the
-    the dependency.  If a releng.url is not provided, the library will
-    always be requested from itrs original site.                                                       
--->
-<project
-    name="dependency"
-    default="default">
-    <description>
-        This script get a library from a remote repository and stores it
-        in a local cache.
-    </description>
-
-
-    <!-- ================================= 
-        target: default              
-        ================================= -->
-    <target
-        name="default"
-        description="This script get a library from a remote repository and stores it in a local cache.">
-        <condition property="dependency.download.file">
-            <or>
-                <not>
-                    <isset property="dependency.autodownload" />
-                </not>
-                <and>
-                    <isset property="dependency.autodownload" />
-                    <equals
-                        arg1="${dependency.autodownload}"
-                        arg2="true" />
-                </and>
-            </or>
-        </condition>
-        <antcall target="get" />
-        <antcall target="checkAutoDownload" />
-    </target>
-
-    <!-- - - - - - - - - - - - - - - - - - 
-        target: sub tasks                      
-        - - - - - - - - - - - - - - - - - -->
-    <target
-        name="get"
-        if="dependency.download.file">
-        <mkdir dir="${local.cache.dir}" />
-        <available
-            file="${local.cache.dir}/${dependency.file}"
-            property="local.cache.file.exists" />
-        <antcall target="download" />
-    </target>
-
-    <target
-        name="checkAutoDownload"
-        unless="dependency.download.file">
-        <fail
-            unless="local.cache.file.exists"
-            message="The dependent file ${dependency.name}, must be manually downloaded and placed in ${local.cache.dir}." />
-    </target>
-
-    <target
-        name="download"
-        unless="local.cache.file.exists">
-        <get
-            verbose="true"
-            src="${dependency.url}/${dependency.file}"
-            dest="${local.cache.dir}/${dependency.file}"
-            ignoreerrors="true" />
-
-        <condition property="download.from.mirror">
-            <and>
-                <isset property="dependency.releng.url" />
-                <not>
-                    <available
-                        file="${local.cache.dir}/${dependency.file}" />
-                </not>
-            </and>
-        </condition>
-        <antcall target="downloadMirror" />
-    </target>
-    <target
-        name="downloadMirror"
-        if="download.from.mirror">
-        <echo
-            message="Using mirror repository: ${main.url.file.exists}" />
-        <echo
-            message="Using mirror repository: ${dependency.releng.url}" />
-        <get
-            verbose="true"
-            src="${dependency.releng.url}/${dependency.file}"
-            dest="${local.cache.dir}/${dependency.file}" />
-    </target>
-
-
-    <!-- ================================= 
-        target: install              
-        ================================= -->
-    <target name="install">
-        <condition
-            property="file.type"
-            value="zip">
-            <isfileselected file="${dependency.file}">
-                <selector>
-                    <filename name="**/*.zip" />
-                </selector>
-            </isfileselected>
-        </condition>
-        <condition
-            property="file.type"
-            value="tgz">
-            <isfileselected file="${dependency.file}">
-                <selector>
-                    <filename name="**/*.tar.gz" />
-                </selector>
-            </isfileselected>
-        </condition>
-        <condition
-            property="file.type"
-            value="tgz">
-            <isfileselected file="${dependency.file}">
-                <selector>
-                    <filename name="**/*.tgz" />
-                </selector>
-            </isfileselected>
-        </condition>
-        <condition
-            property="file.type"
-            value="tar">
-            <isfileselected file="${dependency.file}">
-                <selector>
-                    <filename name="**/*.tar" />
-                </selector>
-            </isfileselected>
-        </condition>
-        <condition
-            property="file.type"
-            value="map">
-            <isfileselected file="${dependency.file}">
-                <selector>
-                    <filename name="**/*.map" />
-                </selector>
-            </isfileselected>
-        </condition>
-        <condition
-            property="file.type"
-            value="jar">
-            <isfileselected file="${dependency.file}">
-                <selector>
-                    <filename name="**/*.jar" />
-                </selector>
-            </isfileselected>
-        </condition>
-
-        <antcall target="install-${file.type}" />
-    </target>
-
-    <target name="install-tar">
-        <untar
-            dest="${install.destination}"
-            src="${local.cache.dir}/${dependency.file}"
-            overwrite="true" />
-    </target>
-    <target name="install-tgz">
-        <untar
-            dest="${install.destination}"
-            src="${local.cache.dir}/${dependency.file}"
-            compression="gzip"
-            overwrite="true" />
-    </target>
-    <target name="install-zip">
-    	<!--
-    	     We use the exec method for unzip, so we won't fail if a 
-    	     prereq can not be unzipped for some reason. See 
-    	     https://bugs.eclipse.org/bugs/show_bug.cgi?id=283968 
-    	-->
-    	<mkdir dir="${install.destination}" />
-      <exec
-          dir="."
-          executable="unzip">
-          <arg
-              line="-o -qq ${local.cache.dir}/${dependency.file} -d ${install.destination}"/>
-      </exec>
-    	<!--
-        <unzip
-            dest="${install.destination}"
-            src="${local.cache.dir}/${dependency.file}"
-            overwrite="true" />
-       -->
-    </target>
-    <target name="install-map">
-        <copy
-            todir="${install.destination}"
-            file="${local.cache.dir}/${dependency.file}"
-            overwrite="true" />
-    </target>
-    <target name="install-jar">
-        <copy
-            todir="${install.destination}"
-            file="${local.cache.dir}/${dependency.file}"
-            overwrite="true" />
-    </target>
-
-    <target name="checkDependency">
-        <dirname
-            file="${ant.file}"
-            property="dependency.dir" />
-
-        <copy
-            tofile="${buildDirectory}/dependency.${groupId}.xml"
-            overwrite="true">
-            <fileset dir="${dependency.dir}">
-                <include name="template.xml" />
-            </fileset>
-        </copy>
-        <echo
-            message="Creating dependency script: ${buildDirectory}/dependency.${groupId}.xml " />
-        <replace
-            file="${buildDirectory}/dependency.${groupId}.xml"
-            value="${groupId}.">
-            <replacetoken>@dependencyGroupId@</replacetoken>
-        </replace>
-        <replace
-            file="${buildDirectory}/dependency.${groupId}.xml"
-            value="${dependency.dir}">
-            <replacetoken>@dependencyDir@</replacetoken>
-        </replace>
-        <replace
-            file="${buildDirectory}/dependency.${groupId}.xml"
-            value="${dependency.properties}">
-            <replacetoken>@dependencyProperties@</replacetoken>
-        </replace>
-        <ant
-            antfile="${buildDirectory}/dependency.${groupId}.xml"
-            target="get" />
-
-        <!--
-            <delete failonerror="false">
-            <fileset dir=".">
-            <include name="${buildDirectory}/dependency.${groupId}.xml" />
-            </fileset>
-            </delete>
-        -->
-
-
-    </target>
-
-    <target name="installDependency">
-        <dirname
-            file="${ant.file}"
-            property="dependency.dir" />
-
-        <copy tofile="${buildDirectory}/dependency.${groupId}.xml">
-            <fileset dir="${dependency.dir}">
-                <include name="template.xml" />
-            </fileset>
-        </copy>
-        <replace
-            file="${buildDirectory}/dependency.${groupId}.xml"
-            value="${groupId}.">
-            <replacetoken>@dependencyGroupId@</replacetoken>
-        </replace>
-        <replace
-            file="${buildDirectory}/dependency.${groupId}.xml"
-            value="${dependency.dir}">
-            <replacetoken>@dependencyDir@</replacetoken>
-        </replace>
-        <replace
-            file="${buildDirectory}/dependency.${groupId}.xml"
-            value="${dependency.properties}">
-            <replacetoken>@dependencyProperties@</replacetoken>
-        </replace>
-        <ant
-            antfile="${buildDirectory}/dependency.${groupId}.xml"
-            target="install">
-            <property
-                name="install.destination"
-                value="${install.destination}" />
-        </ant>
-
-        <!--
-            <delete failonerror="false">
-            <fileset dir=".">
-            <include name="${buildDirectory}/dependency.${groupId}.xml" />
-            </fileset>
-            </delete>
-        -->
-    </target>
-
-
-</project>
-
diff --git a/releng.wtpbuilder/scripts/dependency/template.xml b/releng.wtpbuilder/scripts/dependency/template.xml
deleted file mode 100644
index 85499a8..0000000
--- a/releng.wtpbuilder/scripts/dependency/template.xml
+++ /dev/null
@@ -1,234 +0,0 @@
-<?xml version="1.0"?>
-<!-- ====================================================================== 
-    Sep 8, 2005 4:18:21 PM                                                        
-    
-    test    
-    test dependencies
-    
-    naci                                                                
-    ====================================================================== -->
-<project
-    name="test"
-    default="get">
-    <description>test dependencies</description>
-
-
-    <!-- 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" />
-
-    <!-- 
-        Note: if baseos, basews, and basearch are "passed in" to this 
-        file, then they take priority, and retain their value. Otherwise, 
-        use the current environment. Normally, the current environment is 
-        desired, but sometimes, such as for creating the "all in ones", it may 
-        be desired to "get" packages for other combinations.
-    -->
-    <property
-        name="baseos"
-        value="${env.BASEOS}" />
-    <property
-        name="basews"
-        value="${env.BASEWS}" />
-    <property
-        name="basearch"
-        value="${env.BASEARCH}" />
-
-    <!-- ================================= 
-        target: get              
-        ================================= -->
-    <property file="@dependencyProperties@" />
-
-
-    <!-- - - - - - - - - - - - - - - - - - 
-        target: init                      
-        - - - - - - - - - - - - - - - - - -->
-    <target name="init">
-        <property
-            name="dependency.name"
-            value="${@dependencyGroupId@name}" />
-        <property
-            name="dependency.description"
-            value="${@dependencyGroupId@url}" />
-        <property
-            name="dependency.url"
-            value="${@dependencyGroupId@url}" />
-        <property
-            name="local.cache.dir"
-            value="." />
-
-        <condition
-            property="dependency.file"
-            value="${@dependencyGroupId@file}">
-            <not>
-                <or>
-                    <isset
-                        property="@dependencyGroupId@file.linux-gtk-x86" />
-                    <isset
-                        property="@dependencyGroupId@file.linux-gtk-ppc" />
-                    <isset
-                        property="@dependencyGroupId@file.win32-win32-x86" />
-                    <isset
-                        property="@dependencyGroupId@file.macosx-carbon-ppc" />
-                </or>
-            </not>
-        </condition>
-        <condition
-            property="dependency.file"
-            value="${@dependencyGroupId@file.win32-win32-x86}">
-            <and>
-                <isset
-                    property="@dependencyGroupId@file.win32-win32-x86" />
-                <equals
-                    arg1="win32"
-                    arg2="${baseos}" />
-                <equals
-                    arg1="win32"
-                    arg2="${basews}" />
-                <equals
-                    arg1="x86"
-                    arg2="${basearch}" />
-            </and>
-        </condition>
-        <condition
-            property="dependency.file"
-            value="${@dependencyGroupId@file.linux-gtk-x86}">
-            <and>
-                <isset property="@dependencyGroupId@file.linux-gtk-x86" />
-                <equals
-                    arg1="linux"
-                    arg2="${baseos}" />
-                <equals
-                    arg1="gtk"
-                    arg2="${basews}" />
-                <equals
-                    arg1="x86"
-                    arg2="${basearch}" />
-            </and>
-        </condition>
-        <condition
-            property="dependency.file"
-            value="${@dependencyGroupId@file.linux-gtk-ppc}">
-            <and>
-                <isset property="@dependencyGroupId@file.linux-gtk-ppc" />
-                <equals
-                    arg1="linux"
-                    arg2="${baseos}" />
-                <equals
-                    arg1="gtk"
-                    arg2="${basews}" />
-                <equals
-                    arg1="ppc"
-                    arg2="${basearch}" />
-            </and>
-        </condition>
-        <condition
-            property="dependency.file"
-            value="${@dependencyGroupId@file.macosx-carbon-ppc}">
-            <and>
-                <isset
-                    property="@dependencyGroupId@file.macosx-carbon-ppc" />
-                <equals
-                    arg1="macosx"
-                    arg2="${baseos}" />
-                <equals
-                    arg1="carbon"
-                    arg2="${basews}" />
-                <equals
-                    arg1="ppc"
-                    arg2="${basearch}" />
-            </and>
-        </condition>
-        <condition
-            property="dependency.autodownload"
-            value="${@dependencyGroupId@autodownload}">
-            <isset property="@dependencyGroupId@autodownload" />
-        </condition>
-        <condition
-            property="dependency.releng.url"
-            value="${@dependencyGroupId@releng.url}">
-            <isset property="@dependencyGroupId@releng.url" />
-        </condition>
-    </target>
-
-
-    <target
-        name="get"
-        depends="init">
-
-        <fail
-            unless="dependency.file"
-            message="The dependent file ${dependency.name} is not a supported os-ws-arch. Did you set baseos, basews,baesarch and make use your dependency.file property matches it." />
-
-        <echo
-            level="info"
-            message="Getting ${dependency.file}" />
-        <echo
-            level="info"
-            message="Url: ${dependency.url}" />
-
-        <ant
-            antfile="@dependencyDir@/build.xml"
-            target="default" />
-
-    </target>
-
-
-    <!-- ================================= 
-        target: install              
-        ================================= -->
-    <target
-        name="install"
-        depends="init">
-        <echo
-            level="debug"
-            message="Installing ${dependency.file}" />
-        <echo
-            level="debug"
-            message="destination: ${install.destination}" />
-        <antcall target="cleanInstall" />
-        <property
-            file="${install.destination}/installmanifest.properties" />
-        <antcall target="callInstall" />
-        <echo
-            level="debug"
-            message="installmanifest.properties: ${install.destination}/installmanifest.properties" />
-        <echo
-            file="${install.destination}/installmanifest.properties"
-            append="true">
-            @dependencyGroupId@${dependency.file}.installed=true
-
-            @dependencyGroupId@dir=${local.cache.dir}
-            @dependencyGroupId@file=${dependency.file}
-
-        </echo>
-    </target>
-
-    <target
-        name="cleanInstall"
-        if="clean">
-        <available
-            file="${install.destination}/installmanifest.properties"
-            property="installmanifest.exists" />
-        <antcall target="cleanInstall2" />
-    </target>
-
-    <target
-        name="cleanInstall2"
-        if="installmanifest.exists">
-        <replace
-            file="${install.destination}/installmanifest.properties"
-            token="@dependencyGroupId@${dependency.file}.installed=true" />
-    </target>
-
-    <target
-        name="callInstall"
-        unless="@dependencyGroupId@${dependency.file}.installed">
-        <ant
-            antfile="@dependencyDir@/build.xml"
-            target="install" />
-    </target>
-
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/scripts/standaloneTest/runtest.bat b/releng.wtpbuilder/scripts/standaloneTest/runtest.bat
deleted file mode 100644
index c239a9f..0000000
--- a/releng.wtpbuilder/scripts/standaloneTest/runtest.bat
+++ /dev/null
@@ -1,94 +0,0 @@
-
-REM Example script to run standalone test on Windows
-REM
-@echo off
-SETLOCAL
-
-
-REM These "home" directories must be accurate for your machine.
-set BUILD_HOME=J:\tmp\buildhome
-set ANT_HOME=J:\work\apache-ant-1.7.0
-set JAVA_HOME=J:\JDKs\ibm-java-win-605
-set JAVA_6_HOME=J:\JDKs\ibm-java-win-605
-
-REM standard for windows. Linux or other platforms would need to change these.
-set BASEOS=win32
-set BASEWS=win32
-set BASEARCH=x86
-
-REM These 'set' commands should rarely, if ever have to be changed
-REM Some are not actually used, but values are provided
-REM to prevent spurious "warnings" in logs.
-REM In other cases, the directory must exist before this script runs.
-set PATH=%ANT_HOME%\bin;%JAVA_HOME%\bin;%PATH%
-set BASE_BUILDERS=%BUILD_HOME%\basebuilders
-set LOCAL_PREREQS_CACHE=%BUILD_HOME%\prereqsCache
-set LOCAL_BUILD_PROPERTIES_DIR=%BUILD_HOME%\localBuildProperties
-set RELENG=webtools.maps/releng
-set RELENG_BUILDER=webtools.releng/releng.wtpbuilder
-set DISPLAY=localhost:0
-set BASE_BUILDERS=%BUILD_HOME%/basebuilders
-set PROJECT_BUILDERS=%BUILD_HOME%/projectBuilders
-set PROJECT_PROJECTS=%BUILD_HOME%/projects
-set PROJECT_TESTS=%BUILD_HOME%/tests
-set RECOMMENDED_TMP_DIR=%BUILD_HOME%/temp
-set DEP_DIR=/helios
-
-
-rem   Note:
-rem   'ext' protocol typically requires
-rem   environment variable CVS_RSH to be set to ssh
-rem   So, we just always do it. Can't imagine it'd hurt
-rem   if protocol was pserver, but could be removed in that
-rem   case, if desired.
-set CVS_RSH=ssh
-set BUILD_CVS_READ_PROTOCOL=pserver
-set BUILD_CVS_READ_USER=anonymous
-set BUILD_CVS_WRITE_PROTOCOL=ext
-set BUILD_CVS_WRITE_USER=david_williams
-set BUILD_CVS_SERVER=dev.eclipse.org
-
-set BUILD_CVS_ROOT=/cvsroot/webtools
-
-
-
-
-
-REM the following comments apply to the -D variables provided to the ant command
-REM projectname:      what ever the project would is called in cruisecontrol (even though CC isn't used here)
-REM build.committers: should be true if you want to download and reproduce a build from 'committers' area.
-REM                   If working from a build on 'downloads' area, omit the variable (do not just set to false).
-REM buildType:        I, S, or R
-REM buildId:          Basically the "middle" part of a download zip or build name, such as the 3.2I in wtp-sdk-I-3.2I-20090722042933.zip
-REM timestamp         Basically the "end" part of a download zip or build name, such as 20090722042933 in wtp-sdk-I-3.2I-20090722042933.zip
-REM build.stream      (not sure if needed)
-REM buildBranch       Build branch used in various scripts ... usually the "middle" part of projectname, such as R3.2 in wtp-R3.2-I
-REM testTarget        The specific test suite(s) to run. These target names are from the test.xml file. Omit or use 'all' to run all tests.
-REM -f antfile        The name or path should not have to be changed, but the "releng.wtpbuilder" project must already be checked out from CVS
-REM                   (or exported from Eclipse) into a directory named 'webtools.releng' which is immediately under the BUILD_HOME directory.
-REM                   It is assume this batch file, then, is in the BUILD_HOME directory.
-
-call ant ^
-     -Dprojectname=wtp-R3.2.0-I ^
-     -DbuildType=I ^
-     -DbuildId=3.2.0 ^
-     -Dtimestamp=20091116075243 ^
-     -DmapVersionTag=vI20091116075243 ^
-     -Dbuild.stream=R3.2.0 ^
-     -DbuildBranch=R3.2.0 ^
-     -f standalonecheckout.xml
-
-call ant  ^
-     -Dprojectname=wtp-R3.2.0-I ^
-     -Dbuild.committers=true   ^
-     -DbuildType=I ^
-     -DbuildId=3.2.0 ^
-     -Dtimestamp=20091116075243 ^
-     -Dbuild.stream=R3.2.0 ^
-     -DbuildBranch=R3.2.0 ^
-     -DtestBundle=org.eclipse.jst.jsp ^
-     -f standaloneTest.xml
-
-
-
-ENDLOCAL
diff --git a/releng.wtpbuilder/scripts/standaloneTest/standaloneTest.xml b/releng.wtpbuilder/scripts/standaloneTest/standaloneTest.xml
deleted file mode 100644
index 8cc0a8d..0000000
--- a/releng.wtpbuilder/scripts/standaloneTest/standaloneTest.xml
+++ /dev/null
@@ -1,236 +0,0 @@
-<project
-    name="standaloneTest"
-    default="standaloneTest"
-    basedir=".">
-    <!--
-        Required inputs: build.home buildType buildId timestamp
-        build.stream [optional] build.committers [optional] testTarget
-        [optional]
-    -->
-    <property
-        environment="env"/>
-        
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-    <echo message="LOCAL_BUILD_PROPERTIES_DIR: ${env.LOCAL_BUILD_PROPERTIES_DIR}"/>
-
-  
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-    <fail
-        unless="projectname"
-        message="a projectname is required"/>
-        
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <property
-        name="build.home"
-        value="${env.BUILD_HOME}"/>
-    <echo
-        level="info"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        file="${keyCfgFile}"/>
-    <fail
-        message="testRoot must be set for this task"
-        unless="env.PROJECT_TESTS"/>
-    <property
-        name="testRoot"
-        value="${env.PROJECT_TESTS}/${projectname}"/>
-    <property
-        name="env.DEP_DIR"
-        value="/helios"/>
-  <property
-      name="distribution"
-      value="wtp"/>
-	
-    <property
-    	name="buildDirectory"
-    	value="${env.PROJECT_PROJECTS}/${projectName}/workdir"/>
-	
-	<!--
-    <property
-        name="dependency.properties"
-        value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-        -->
-  <property
-      name="dependency.properties"
-      value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-    <available
-        file="${dependency.properties}"
-        property="dependency.properties.exists"/>
-    <fail
-        message="dependency file not found: ${dependency.properties}"
-        unless="dependency.properties.exists"/>
-    <target
-        name="standaloneTest">
-        <property
-            file="${build.home}/${env.RELENG_BUILDER}/build.properties"/>
-        <property
-            name="local.cache.dir"
-            value="${env.LOCAL_PREREQS_CACHE}"/>
-        <property
-            name="testRoot"
-            value="${build.home}/testRoot"/>
-            <!-- don't delete automatically
-        <delete
-            dir="${testRoot}"
-            failonerror="false"/>
-             -->
-        <mkdir
-            dir="${testRoot}"/>
-            <!--  no longer needed here, ... done in standalonecheckout 
-        <antcall
-            target="getReleng"/>
-            -->
-        
-        <condition property="installed">
-            <available file="${testRoot}/eclipse" type="dir"/>
-        </condition>
-        
-    	<echo message="installed: ${installed}" />
-    	<echo message="installed location: ${testRoot}/eclipse" />
-    	
-        <antcall
-            target="run"/>
-    </target>
-    <target
-        name="getReleng">
-        <property
-            name="releng.tag"
-            value="v${buildType}${timestamp}"/>
-        <mkdir
-            dir="${env.PROJECT_BUILDERS}/${projectname}"/>
-        <cvs
-            cvsRoot=":pserver:anonymous@dev.eclipse.org:/cvsroot/webtools"
-            package="${env.RELENG}"
-            dest="${env.PROJECT_BUILDERS}/${projectname}"
-            command="export"
-            tag="${releng.tag}"
-            quiet="${env.CVS_QUIET}"
-            reallyquiet="${env.CVS_REALLY_QUIET}"/>
-    </target>
-    <target
-        name="getDependencies"
-    	  unless="installed">
-        <ant
-            antfile="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG_BUILDER}/distribution/${distribution}.tests/testdependency.xml">
-            <property
-                name="base.install.dir"
-                value="${testRoot}"/>
-            <property
-                name="dependencyTargets"
-                value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG_BUILDER}/scripts/dependency/build.xml"/>
-        </ant>
-        
-        <antcall
-            target="getAndInstallWTP">
-            <param
-                name="file"
-                value="wtp-sdk-${buildType}-${buildId}-${timestamp}.zip"/>
-        </antcall>
-        <antcall
-            target="getAndInstallWTP">
-            <param
-                name="file"
-                value="wtp-tests-${buildType}-${buildId}-${timestamp}.zip"/>
-        </antcall>
-
-    </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://build.eclipse.org/webtools/committers/${projectname}/${timestamp}"
-            else="http://download.eclipse.org/webtools/downloads">
-            <isset
-                property="build.committers"/>
-        </condition>
-        <condition
-            property="file.url"
-            value="${file.url.1}/${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="${testRoot}${dropinsFolder}"
-            overwrite="true"/>
-    </target>
-    <target
-        name="run"
-    	  depends="getDependencies">
-        <mkdir
-            dir="${testRoot}/results/consolelogs"/>
-        <copy
-            todir="${testRoot}"
-            flatten="true"
-            overwrite="true">
-            <fileset
-                dir="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG_BUILDER}/distribution/${distribution}.tests/testScripts"/>
-        </copy>
-        <ant
-            antfile="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG_BUILDER}/distribution/${distribution}.tests/build.xml"
-            target="runTestEclipse">
-            <property
-                name="testRoot"
-                value="${testRoot}"/>
-            <!-- if not otherwise set, assume all tests -->
-            <property
-                name="testTarget"
-                value="all"/>
-        </ant>
-        <copy
-            file="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG_BUILDER}/distribution/${distribution}.tests/templateFiles/index.php"
-            todir="${testRoot}/results"
-            overwrite="true"/>
-    </target>
-    <target
-        name="clean"
-        if="clean">
-        <property
-            file="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG_BUILDER}/build.properties"/>
-        <property
-            name="testRoot"
-            value="${build.home}/testRoot"/>
-        <delete
-            dir="${testRoot}"
-            failonerror="false"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/scripts/standaloneTest/standalonecheckout.xml b/releng.wtpbuilder/scripts/standaloneTest/standalonecheckout.xml
deleted file mode 100644
index c1dc253..0000000
--- a/releng.wtpbuilder/scripts/standaloneTest/standalonecheckout.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<project
-    name="checkout"
-    default="checkout"
-    basedir=".">
-    <!--
-        Standard properties pattern. 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"/>
-    <!--
-        Let users override standard properties, if desired. If
-        directory, file, or some properties do not exist, then standard
-        properties will be used.
-    -->
-	  <echo message="LOCAL_BUILD_PROPERTIES_DIR: ${env.LOCAL_BUILD_PROPERTIES_DIR}"/>
-
-	
-	  <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
-
-    <fail
-        unless="projectname"
-        message="a projectname is required"/>
-
-    <!-- if not otherwise set, the following are good default values -->
-    <property
-        name="checkout.builder.clean"
-        value="true"/>
-    <property
-        name="mapVersionTag"
-        value="HEAD"/>
-    <property
-        name="cvsProtocol"
-        value="${env.BUILD_CVS_WRITE_PROTOCOL}"/>
-    <property
-        name="cvsUser"
-        value="${env.BUILD_CVS_WRITE_USER}"/>
-    <property
-        name="cvsServer"
-        value="${env.BUILD_CVS_SERVER}"/>
-    <property
-        name="cvsRoot"
-        value="${env.BUILD_CVS_ROOT}"/>
-
-    <!-- end required defaults-if-not-set -->
-
-
-    <!-- standard computed properties. Should not have to be changed. -->
-    <property
-        name="mapCvsRoot"
-        value=":${cvsProtocol}:${cvsUser}@${cvsServer}:${cvsRoot}"/>
-    <property
-        name="codir"
-        value="${env.PROJECT_BUILDERS}/${projectname}"/>
-    <echo
-        message="projectname: ${projectname}"/>
-
-    <!-- main  -->
-    <target
-        name="checkout"
-        if="projectname">
-        <!-- we always check and init the builder -->
-    	
-        <antcall
-            target="getbuilder"/>
-      
-    </target>
-    <!--
-        The order of execution of these three worker targets is
-        critical, check.clean, initBuilders, and then getbuilder.
-    -->
-    <target
-        name="getbuilder"
-        depends="check.clean,initBuilders"
-        if="doClean">
-        <!--
-            This is a special property file, that contains (only) the
-            value of builderVersion. Then, that version of the builder
-            is fetched to control the rest of the build
-        -->
-        <property
-            file="${codir}/${env.RELENG}/maps/build.cfg"/>
-        <fail
-            unless="builderVersion"
-            message="Could not get builderVersion. Probably could not checkout build.cfg"/>
-        <!--
-            deleting WTP builder project location: <BUILD
-            HOME>/projectBuilders/<project>/webtools.releng/releng.wtpbuilder
-        -->
-        <delete
-            dir="${codir}/${env.RELENG_BUILDER}"
-            failonerror="true"/>
-        <!--
-            Get a new version of the wtpbuild project from CVS, version
-            comes from build.cfg map file
-        -->
-        <echo
-            message="Version tag for ${env.RELENG_BUILDER} is: ${builderVersion}"/>
-        <cvs
-            quiet="${env.CVS_QUIET}"
-            reallyquiet="${env.CVS_REALLY_QUIET}"
-            cvsRoot="${mapCvsRoot}"
-            package="${env.RELENG_BUILDER}"
-            dest="${codir}"
-            tag="${builderVersion}"/>
-    </target>
-    <!--
-        set doClean property checkout.build.clean is set in
-        checkout.properties from the project properties directory
-    -->
-    <target
-        name="check.clean">
-        <echo
-            message="checkout.builder.clean: ${checkout.builder.clean}"/>
-        <condition
-            property="doClean">
-            <equals
-                arg1="${checkout.builder.clean}"
-                arg2="true"
-                trim="true"
-                casesensitive="false"/>
-        </condition>
-    </target>
-    <!--
-        checkout releng from from CVS. We do this only to get the
-        build.cfg file which names the version of the wtpbuilder to get.
-        CVS src: webtools.map/releng/maps files dest: <BUILD
-        HOME>/projectBuilders/<project>/webtools.maps/releng/maps
-    -->
-    <target
-        name="initBuilders"
-        depends="check.clean"
-        if="doClean">
-        <echo
-            message="Version tag for ${env.RELENG}: ${mapVersionTag}"/>
- 
-      <delete
-          dir="${codir}/${env.RELENG}"
-          failonerror="true"/>
-    	<cvs
-            quiet="true"
-            cvsRoot="${mapCvsRoot}"
-            package="${env.RELENG}"
-            dest="${codir}"
-            tag="${mapVersionTag}"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/scripts/upload/upload.xml b/releng.wtpbuilder/scripts/upload/upload.xml
deleted file mode 100644
index 620af74..0000000
--- a/releng.wtpbuilder/scripts/upload/upload.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<project
-    name="upload"
-    default="upload"
-    basedir=".">
-
-	<!-- if not set by caller, assign default value. In this case, this must be 
-	set before calling other property files, since it is a variable in those 
-	property files -->
-	
-	 <property
-	      name="site-sub-dir"
-	      value="committers" />
-	
-    <!-- = = = standard properties pattern = = = -->
-    <!-- 
-        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" />
-
-    <!-- 
-        Let users override standard properties, if desired.
-        If directory, file, or some properties do not exist,  
-        then standard properties will be used.
-    -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties" />
-
-    <!-- = = = end standard properties pattern = = = -->
-
-
-    <!-- if not otherwise set, these are standard properties -->
-
-	<property
-      name="site-sub-dir"
-      value="committers" />
-
-    
-    <property
-        name="uploadUser"
-        value="david_williams" />
-    <property
-        name="uploadPassword"
-        value="This is not really used since ssh login is assumed (required)" />
-    <property
-        name="uploadServer"
-        value="download.eclipse.org" />
-    <property
-        name="uploadRemoteDirectory"
-        value="/home/data/users/${uploadUser}/downloads/webtools/${site-sub-dir}/drops/${buildBranch}" />
-    <!-- rsyncRootPrefix should be empty for Linux machines. -->
-    <!-- But, Windows using cygwin will need something like /cygdrive/G/  -->
-    <!-- for what ever drive or directory is parent of build home  -->
-    <property
-        name="rsyncRootPrefix"
-        value="" />
-    <!-- end standard properties -->
-
-
-
-    <target
-        name="upload"
-        depends="check.upload"
-        if="doUpload">
-
-
-
-        <ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
-        <property file="${buildDirectory}/label.properties" />
-
-        <echo
-            level="debug"
-            message="chmod for ${buildDirectory}/${buildLabel}" />
-        <!-- synch on host is a tiny bit faster if permisions already set -->
-        <!-- and, remember, chmod ant task is implemented only for unix -->
-        <!-- TODO: put in windows logic here? -->
-        <exec executable="chmod">
-            <arg line="-Rc  o+rx  ${buildDirectory}/${buildLabel}" />
-        </exec>
-
-        <echo
-            level="info"
-            message="RSYNC to: ${uploadRemoteDirectory}/${buildLabel}" />
-
-    	  <exec 
-             executable="ssh">
-    	  	<arg line="${uploadUser}@${uploadServer} mkdir -p ${uploadRemoteDirectory}" />
-    	  </exec>
-        <exec executable="rsync">
-            <arg
-                line="-e ssh -Cavz ${rsyncRootPrefix}${buildDirectory}/${buildLabel} ${uploadUser}@${uploadServer}:${uploadRemoteDirectory}" />
-        </exec>
-    </target>
-
-    <target name="check.upload">
-        <condition property="doUpload">
-            <equals
-                arg1="${env.BUILD_UPLOAD}"
-                arg2="true" 
-                casesensitive="false"
-                trim="true"/>
-        </condition>
-    </target>
-
-</project>
diff --git a/releng.wtpbuilder/smokeTestTemplates/smoke test templateR31x.txt b/releng.wtpbuilder/smokeTestTemplates/smoke test templateR31x.txt
deleted file mode 100644
index 2c6c156..0000000
--- a/releng.wtpbuilder/smokeTestTemplates/smoke test templateR31x.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-== Smoke Test Promotion votes ==
-
-
-{| border="3" cellpadding="5"
-|+ This Week's Results
-|Project ||Vote ||Initials Comments
-
-|-
-| Java EE
-| align="center" | [[Image:Questionmark.gif]]
-|
-|-
-|JSF
-| align="center" | [[Image:Questionmark.gif]]
-|
-|-
-|Dali
-| align="center" |[[Image:Questionmark.gif]]
-|
-|-
-|Server
-| align="center" |[[Image:Questionmark.gif]]
-|
-|-
-|Web Services, WSDL
-| align="center" |[[Image:Questionmark.gif]]
-|[[Image:Questionmark.gif]]Web Services
-
-[[Image:Questionmark.gif]]WSDL
-|-
-|Source Editing
-| align="center" |[[Image:Questionmark.gif]]
-|[[Image:Questionmark.gif]]XML + JSP
-
-[[Image:Questionmark.gif]]XSD
-
-[[Image:Questionmark.gif]]JSDT
-
-[[Image:Questionmark.gif]]XSL
-|-
-|Release Engineering
-| align="center" |[[Image:Questionmark.gif]]
-|
-|}
-
-
- Smoke Test ok to promote vote = [[Image:Checkmark.gif]]
- Smoke Test do not promote vote = [[Image:Fail.gif]]
- Smoke Test Pending = [[Image:Questionmark.gif]]
-
-
-=====[[WTP Smoke Test Results | Back to the WTP Smoke Test Results Main Page]]=====
diff --git a/releng.wtpbuilder/smokeTestTemplates/smoke test templateR32x.txt b/releng.wtpbuilder/smokeTestTemplates/smoke test templateR32x.txt
deleted file mode 100644
index 1dbc4eb..0000000
--- a/releng.wtpbuilder/smokeTestTemplates/smoke test templateR32x.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-== Smoke Test Promotion votes ==
-
-
-{| border="3" cellpadding="5"
-|+ This Week's Results
-|Project ||Vote ||Initials Comments
-
-|-
-| Java EE
-| align="center" | [[Image:Questionmark.gif]]
-|
-|-
-|JSF
-| align="center" | [[Image:Questionmark.gif]]
-|
-|-
-|Dali
-| align="center" |[[Image:Questionmark.gif]]
-|
-|-
-|Server
-| align="center" |[[Image:Questionmark.gif]]
-|
-|-
-|Web Services, WSDL
-| align="center" |[[Image:Questionmark.gif]]
-|[[Image:Questionmark.gif]]Web Services
-
-[[Image:Questionmark.gif]]WSDL
-
-[[Image:Questionmark.gif]]JAXWS
-|-
-|Source Editing
-| align="center" |[[Image:Questionmark.gif]]
-|[[Image:Questionmark.gif]]XML + JSP
-
-[[Image:Questionmark.gif]]XSD
-
-[[Image:Questionmark.gif]]JSDT
-
-[[Image:Questionmark.gif]]XSL
-|-
-|Release Engineering
-| align="center" |[[Image:Questionmark.gif]]
-|
-|}
-
-
- Smoke Test ok to promote vote = [[Image:Checkmark.gif]]
- Smoke Test do not promote vote = [[Image:Fail.gif]]
- Smoke Test Pending = [[Image:Questionmark.gif]]
-
-
-=====[[WTP Smoke Test Results | Back to the WTP Smoke Test Results Main Page]]=====
diff --git a/releng.wtpbuilder/smokeTestTemplates/smoketestRequestTemplateR31x.txt b/releng.wtpbuilder/smokeTestTemplates/smoketestRequestTemplateR31x.txt
deleted file mode 100644
index 936a3ec..0000000
--- a/releng.wtpbuilder/smokeTestTemplates/smoketestRequestTemplateR31x.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Smoke Test Request for WTP 3.1.1 Final Build
-
-Please document your Project's testing and approval of our maintenance build,
-by today, Thursday, 2 PM (Eastern Time), or let us know if that's not possible.
-
-This is our project's Final Build for Galileo SR1. Test carefully!  
-
-Current Build
-http://build.eclipse.org/webtools/committers/wtp-R3.1-M/20090910022803/M-3.1M-20090910022803/
-
-
-Smoketest Results
-http://wiki.eclipse.org/WTP_Smoke_Test_Results_R31_091009
diff --git a/releng.wtpbuilder/smokeTestTemplates/smoketestRequestTemplateR32.txt b/releng.wtpbuilder/smokeTestTemplates/smoketestRequestTemplateR32.txt
deleted file mode 100644
index f1662ff..0000000
--- a/releng.wtpbuilder/smokeTestTemplates/smoketestRequestTemplateR32.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Smoke Test Request for WTP 3.2 I-build towards WTP 3.2 M4
-
-Please document your Project's testing and approval of build, by today, 
-Thursday, 2 PM (Eastern Time), or let us know if that's not possible.
-
-This is for our first I-build towards Helios M4. 
-
-Current Build
-http://build.eclipse.org/webtools/committers/wtp-R3.2.0-I/20091119115805/I-3.2.0-20091119115805/
-
-Smoketest Results
-http://wiki.eclipse.org/WTP_Smoke_Test_Results_R32_111909