Added EMF Transaction & EMF Validation dependencies.
diff --git a/releng.wtpbuilder/buildtemplates/components/template/dependency.xml b/releng.wtpbuilder/buildtemplates/components/template/dependency.xml
index b4b42a7..842d8a9 100644
--- a/releng.wtpbuilder/buildtemplates/components/template/dependency.xml
+++ b/releng.wtpbuilder/buildtemplates/components/template/dependency.xml
@@ -40,6 +40,11 @@
value="@prereq.emfxsd@"/>
</condition>
<condition
+ property="getprereq.emftransaction">
+ <istrue
+ value="@prereq.emftransaction@"/>
+ </condition>
+ <condition
property="getprereq.emfvalidation">
<istrue
value="@prereq.emfvalidation@"/>
@@ -92,6 +97,8 @@
<antcall
target="prereq.emfxsd"/>
<antcall
+ target="prereq.emftransaction"/>
+ <antcall
target="prereq.emfvalidation"/>
<antcall
target="prereq.gef"/>
@@ -147,6 +154,16 @@
</antcall>
</target>
<target
+ name="prereq.emftransaction"
+ if="getprereq.emftransaction">
+ <antcall
+ target="getAndInstall">
+ <param
+ name="groupId"
+ value="emftransaction"/>
+ </antcall>
+ </target>
+ <target
name="prereq.emfvalidation"
if="getprereq.emfvalidation">
<antcall
diff --git a/releng.wtpbuilder/buildtemplates/components/template_sdk/dependency.xml b/releng.wtpbuilder/buildtemplates/components/template_sdk/dependency.xml
index b4b42a7..842d8a9 100644
--- a/releng.wtpbuilder/buildtemplates/components/template_sdk/dependency.xml
+++ b/releng.wtpbuilder/buildtemplates/components/template_sdk/dependency.xml
@@ -40,6 +40,11 @@
value="@prereq.emfxsd@"/>
</condition>
<condition
+ property="getprereq.emftransaction">
+ <istrue
+ value="@prereq.emftransaction@"/>
+ </condition>
+ <condition
property="getprereq.emfvalidation">
<istrue
value="@prereq.emfvalidation@"/>
@@ -92,6 +97,8 @@
<antcall
target="prereq.emfxsd"/>
<antcall
+ target="prereq.emftransaction"/>
+ <antcall
target="prereq.emfvalidation"/>
<antcall
target="prereq.gef"/>
@@ -147,6 +154,16 @@
</antcall>
</target>
<target
+ name="prereq.emftransaction"
+ if="getprereq.emftransaction">
+ <antcall
+ target="getAndInstall">
+ <param
+ name="groupId"
+ value="emftransaction"/>
+ </antcall>
+ </target>
+ <target
name="prereq.emfvalidation"
if="getprereq.emfvalidation">
<antcall
diff --git a/releng.wtpbuilder/buildtemplates/components/template_tests/dependency.xml b/releng.wtpbuilder/buildtemplates/components/template_tests/dependency.xml
index 1289519..aac3ccb 100644
--- a/releng.wtpbuilder/buildtemplates/components/template_tests/dependency.xml
+++ b/releng.wtpbuilder/buildtemplates/components/template_tests/dependency.xml
@@ -40,6 +40,11 @@
value="@prereq.emfxsd@"/>
</condition>
<condition
+ property="getprereq.emftransaction">
+ <istrue
+ value="@prereq.emftransaction@"/>
+ </condition>
+ <condition
property="getprereq.emfvalidation">
<istrue
value="@prereq.emfvalidation@"/>
@@ -92,6 +97,8 @@
<antcall
target="prereq.emfxsd"/>
<antcall
+ target="prereq.emftransaction"/>
+ <antcall
target="prereq.emfvalidation"/>
<antcall
target="prereq.gef"/>
@@ -151,6 +158,16 @@
</antcall>
</target>
<target
+ name="prereq.emftransaction"
+ if="getprereq.emftransaction">
+ <antcall
+ target="getAndInstall">
+ <param
+ name="groupId"
+ value="emftransaction"/>
+ </antcall>
+ </target>
+ <target
name="prereq.emfvalidation"
if="getprereq.emfvalidation">
<antcall
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.site/templateFiles/index.html.template.php b/releng.wtpbuilder/buildtemplates/distribution/template.site/templateFiles/index.html.template.php
index 9eb7601..8b30ee3 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.site/templateFiles/index.html.template.php
@@ -140,6 +140,7 @@
$prereq_eclipseplatform="@prereq.eclipseplatform@";
$prereq_emf="@prereq.emf@";
$prereq_emfxsd="@prereq.emfxsd@";
+$prereq_emftransaction="@prereq.emftransaction@";
$prereq_emfvalidation="@prereq.emfvalidation@";
$prereq_gef="@prereq.gef@";
$prereq_dtp="@prereq.dtp@";
@@ -465,6 +466,24 @@
?>
<?php
+ if ("true" === $prereq_emftransaction) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+
+ echo $emftransactionName . " " . $emftransactionDescription;
+
+ echo "</td>";
+ echo "<td align=\"right\">";
+
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $emftransactionMirrorPrefixuri, $emftransactionURL, $emftransactionFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $emftransactionBuildHome . "\">equivalent</a></td>";
+
+ echo " </tr>";
+ }
+ ?>
+
+ <?php
if ("true" === $prereq_emfvalidation) {
echo "<tr valign=\"top\">";
echo "<td width=\"10%\"></td>";
@@ -624,6 +643,20 @@
?>
<?php
+ if ("true" === $prereq_emftransaction) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+ echo $emftransactionsourceName . " " . $emftransactionsourceDescription;
+ echo "</td> ";
+ echo "<td align=\"right\">";
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $emftransactionsourceMirrorPrefixuri, $emftransactionsourceURL, $emftransactionsourceFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $emftransactionsourceBuildHome . "\">equivalent</a></td>";
+ echo "</tr>";
+ }
+ ?>
+
+ <?php
if ("true" === $prereq_emfvalidation) {
echo "<tr valign=\"top\">";
echo "<td width=\"10%\"></td>";
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.tests/testdependency.xml b/releng.wtpbuilder/buildtemplates/distribution/template.tests/testdependency.xml
index aadc3e0..a51c2cb 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.tests/testdependency.xml
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.tests/testdependency.xml
@@ -49,6 +49,11 @@
value="@prereq.emfxsd@"/>
</condition>
<condition
+ property="getprereq.emftransaction">
+ <istrue
+ value="@prereq.emftransaction@"/>
+ </condition>
+ <condition
property="getprereq.emfvalidation">
<istrue
value="@prereq.emfvalidation@"/>
@@ -97,6 +102,8 @@
<antcall
target="prereq.emfxsd"/>
<antcall
+ target="prereq.emftransaction"/>
+ <antcall
target="prereq.emfvalidation"/>
<antcall
target="prereq.gef"/>
@@ -164,6 +171,16 @@
</antcall>
</target>
<target
+ name="prereq.emftransaction"
+ if="getprereq.emftransaction">
+ <antcall
+ target="getAndInstallDropins">
+ <param
+ name="groupId"
+ value="emftransaction"/>
+ </antcall>
+ </target>
+ <target
name="prereq.emfvalidation"
if="getprereq.emfvalidation">
<antcall
diff --git a/releng.wtpbuilder/components/dali-sdk/tobeInstalled.properties b/releng.wtpbuilder/components/dali-sdk/tobeInstalled.properties
index c2807c4..0043263 100644
--- a/releng.wtpbuilder/components/dali-sdk/tobeInstalled.properties
+++ b/releng.wtpbuilder/components/dali-sdk/tobeInstalled.properties
@@ -4,7 +4,8 @@
#getprereq.emf=true
#getprereq.emfxsd=true
getprereq.emfandxsd=true
-#getprereq.emfvalidation=false
+getprereq.emftransaction=true
+getprereq.emfvalidation=true
getprereq.gef=true
getprereq.dtp=true
#getprereq.wst=false
diff --git a/releng.wtpbuilder/components/dali.tests/tobeInstalled.properties b/releng.wtpbuilder/components/dali.tests/tobeInstalled.properties
index 96d5ab8..454e983 100644
--- a/releng.wtpbuilder/components/dali.tests/tobeInstalled.properties
+++ b/releng.wtpbuilder/components/dali.tests/tobeInstalled.properties
@@ -4,7 +4,8 @@
#getprereq.emf=true
#getprereq.emfxsd=true
getprereq.emfandxsd=true
-#getprereq.emfvalidation=false
+getprereq.emftransaction=true
+getprereq.emfvalidation=true
getprereq.gef=true
getprereq.dtp=true
#getprereq.wst=false
diff --git a/releng.wtpbuilder/components/dali4x-sdk/tobeInstalled.properties b/releng.wtpbuilder/components/dali4x-sdk/tobeInstalled.properties
index 6055e79..df1a437 100644
--- a/releng.wtpbuilder/components/dali4x-sdk/tobeInstalled.properties
+++ b/releng.wtpbuilder/components/dali4x-sdk/tobeInstalled.properties
@@ -2,7 +2,8 @@
#getprereq.eclipseplatform=false
#getprereq.eclipsetestframework=false
getprereq.emfandxsd=true
-#getprereq.emfvalidation=false
+getprereq.emftransaction=true
+getprereq.emfvalidation=true
getprereq.gef=true
getprereq.dtp=true
#getprereq.wst=false
diff --git a/releng.wtpbuilder/components/dali4x.tests/tobeInstalled.properties b/releng.wtpbuilder/components/dali4x.tests/tobeInstalled.properties
index 61d135b..8b3f9cd 100644
--- a/releng.wtpbuilder/components/dali4x.tests/tobeInstalled.properties
+++ b/releng.wtpbuilder/components/dali4x.tests/tobeInstalled.properties
@@ -2,7 +2,8 @@
#getprereq.eclipseplatform=false
getprereq.eclipsetestframework=true
getprereq.emfandxsd=true
-#getprereq.emfvalidation=false
+getprereq.emftransaction=true
+getprereq.emfvalidation=true
getprereq.gef=true
getprereq.dtp=true
#getprereq.wst=false
diff --git a/releng.wtpbuilder/distribution/wtp.site/templateFiles/buildvariables.php b/releng.wtpbuilder/distribution/wtp.site/templateFiles/buildvariables.php
index b196f21..7a3fa04 100644
--- a/releng.wtpbuilder/distribution/wtp.site/templateFiles/buildvariables.php
+++ b/releng.wtpbuilder/distribution/wtp.site/templateFiles/buildvariables.php
@@ -174,6 +174,7 @@
$prereq_emf="false";
$prereq_emfxsd="false";
$prereq_emfandxsd="true";
+$prereq_emftransaction="@prereq.emftransaction@";
$prereq_emfvalidation="@prereq.emfvalidation@";
$prereq_gef="true";
$prereq_dtp="true";
diff --git a/releng.wtpbuilder/distribution/wtp.site/templateFiles/displayPrereqs.php b/releng.wtpbuilder/distribution/wtp.site/templateFiles/displayPrereqs.php
index 4c2f5de..0588dec 100644
--- a/releng.wtpbuilder/distribution/wtp.site/templateFiles/displayPrereqs.php
+++ b/releng.wtpbuilder/distribution/wtp.site/templateFiles/displayPrereqs.php
@@ -133,6 +133,24 @@
?>
<?php
+ if ("true" === $prereq_emftransaction) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+
+ echo $emftransactionName . " " . $emftransactionDescription;
+
+ echo "</td>";
+ echo "<td align=\"right\">";
+
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $emftransactionMirrorPrefixuri, $emftransactionURL, $emftransactionFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $emftransactionBuildHome . "\">equivalent</a></td>";
+
+ echo " </tr>";
+ }
+ ?>
+
+ <?php
if ("true" === $prereq_emfvalidation) {
echo "<tr valign=\"top\">";
echo "<td width=\"10%\"></td>";
@@ -309,6 +327,20 @@
?>
<?php
+ if ("true" === $prereq_emftransaction) {
+ echo "<tr valign=\"top\">";
+ echo "<td width=\"10%\"></td>";
+ echo "<td>";
+ echo $emftransactionsourceName . " " . $emftransactionsourceDescription;
+ echo "</td> ";
+ echo "<td align=\"right\">";
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $emftransactionsourceMirrorPrefixuri, $emftransactionsourceURL, $emftransactionsourceFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $emftransactionsourceBuildHome . "\">equivalent</a></td>";
+ echo "</tr>";
+ }
+ ?>
+
+ <?php
if ("true" === $prereq_emfvalidation) {
echo "<tr valign=\"top\">";
echo "<td width=\"10%\"></td>";
diff --git a/releng.wtpbuilder/scripts/dependency/dependency.xml b/releng.wtpbuilder/scripts/dependency/dependency.xml
index b6960a8..f0032a2 100644
--- a/releng.wtpbuilder/scripts/dependency/dependency.xml
+++ b/releng.wtpbuilder/scripts/dependency/dependency.xml
@@ -148,6 +148,15 @@
</antcall>
</target>
<target
+ name="prereq.emftransaction"
+ if="getprereq.emftransaction">
+ <antcall target="getAndInstallDropins">
+ <param
+ name="groupId"
+ value="emftransaction"/>
+ </antcall>
+ </target>
+ <target
name="prereq.emfvalidation"
if="getprereq.emfvalidation">
<antcall target="getAndInstallDropins">