From 07919a43c954a7bf398ee037475b314eceaac068 Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Tue, 13 Jan 2009 04:38:21 +0000
Subject: [PATCH] towards a generator
---
.../buildtemplates/components/template/dependency.xml | 8 +++++++-
.../components/template_sdk/customTargets.xml | 4 ++--
.../components/template_sdk/dependency.xml | 9 ++++++++-
.../components/template_tests/customTargets.xml | 4 ++--
.../components/template_tests/dependency.xml | 9 ++++++++-
releng.wtpbuilder/components/jaxws/dependency.xml | 6 ++++++
releng.wtpbuilder/components/jaxws_sdk/customTargets.xml | 4 ++--
releng.wtpbuilder/components/jaxws_sdk/dependency.xml | 7 +++++++
.../components/jaxws_tests/customTargets.xml | 4 ++--
releng.wtpbuilder/components/jaxws_tests/dependency.xml | 7 +++++++
.../distribution/jaxws.tests/testScripts/test.xml | 4 ++--
11 files changed, 53 insertions(+), 13 deletions(-)
diff --git a/releng.wtpbuilder/buildtemplates/components/template/dependency.xml b/releng.wtpbuilder/buildtemplates/components/template/dependency.xml
index 9ddeb56ee..8710ae7e7 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 4c7bdd953..f512c3161 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 191c2795b..364e5bc2d 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 68dbdf488..a5e31b096 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 8565e7eef..1f45cda40 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 f75751ec1..8710ae7e7 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 843d52f54..24712e768 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 269090d7a..364e5bc2d 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 5acd32db3..8c01a04db 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 ad35c5956..1f45cda40 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 c37995027..700eaf202 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>
--
GitLab