diff --git a/releng.wtpbuilder/distribution/dali.site/publish.xml b/releng.wtpbuilder/distribution/dali.site/publish.xml index 58ba88c4bea94af3c0bea12d9b76802d76e8da68..8dd9055c4543b339992b16dec9fbb1e4a4932f32 100644 --- a/releng.wtpbuilder/distribution/dali.site/publish.xml +++ b/releng.wtpbuilder/distribution/dali.site/publish.xml @@ -448,8 +448,6 @@ file="${resultingIndex}" token="@emf.mirror.prefixuri@" value="${emf.mirror.prefixuri}" /> - -<echo message="############ jst.file = ${jst.file}"/> <replace file="${resultingIndex}" token="@jstFile@" diff --git a/releng.wtpbuilder/distribution/dali.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/dali.site/templateFiles/index.html.template.php index 84ceef76be4b380fa957fdbc6f99c7ea28bd8861..071ef5b7fb6181098396669cb08417062da2de59 100644 --- a/releng.wtpbuilder/distribution/dali.site/templateFiles/index.html.template.php +++ b/releng.wtpbuilder/distribution/dali.site/templateFiles/index.html.template.php @@ -26,10 +26,10 @@ $eclipseBuildHome="@eclipseBuildHome@"; $testURL="@testURL@"; $testFile="@testFile@"; -$wstURL="@wstURL@"; -$wstFile="@wstFile@"; -$wstMirrorPrefixuri="@wst.mirror.prefixuri@"; -$wstBuildHome="@wstBuildHome@"; +$jstURL="@jstURL@"; +$jstFile="@jstFile@"; +$jstMirrorPrefixuri="@jst.mirror.prefixuri@"; +$jstBuildHome="@jstBuildHome@"; $gefURL="@gefURL@"; @@ -227,19 +227,17 @@ if (!stristr($serverName, "eclipse.org") && !stristr($serverName,"you.are.at.ecl echo " or <a href=\"" . $eclipseBuildURL . "\">appropriate platform</a>"; echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>"; ?> - </tr> <tr valign="top"> <td width="10%"></td> - <td>Webtools Platform (at least WST)</td> + <td>J2EE Standard Tools (JST)</td> <td align="right"><?php // debug - // echo "debug: full path: " . $eclipseFSpathPrefix . "/" . $wstMirrorPrefixuri . "/" . $wstFile; - echo getPrereqReferenceOrName($eclipseMirrorScript, $wstMirrorPrefixuri, $wstURL, $wstFile, $eclipseFSpathPrefix); - echo " or <a href=\"" . $wstBuildHome . "\">equivalent</a></td>"; + // echo "debug: full path: " . $eclipseFSpathPrefix . "/" . $jstMirrorPrefixuri . "/" . $jstFile; + echo getPrereqReferenceOrName($eclipseMirrorScript, $jstMirrorPrefixuri, $jstURL, $jstFile, $eclipseFSpathPrefix); + echo " or <a href=\"" . $jstBuildHome . "\">equivalent</a></td>"; ?> - </tr> <tr valign="top"> @@ -249,7 +247,6 @@ if (!stristr($serverName, "eclipse.org") && !stristr($serverName,"you.are.at.ecl echo getPrereqReferenceOrName($eclipseMirrorScript, $emfMirrorPrefixuri, $emfURL, $emfFile, $eclipseFSpathPrefix); echo " or <a href=\"" . $emfBuildHome . "\">equivalent</a></td>"; ?> - </tr> <tr valign="top"> @@ -259,7 +256,15 @@ if (!stristr($serverName, "eclipse.org") && !stristr($serverName,"you.are.at.ecl echo getPrereqReferenceOrName($eclipseMirrorScript, $gefMirrorPrefixuri, $gefURL, $gefFile, $eclipseFSpathPrefix); echo " or <a href=\"" . $gefBuildHome . "\">equivalent</a></td>"; ?> - + </tr> + + <tr valign="top"> + <td width="10%"></td> + <td>Data Tools Platform (DTP)</td> + <td align="right"><?php + echo getPrereqReferenceOrName($eclipseMirrorScript, $dtpMirrorPrefixuri, $dtpURL, $dtpFile, $eclipseFSpathPrefix); + echo " or <a href=\"" . $dtpBuildHome . "\">equivalent</a></td>"; + ?> </tr> <tr valign="middle">