ensure latest
diff --git a/releng.wtpbuilder/buildtemplates/build.xml b/releng.wtpbuilder/buildtemplates/build.xml
index 0e4b177..3d3930c 100644
--- a/releng.wtpbuilder/buildtemplates/build.xml
+++ b/releng.wtpbuilder/buildtemplates/build.xml
@@ -21,7 +21,7 @@
-->
<property
name="componentpropertyfile"
- value="xquery.properties"/>
+ value="servadapt.properties"/>
<property
file="${componentpropertyfile}"/>
<!--
diff --git a/releng.wtpbuilder/components/servadapt/dependency.xml b/releng.wtpbuilder/components/servadapt/dependency.xml
index 209bdfe..e16db64 100644
--- a/releng.wtpbuilder/components/servadapt/dependency.xml
+++ b/releng.wtpbuilder/components/servadapt/dependency.xml
@@ -70,6 +70,11 @@
<istrue
value="false"/>
</condition>
+ <condition
+ property="getprereq.dltk">
+ <istrue
+ value="false"/>
+ </condition>
<target
name="get">
<!--
@@ -99,7 +104,9 @@
target="prereq.jst"/>
<antcall
target="prereq.wtp"/>
- </target>
+ <antcall
+ target="prereq.dltk"/>
+ </target>
<target
name="prereq.eclipse"
if="getprereq.eclipse">
@@ -200,6 +207,16 @@
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">
diff --git a/releng.wtpbuilder/components/servadapt_sdk/dependency.xml b/releng.wtpbuilder/components/servadapt_sdk/dependency.xml
index d514112..2651f69 100644
--- a/releng.wtpbuilder/components/servadapt_sdk/dependency.xml
+++ b/releng.wtpbuilder/components/servadapt_sdk/dependency.xml
@@ -70,7 +70,11 @@
<istrue
value="false"/>
</condition>
-
+ <condition
+ property="getprereq.dltk">
+ <istrue
+ value="false"/>
+ </condition>
<target
name="get">
<!--
@@ -100,6 +104,8 @@
target="prereq.jst"/>
<antcall
target="prereq.wtp"/>
+ <antcall
+ target="prereq.dltk"/>
</target>
<target
name="prereq.eclipse"
@@ -201,6 +207,16 @@
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">
diff --git a/releng.wtpbuilder/components/servadapt_tests/dependency.xml b/releng.wtpbuilder/components/servadapt_tests/dependency.xml
index 7ecc30c..c4d1a6b 100644
--- a/releng.wtpbuilder/components/servadapt_tests/dependency.xml
+++ b/releng.wtpbuilder/components/servadapt_tests/dependency.xml
@@ -70,6 +70,11 @@
<istrue
value="false"/>
</condition>
+ <condition
+ property="getprereq.dltk">
+ <istrue
+ value="false"/>
+ </condition>
<target
name="get">
<!--
@@ -206,6 +211,16 @@
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">
diff --git a/releng.wtpbuilder/distribution/servadapt.site/publish.xml b/releng.wtpbuilder/distribution/servadapt.site/publish.xml
index 71afb65..3ef8e14 100644
--- a/releng.wtpbuilder/distribution/servadapt.site/publish.xml
+++ b/releng.wtpbuilder/distribution/servadapt.site/publish.xml
@@ -788,11 +788,7 @@
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@"
@@ -817,5 +813,31 @@
file="${resultingIndex}"
token="@dtpDescription@"
value="${dtp.description}"/>
+
+ <replace
+ file="${resultingIndex}"
+ token="@dltkFile@"
+ value="${dltk.file}"/>
+ <replace
+ file="${resultingIndex}"
+ token="@dltkURL@"
+ value="${dltk.url}/${dltk.file}"/>
+ <replace
+ file="${resultingIndex}"
+ token="@dltkBuildHome@"
+ value="${dltk.build.home}"/>
+ <replace
+ file="${resultingIndex}"
+ token="@dltk.mirror.prefixuri@"
+ value="${dltk.mirror.prefixuri}"/>
+ <replace
+ file="${resultingIndex}"
+ token="@dltkName@"
+ value="${dltk.name}"/>
+ <replace
+ file="${resultingIndex}"
+ token="@dltkDescription@"
+ value="${dltk.description}"/>
+
</target>
</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/servadapt.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/servadapt.site/templateFiles/index.html.template.php
index d99dbb4..38e567b 100644
--- a/releng.wtpbuilder/distribution/servadapt.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/distribution/servadapt.site/templateFiles/index.html.template.php
@@ -124,6 +124,12 @@
$dtpName="@dtpName@";
$dtpDescription="@dtpDescription@";
+$dltkURL="@dltkURL@";
+$dltkFile="@dltkFile@";
+$dltkMirrorPrefixuri="@dltk.mirror.prefixuri@";
+$dltkBuildHome="@dltkBuildHome@";
+$dltkName="@dltkName@";
+$dltkDescription="@dltkDescription@";
$eclipserelengFile="@eclipserelengFile@";
$eclipserelengURL="@eclipserelengURL@";
@@ -143,6 +149,7 @@
$prereq_wst="false";
$prereq_jst="false";
$prereq_wtp="false";
+$prereq_dltk="false";
include("miscUtil.php");
@@ -548,6 +555,23 @@
echo " </tr>";
}
?>
+ <?php
+ if ("true" === $prereq_dltk) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+
+ echo $dltkName . " " . $dltkDescription;
+
+ echo "</td>";
+ echo "<td align=\"right\">";
+
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $dltkMirrorPrefixuri, $dltkURL, $dltkFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $dltkBuildHome . "\">equivalent</a></td>";
+
+ echo " </tr>";
+ }
+ ?>
<tr valign="middle">
<td width="10%"></td>
<td colspan="2">
diff --git a/releng.wtpbuilder/distribution/servadapt.tests/testdependency.xml b/releng.wtpbuilder/distribution/servadapt.tests/testdependency.xml
index ebc4630..13be6f4 100644
--- a/releng.wtpbuilder/distribution/servadapt.tests/testdependency.xml
+++ b/releng.wtpbuilder/distribution/servadapt.tests/testdependency.xml
@@ -78,7 +78,12 @@
<istrue
value="false"/>
</condition>
- <target
+ <condition
+ property="getprereq.dltk">
+ <istrue
+ value="false"/>
+ </condition>
+ <target
name="get">
<!--
read in this properties, just so we can make sure our