move to latest near M6 platform
diff --git a/releng.wtpbuilder/distribution/incubator.tests/build.xml b/releng.wtpbuilder/distribution/incubator.tests/build.xml
index 79fa1f8..44110f3 100644
--- a/releng.wtpbuilder/distribution/incubator.tests/build.xml
+++ b/releng.wtpbuilder/distribution/incubator.tests/build.xml
@@ -110,7 +110,7 @@
             executable="unzip"
             failonerror="true">
             <arg
-                line="-o -qq  wtp-incubator-xsl_sdk-${buildLabel}.zip -d ${testRoot}${dropinsFolder}" />
+                line="-o -qq  wtp-incubator-xsl_sdk-${buildLabel}.zip -d ${testRoot}/eclipse/dropins" />
         </exec>
         <echo
             message="installing xsl tests" />
@@ -119,7 +119,7 @@
             executable="unzip"
             failonerror="true">
             <arg
-                line="-o -qq wtp-incubator-xsl-tests-${buildLabel}.zip -d ${testRoot}${dropinsFolder}" />
+                line="-o -qq wtp-incubator-xsl-tests-${buildLabel}.zip -d ${testRoot}/eclipse/dropins" />
         </exec>
     </target>
 
@@ -147,7 +147,7 @@
             value="${env.JAVA_5_HOME}/bin/java" />
         <property
             name="plugin-path"
-            value="${testRoot}${dropinsFolder}/eclipse/plugins" />
+            value="${testRoot}/eclipse/dropins/eclipse/plugins" />
         <property
             name="vmargs"
             value="-Xms256m -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}" />
diff --git a/releng.wtpbuilder/distribution/incubator.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/incubator.tests/testScripts/test.xml
index fa0ac66..e4720d8 100644
--- a/releng.wtpbuilder/distribution/incubator.tests/testScripts/test.xml
+++ b/releng.wtpbuilder/distribution/incubator.tests/testScripts/test.xml
@@ -40,7 +40,7 @@
     <!-- The root of the eclipse installation -->
     <property
         name="eclipse-home"
-        value="${testRoot}${dropinsFolder}/eclipse/" />
+        value="${testRoot}/eclipse/dropins/eclipse/" />
 
     <!-- The directory that will contain the xml and html results from the tests that are run -->
     <property
diff --git a/releng.wtpbuilder/distribution/incubator.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/incubator.tests/testScripts/wtp-junit-tests.xml
index 986f569..cec1889 100644
--- a/releng.wtpbuilder/distribution/incubator.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/incubator.tests/testScripts/wtp-junit-tests.xml
@@ -50,7 +50,7 @@
             value="${junit-report-output}" />
         <property
             name="plugin-path"
-            value="${testRoot}${dropinsFolder}/eclipse/plugins/${testPlugin}" />
+            value="${testRoot}/eclipse/dropins/eclipse/plugins/${testPlugin}" />
         <property
             name="formatter"
             value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter" />
diff --git a/releng.wtpbuilder/distribution/incubator.tests/testdependency.xml b/releng.wtpbuilder/distribution/incubator.tests/testdependency.xml
index 79fc162..06c829c 100644
--- a/releng.wtpbuilder/distribution/incubator.tests/testdependency.xml
+++ b/releng.wtpbuilder/distribution/incubator.tests/testdependency.xml
@@ -89,7 +89,7 @@
                 value="${groupId}" />
             <property
                 name="install.destination"
-                value="${base.install.dir}${dropinsFolder}" />
+                value="${base.install.dir}/eclipse/dropins" />
         </ant>
     </target>
 
diff --git a/releng.wtpbuilder/distribution/wtp.tests/build.xml b/releng.wtpbuilder/distribution/wtp.tests/build.xml
index b8ec860..bdd49c0 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/build.xml
@@ -107,35 +107,35 @@
             executable="unzip"
             failonerror="false">
             <arg
-                line="-o -qq wtp-sdk-${buildLabel}.zip -d ${testRoot}${dropinsFolder}" />
+                line="-o -qq wtp-sdk-${buildLabel}.zip -d ${testRoot}/eclipse/dropins" />
         </exec>
         <exec
             dir="${buildDirectory}/${buildLabel}"
             executable="unzip"
             failonerror="false">
             <arg
-                line="-o -qq wtp-wst-Automated-Tests-${buildLabel}.zip -d ${testRoot}${dropinsFolder}" />
+                line="-o -qq wtp-wst-Automated-Tests-${buildLabel}.zip -d ${testRoot}/eclipse/dropins" />
         </exec>
         <exec
             dir="${buildDirectory}/${buildLabel}"
             executable="unzip"
             failonerror="false">
             <arg
-                line="-o -qq wtp-jst-Automated-Tests-${buildLabel}.zip -d ${testRoot}${dropinsFolder}" />
+                line="-o -qq wtp-jst-Automated-Tests-${buildLabel}.zip -d ${testRoot}/eclipse/dropins" />
         </exec>
         <exec
             dir="${buildDirectory}/${buildLabel}"
             executable="unzip"
             failonerror="false">
             <arg
-                line="-o -qq wtp-jpt-sdk-${buildLabel}.zip -d ${testRoot}${dropinsFolder}" />
+                line="-o -qq wtp-jpt-sdk-${buildLabel}.zip -d ${testRoot}/eclipse/dropins" />
         </exec>
         <exec
             dir="${buildDirectory}/${buildLabel}"
             executable="unzip"
             failonerror="false">
             <arg
-                line="-o -qq wtp-jpt-Automated-Tests-${buildLabel}.zip -d ${testRoot}${dropinsFolder}" />
+                line="-o -qq wtp-jpt-Automated-Tests-${buildLabel}.zip -d ${testRoot}/eclipse/dropins" />
         </exec>
     </target>
 
@@ -164,7 +164,7 @@
             value="${env.JAVA_5_HOME}/bin/java" />
         <property
             name="plugin-path"
-            value="${testRoot}${dropinsFolder}/eclipse/plugins" />
+            value="${testRoot}/eclipse/dropins/eclipse/plugins" />
         <property
             name="vmargs"
             value="-Xms256m -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}" />
diff --git a/releng.wtpbuilder/distribution/wtp.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/wtp.tests/testScripts/test.xml
index 017cc3c..abff743 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/testScripts/test.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/testScripts/test.xml
@@ -43,7 +43,7 @@
     <!-- The root of the eclipse installation -->
     <property
         name="eclipse-home"
-        value="${testRoot}${dropinsFolder}/eclipse/" />
+        value="${testRoot}/eclipse/dropins/eclipse/" />
 
     <!-- The directory that will contain the xml and html results from the tests that are run -->
     <property
diff --git a/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml
index a754e5b..9863191 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml
@@ -50,7 +50,7 @@
             value="${junit-report-output}" />
         <property
             name="plugin-path"
-            value="${testRoot}${dropinsFolder}/eclipse/plugins/${testPlugin}" />
+            value="${testRoot}/eclipse/dropins/eclipse/plugins/${testPlugin}" />
         <property
             name="formatter"
             value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter" />
diff --git a/releng.wtpbuilder/distribution/wtp.tests/testdependency.xml b/releng.wtpbuilder/distribution/wtp.tests/testdependency.xml
index 72bb168..a417259 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/testdependency.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/testdependency.xml
@@ -117,7 +117,7 @@
                 value="${groupId}" />
             <property
                 name="install.destination"
-                value="${base.install.dir}${dropinsFolder}" />
+                value="${base.install.dir}/eclipse/dropins" />
         </ant>
     </target>