From e0a2e79e75dc0ed688a4218d1e9e0f046588c598 Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Sun, 27 May 2007 05:58:30 +0000
Subject: [PATCH] small improvements

---
 .../build-home/features-callisto-jem.xml          |  6 +++---
 .../build-home/features-callisto-jpa.xml          | 15 +++------------
 .../build-home/features-callisto-jsf.xml          |  6 +++---
 .../build-home/features-callisto-wtp.xml          |  6 +++---
 .../build-home/features-europa-wtp.xml            |  6 +++---
 .../build-home/updateMirrorProject.xml            |  2 +-
 6 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-jem.xml b/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-jem.xml
index 010268950..a82bf1833 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-jem.xml
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-jem.xml
@@ -5,9 +5,9 @@
     <target name="update">
 
         <property
-            name="update.site"
-            value="file://${user.home}/downloads/webtools/downloads/drops/R1.5/R-1.5.4-200705021353/update.site/" />
-        <echo message="   pulling update jars from ${update.site}" />
+            name="from.update.site"
+            value="file://${user.home}/downloads/webtools/downloads/drops/R1.5/R-1.5.4-200705021353/updateSite/" />
+        <echo message="   pulling update jars from ${from.update.site}" />
 
 
 
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-jpa.xml b/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-jpa.xml
index 0a45e19d8..ca9a139b7 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-jpa.xml
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-jpa.xml
@@ -5,9 +5,9 @@
     <target name="update">
 
         <property
-            name="update.site"
-            value="file:///${user.home}/downloads/webtools/jpa/updates/" />
-        <echo message="   pulling update jars from ${update.site}" />
+            name="from.update.site"
+            value="file://${user.home}/downloads/webtools/jpa/updates" />
+        <echo message="   pulling update jars from ${from.update.site}" />
 
 
         <ant antfile="updateMirrorProject.xml">
@@ -20,14 +20,5 @@
 
         </ant>
 
-
-        <!--
-            <ant antfile="updateMirrorProject.xml">
-            <property name="featureId"
-            value="org.eclipse.dali.tests" />
-            <property name="version"
-            value="0.5.0.v200606200003" />
-            </ant>
-        -->
     </target>
 </project>
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-jsf.xml b/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-jsf.xml
index f31d29316..8dd06ce82 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-jsf.xml
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-jsf.xml
@@ -5,9 +5,9 @@
     <target name="update">
 
         <property
-            name="update.site"
-            value="file://${user.home}/downloads/webtools/downloads/drops/R1.5/R-1.5.3-200702082048/update.site/" />
-        <echo message="   pulling update jars from ${update.site}" />
+            name="from.update.site"
+            value="file://${user.home}/downloads/webtools/downloads/drops/R1.5/R-1.5.3-200702082048/updateSite/" />
+        <echo message="   pulling update jars from ${from.update.site}" />
 
 
 
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-wtp.xml b/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-wtp.xml
index 35bafbb8a..4d76f43c0 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-wtp.xml
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-wtp.xml
@@ -5,9 +5,9 @@
     <target name="update">
 
         <property
-            name="update.site"
-            value="file://${user.home}/downloads/webtools/downloads/drops/R1.5/R-1.5.4-200705021353/update.site/" />
-        <echo message="   pulling update jars from ${update.site}" />
+            name="from.update.site"
+            value="file://${user.home}/downloads/webtools/downloads/drops/R1.5/R-1.5.4-200705021353/updateSite/" />
+        <echo message="   pulling update jars from ${from.update.site}" />
 
 
 
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/features-europa-wtp.xml b/org.eclipse.wtp.releng.webupdatesite/build-home/features-europa-wtp.xml
index 91667bb5f..bcc95645c 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/features-europa-wtp.xml
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/features-europa-wtp.xml
@@ -7,9 +7,9 @@
             message="-------- Project: WTP Responsible: david_williams" />
         <!-- intentionally no site.xml in this particular site -->
         <property
-            name="update.site"
-            value="file://${user.home}/downloads/webtools/committers/drops/R2.0/S-2.0RC1-200705250432/update.site" />
-        <echo message="   pulling update jars from ${update.site}" />
+            name="from.update.site"
+            value="file://${user.home}/downloads/webtools/committers/drops/R2.0/S-2.0RC1-200705250432/updateSite" />
+        <echo message="   pulling update jars from ${from.update.site}" />
 
 
         <ant antfile="updateMirrorProject.xml">
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/updateMirrorProject.xml b/org.eclipse.wtp.releng.webupdatesite/build-home/updateMirrorProject.xml
index fb4d6499e..9da065bdf 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/updateMirrorProject.xml
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/updateMirrorProject.xml
@@ -46,7 +46,7 @@
             <arg value="-version" />
             <arg value="${version}" />
             <arg value="-from" />
-            <arg value="${update.site}" />
+            <arg value="${from.update.site}" />
             <arg value="-to" />
             <arg value="${update.site}" />
             <arg value="-ignoreMissingPlugins" />
-- 
GitLab