diff --git a/releng.wtpbuilder/buildtemplates/components/template/dependency.xml b/releng.wtpbuilder/buildtemplates/components/template/dependency.xml
index 9ddeb56eed10924e4d8f18e0a2fcec6f1b2930fd..8710ae7e7610b451f5c9238a92ae9cb14c4c9d99 100644
--- a/releng.wtpbuilder/buildtemplates/components/template/dependency.xml
+++ b/releng.wtpbuilder/buildtemplates/components/template/dependency.xml
@@ -45,7 +45,13 @@
target="getAndInstall">
<param
name="groupId"
- value="xml"/>
+ value="dtp"/>
+ </antcall>
+ <antcall
+ target="getAndInstall">
+ <param
+ name="groupId"
+ value="wtp"/>
</antcall>
</target>
<target
diff --git a/releng.wtpbuilder/buildtemplates/components/template_sdk/customTargets.xml b/releng.wtpbuilder/buildtemplates/components/template_sdk/customTargets.xml
index 4c7bdd953f051e50bb52ea5828ed111b6b0e5fdf..f512c3161b9b61f219e24409f7ac8b96444f5b65 100644
--- a/releng.wtpbuilder/buildtemplates/components/template_sdk/customTargets.xml
+++ b/releng.wtpbuilder/buildtemplates/components/template_sdk/customTargets.xml
@@ -81,7 +81,7 @@
name="assemble.@featurename@_sdk.feature">
<property
name="archiveName"
- value="@zipprefix@-${buildLabel}.zip"/>
+ value="@zipprefix@-sdk-${buildLabel}.zip"/>
<ant
antfile="${assembleScriptName}"
dir="${buildDirectory}"/>
@@ -92,7 +92,7 @@
name="postPackage">
<property
name="archiveName"
- value="@zipprefix@-${buildLabel}.zip"/>
+ value="@zipprefix@-sdk-${buildLabel}.zip"/>
<ant
antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
target="unpackUpdateJarsAndCreateZippedPackages">
diff --git a/releng.wtpbuilder/buildtemplates/components/template_sdk/dependency.xml b/releng.wtpbuilder/buildtemplates/components/template_sdk/dependency.xml
index 191c2795ba57bf7aa880d91f0e5fb2358571e3fe..364e5bc2d2ae022b2636ec4caf4755b2fb186710 100644
--- a/releng.wtpbuilder/buildtemplates/components/template_sdk/dependency.xml
+++ b/releng.wtpbuilder/buildtemplates/components/template_sdk/dependency.xml
@@ -35,8 +35,15 @@
target="getAndInstall">
<param
name="groupId"
- value="xml"/>
+ value="dtp"/>
</antcall>
+ <antcall
+ target="getAndInstall">
+ <param
+ name="groupId"
+ value="wtp"/>
+ </antcall>
+
</target>
<target
name="getAndInstall"
diff --git a/releng.wtpbuilder/buildtemplates/components/template_tests/customTargets.xml b/releng.wtpbuilder/buildtemplates/components/template_tests/customTargets.xml
index 68dbdf48856c955ad04f2331ea0dd6856fdd44c0..a5e31b096f05bf5de79a1f77277053bf64413ff2 100644
--- a/releng.wtpbuilder/buildtemplates/components/template_tests/customTargets.xml
+++ b/releng.wtpbuilder/buildtemplates/components/template_tests/customTargets.xml
@@ -81,7 +81,7 @@
name="assemble.@featurename@_tests.feature">
<property
name="archiveName"
- value="@zipprefix@-${buildLabel}.zip"/>
+ value="@zipprefix@-tests-${buildLabel}.zip"/>
<ant
antfile="${assembleScriptName}"
dir="${buildDirectory}"/>
@@ -92,7 +92,7 @@
name="postPackage">
<property
name="archiveName"
- value="@zipprefix@-${buildLabel}.zip"/>
+ value="@zipprefix@-tests-${buildLabel}.zip"/>
<ant
antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
target="unpackUpdateJarsAndCreateZippedPackages">
diff --git a/releng.wtpbuilder/buildtemplates/components/template_tests/dependency.xml b/releng.wtpbuilder/buildtemplates/components/template_tests/dependency.xml
index 8565e7eefb823ec03765a4574f8b8dfec7aff286..1f45cda403cbf20fcf71bc5f8fc38dbedc5dbcc4 100644
--- a/releng.wtpbuilder/buildtemplates/components/template_tests/dependency.xml
+++ b/releng.wtpbuilder/buildtemplates/components/template_tests/dependency.xml
@@ -41,8 +41,15 @@
target="getAndInstall">
<param
name="groupId"
- value="xml"/>
+ value="dtp"/>
</antcall>
+ <antcall
+ target="getAndInstall">
+ <param
+ name="groupId"
+ value="wtp"/>
+ </antcall>
+
</target>
<target
name="getAndInstall"
diff --git a/releng.wtpbuilder/components/jaxws/dependency.xml b/releng.wtpbuilder/components/jaxws/dependency.xml
index f75751ec17d9487c18cdd2b9dff7b037907e8e41..8710ae7e7610b451f5c9238a92ae9cb14c4c9d99 100644
--- a/releng.wtpbuilder/components/jaxws/dependency.xml
+++ b/releng.wtpbuilder/components/jaxws/dependency.xml
@@ -41,6 +41,12 @@
name="groupId"
value="eclipse"/>
</antcall>
+ <antcall
+ target="getAndInstall">
+ <param
+ name="groupId"
+ value="dtp"/>
+ </antcall>
<antcall
target="getAndInstall">
<param
diff --git a/releng.wtpbuilder/components/jaxws_sdk/customTargets.xml b/releng.wtpbuilder/components/jaxws_sdk/customTargets.xml
index 843d52f548399788d1ef4ac6afd1f9cc9de215c0..24712e768b277e1b3710d73f7d0322e89b80bd03 100644
--- a/releng.wtpbuilder/components/jaxws_sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/jaxws_sdk/customTargets.xml
@@ -81,7 +81,7 @@
name="assemble.org.eclipse.jst.ws.cxf_sdk.feature">
<property
name="archiveName"
- value="wtp-incubator-jaxws-${buildLabel}.zip"/>
+ value="wtp-incubator-jaxws-sdk-${buildLabel}.zip"/>
<ant
antfile="${assembleScriptName}"
dir="${buildDirectory}"/>
@@ -92,7 +92,7 @@
name="postPackage">
<property
name="archiveName"
- value="wtp-incubator-jaxws-${buildLabel}.zip"/>
+ value="wtp-incubator-jaxws-sdk-${buildLabel}.zip"/>
<ant
antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
target="unpackUpdateJarsAndCreateZippedPackages">
diff --git a/releng.wtpbuilder/components/jaxws_sdk/dependency.xml b/releng.wtpbuilder/components/jaxws_sdk/dependency.xml
index 269090d7a7860bd4e7e7e7dbe100a921000350ed..364e5bc2d2ae022b2636ec4caf4755b2fb186710 100644
--- a/releng.wtpbuilder/components/jaxws_sdk/dependency.xml
+++ b/releng.wtpbuilder/components/jaxws_sdk/dependency.xml
@@ -31,12 +31,19 @@
name="groupId"
value="eclipse"/>
</antcall>
+ <antcall
+ target="getAndInstall">
+ <param
+ name="groupId"
+ value="dtp"/>
+ </antcall>
<antcall
target="getAndInstall">
<param
name="groupId"
value="wtp"/>
</antcall>
+
</target>
<target
name="getAndInstall"
diff --git a/releng.wtpbuilder/components/jaxws_tests/customTargets.xml b/releng.wtpbuilder/components/jaxws_tests/customTargets.xml
index 5acd32db3df270dabe6ef9615faf4df2e60cf25e..8c01a04db19130a978f3cc3b003158f75b119dbc 100644
--- a/releng.wtpbuilder/components/jaxws_tests/customTargets.xml
+++ b/releng.wtpbuilder/components/jaxws_tests/customTargets.xml
@@ -81,7 +81,7 @@
name="assemble.org.eclipse.jst.ws.cxf_tests.feature">
<property
name="archiveName"
- value="wtp-incubator-jaxws-${buildLabel}.zip"/>
+ value="wtp-incubator-jaxws-tests-${buildLabel}.zip"/>
<ant
antfile="${assembleScriptName}"
dir="${buildDirectory}"/>
@@ -92,7 +92,7 @@
name="postPackage">
<property
name="archiveName"
- value="wtp-incubator-jaxws-${buildLabel}.zip"/>
+ value="wtp-incubator-jaxws-tests-${buildLabel}.zip"/>
<ant
antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
target="unpackUpdateJarsAndCreateZippedPackages">
diff --git a/releng.wtpbuilder/components/jaxws_tests/dependency.xml b/releng.wtpbuilder/components/jaxws_tests/dependency.xml
index ad35c5956c68702d79098672afd0fdbd2e0938d1..1f45cda403cbf20fcf71bc5f8fc38dbedc5dbcc4 100644
--- a/releng.wtpbuilder/components/jaxws_tests/dependency.xml
+++ b/releng.wtpbuilder/components/jaxws_tests/dependency.xml
@@ -37,12 +37,19 @@
name="groupId"
value="eclipseTestFramework"/>
</antcall>
+ <antcall
+ target="getAndInstall">
+ <param
+ name="groupId"
+ value="dtp"/>
+ </antcall>
<antcall
target="getAndInstall">
<param
name="groupId"
value="wtp"/>
</antcall>
+
</target>
<target
name="getAndInstall"
diff --git a/releng.wtpbuilder/distribution/jaxws.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/jaxws.tests/testScripts/test.xml
index c37995027ea4686869a4983736f73093126f738e..700eaf202545040ce0a5a95dcc78bb2443da9a3e 100644
--- a/releng.wtpbuilder/distribution/jaxws.tests/testScripts/test.xml
+++ b/releng.wtpbuilder/distribution/jaxws.tests/testScripts/test.xml
@@ -99,10 +99,10 @@
target="runtests">
<param
name="testPlugin"
- value="${org.eclipse.jst.ws.cfx.tests}" />
+ value="${org.eclipse.jst.cfx.tests}" />
<param
name="report"
- value="org.eclipse.jst.ws.cfx.tests" />
+ value="org.eclipse.jst.cfx.tests" />
</antcall>
</target>