diff --git a/releng.wtpbuilder/distribution/jsdt.tests/build.properties b/releng.wtpbuilder/distribution/jsdt.tests/build.properties
deleted file mode 100644
index 79d1ae9065ad34049d6cd8f3b66e25b02286f2c0..0000000000000000000000000000000000000000
--- a/releng.wtpbuilder/distribution/jsdt.tests/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-getprereq.eclipse=true
-getprereq.eclipseplatform=false
-getprereq.eclipsetestframework=true
-getprereq.emf=false
-getprereq.emfxsd=false
-getprereq.emfvalidation=false
-getprereq.gef=false
-getprereq.dtp=false
-getprereq.wst=false
-getprereq.jst=false
-getprereq.wtp=false
-getprereq.dltk=false
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/jsdt.tests/build.xml b/releng.wtpbuilder/distribution/jsdt.tests/build.xml
index ad241bd123972d019200441bc3157dd8368032f6..7dbf16352420d63305380de6322cb73f9f1e7ce8 100644
--- a/releng.wtpbuilder/distribution/jsdt.tests/build.xml
+++ b/releng.wtpbuilder/distribution/jsdt.tests/build.xml
@@ -95,7 +95,7 @@
unless="dependency.properties.exists"/>
<property
name="test.dependency"
- value="${wtp.builder.home}/distribution/${build.distribution}/dependency.xml"/>
+ value="${wtp.builder.home}/scripts/dependency/dependency.xml"/>
<available
file="${test.dependency}"
property="test.dependency.exists"/>
@@ -108,6 +108,9 @@
<property
name="base.install.dir"
value="${testRoot}"/>
+ <property
+ name="tobeinstalled.properties"
+ value="${wtp.builder.home}/distribution/${build.distribution}.tests/tobeInstalled.properties"/>
</ant>
<antcall
target="unzipTests"/>
diff --git a/releng.wtpbuilder/distribution/jsdt.tests/dependency.xml b/releng.wtpbuilder/distribution/jsdt.tests/dependency.xml
deleted file mode 100644
index 1a0f17d5cf5ec829d3b7c16a4b4788447557336f..0000000000000000000000000000000000000000
--- a/releng.wtpbuilder/distribution/jsdt.tests/dependency.xml
+++ /dev/null
@@ -1,273 +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 branch specific values -->
- <property
- name="keyCfgFile"
- value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
- <echo
- level="debug"
- message="keyCfgFile: ${keyCfgFile}"/>
- <property
- file="${keyCfgFile}"/>
-
- <property
- file="build.properties"/>
-
- <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"/>
- <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="prereq.eclipse"/>
- <antcall
- target="prereq.eclipseplatform"/>
- <antcall
- target="prereq.eclipsetestframework"/>
- <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="prereq.dltk"/>
- </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.eclipsetestframework"
- if="getprereq.eclipsetestframework">
- <antcall
- target="getAndInstallFramework">
- <param
- name="groupId"
- value="eclipseTestFramework"/>
- </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="prereq.dltk"
- if="getprereq.dltk">
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="dltk"/>
- </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>
- <target
- name="getAndInstallRepo"
- if="${groupId}.url">
- <ant
- antfile="${dependencyTargets}"
- target="checkDependency">
- <property
- name="groupId"
- value="${groupId}"/>
- </ant>
- <ant
- antfile="${dependencyTargets}"
- target="installRepo">
- <property
- name="groupId"
- value="${groupId}"/>
- <property
- name="install.destination"
- value="${base.install.dir}"/>
- </ant>
- </target>
- <!-- use getAndInstallFramework to decide based on whether or not 'tobeinstalledfeaturegroups' exists -->
- <target
- name="getAndInstallFramework"
- depends="tryRepo"
- unless="isRepo">
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="${groupId}"/>
- </antcall>
- </target>
- <target
- name="tryRepo"
- depends="checkIfRepo"
- if="isRepo">
- <antcall
- target="getAndInstallRepo">
- <param
- name="groupId"
- value="${groupId}"/>
- </antcall>
- </target>
- <target
- name="checkIfRepo">
- <condition
- property="isRepo">
- <isset
- property="${groupId}.tobeinstalledfeaturegroups"/>
- </condition>
- </target>
-
-</project>
-
diff --git a/releng.wtpbuilder/distribution/jsdt.tests/tobeInsalled.properties b/releng.wtpbuilder/distribution/jsdt.tests/tobeInsalled.properties
new file mode 100644
index 0000000000000000000000000000000000000000..2a77b485f5f95c96dfb5976c87aad8ecb09f8459
--- /dev/null
+++ b/releng.wtpbuilder/distribution/jsdt.tests/tobeInsalled.properties
@@ -0,0 +1,2 @@
+getprereq.eclipse=true
+getprereq.eclipsetestframework=true