diff --git a/org.eclipse.wtp.releng.webupdatesite/.classpath b/org.eclipse.wtp.releng.webupdatesite/.classpath
index 0e80cf2..7cec603 100644
--- a/org.eclipse.wtp.releng.webupdatesite/.classpath
+++ b/org.eclipse.wtp.releng.webupdatesite/.classpath
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="var" path="JRE_LIB"/>
-	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v5.0"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.eclipse.wtp.releng.webupdatesite/.project b/org.eclipse.wtp.releng.webupdatesite/.project
index 91fbde6..95088cf 100644
--- a/org.eclipse.wtp.releng.webupdatesite/.project
+++ b/org.eclipse.wtp.releng.webupdatesite/.project
@@ -1,24 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.wtp.releng.webupdatesite</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-	</natures>
+    <name>org.eclipse.wtp.releng.webupdatesite</name>
+    <comment></comment>
+    <projects></projects>
+    <buildSpec>
+        <buildCommand>
+            <name>org.eclipse.wst.validation.validationbuilder</name>
+            <arguments></arguments>
+        </buildCommand>
+    </buildSpec>
+    <natures>
+        <nature>
+            org.eclipse.wst.common.project.facet.core.nature
+        </nature>
+    </natures>
 </projectDescription>
diff --git a/org.eclipse.wtp.releng.webupdatesite/.runtime b/org.eclipse.wtp.releng.webupdatesite/.runtime
deleted file mode 100644
index 4730d23..0000000
--- a/org.eclipse.wtp.releng.webupdatesite/.runtime
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<runtime runtime-id="Apache Tomcat v5.0" servers="false"/>
diff --git a/org.eclipse.wtp.releng.webupdatesite/WebContent/siteCallisto.xml b/org.eclipse.wtp.releng.webupdatesite/WebContent/siteCallisto.xml
index 1999000..f70eb64 100644
--- a/org.eclipse.wtp.releng.webupdatesite/WebContent/siteCallisto.xml
+++ b/org.eclipse.wtp.releng.webupdatesite/WebContent/siteCallisto.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site
-    pack200="true"
     digestURL="http://download.eclipse.org/webtools/testUpdates/"
-        mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/webtools/testUpdates/site.xml&amp;format=xml">
-    
+    pack200="true"
+    mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/webtools/testUpdates/site.xml&amp;format=xml">
     <description
-        url="http://download.eclipse.org/webtools/declaredUpdates/index.html">
+        url="http://download.eclipse.org/webtools/testUpdates/index.html">
         The update site contains the features of the of Eclipse Web
         Tools Project (WTP)
     </description>
@@ -13,312 +12,96 @@
 
 
     <feature
-        url="features/org.eclipse.wst_1.5.3.v200701251935-X3Tn7ug44nfs8AE.jar"
         id="org.eclipse.wst"
-        version="1.5.3.v200701251935-X3Tn7ug44nfs8AE">
+        url="features/org.eclipse.wst_1.5.4.v200704200440-X3TmzmK-W-vP-Fs.jar"
+        version="1.5.4.v200704200440-X3TmzmK-W-vP-Fs">
         <category name="Web Tools Platform (WTP)" />
     </feature>
 
     <feature
-        url="features/org.eclipse.jst_1.5.3.v200701251935-kW-NqztJbMj98Vy.jar"
         id="org.eclipse.jst"
-        version="1.5.3.v200701251935-kW-NqztJbMj98Vy">
+        url="features/org.eclipse.jst_1.5.4.v200704150219-kW-NuyxHh4-w7-n.jar"
+        version="1.5.4.v200704150219-kW-NuyxHh4-w7-n">
         <category name="Web Tools Platform (WTP)" />
     </feature>
 
     <feature
-        url="features/org.eclipse.wst.sdk_1.5.3.v200701251935-O2U9h5tjqRzyXdC.jar"
         id="org.eclipse.wst.sdk"
-        version="1.5.3.v200701251935-O2U9h5tjqRzyXdC">
+        url="features/org.eclipse.wst.sdk_1.5.4.v200704200440-O2U9jyC-ZDAHEgs.jar"
+        version="1.5.4.v200704200440-O2U9jyC-ZDAHEgs">
         <category name="Web Tools Platform (WTP)" />
     </feature>
 
     <feature
-        url="features/org.eclipse.jst.sdk_1.5.3.v200701251935-dnUTzpmRSVGy2Rb.jar"
         id="org.eclipse.jst.sdk"
-        version="1.5.3.v200701251935-dnUTzpmRSVGy2Rb">
+        url="features/org.eclipse.jst.sdk_1.5.4.v200704150219-dnUU6nyMbgExb_A.jar"
+        version="1.5.4.v200704150219-dnUU6nyMbgExb_A">
         <category name="Web Tools Platform (WTP)" />
     </feature>
 
     <feature
-        url="features/org.eclipse.jst.web_core.feature.patch_1.5.2.v200611141330--08422833363552.jar"
-        id="org.eclipse.jst.web_core.feature.patch"
-        version="1.5.2.v200611141330--08422833363552">
-        <category name="Web Tools Platform (WTP) Patches" />
-    </feature>
-
-
-    <feature
-        url="features/org.eclipse.wst_1.5.1.v200609111500-X3TmmF3AeboB5EW.jar"
-        id="org.eclipse.wst"
-        version="1.5.1.v200609111500-X3TmmF3AeboB5EW">
-        <category name="Web Tools Platform (WTP)" />
-    </feature>
-
-    <feature
-        url="features/org.eclipse.jst_1.5.1.v200609111510-kW-O_zxPud7GuJG.jar"
-        id="org.eclipse.jst"
-        version="1.5.1.v200609111510-kW-O_zxPud7GuJG">
-        <category name="Web Tools Platform (WTP)" />
-    </feature>
-
-    <feature
-        url="features/org.eclipse.wst.sdk_1.5.1.v200609111510-53LhU5L4LmuQyht.jar"
-        id="org.eclipse.wst.sdk"
-        version="1.5.1.v200609111510-53LhU5L4LmuQyht">
-        <category name="Web Tools Platform (WTP)" />
-    </feature>
-
-    <feature
-        url="features/org.eclipse.jst.sdk_1.5.1.v200609111510-dnUVLseYZElPh32.jar"
-        id="org.eclipse.jst.sdk"
-        version="1.5.1.v200609111510-dnUVLseYZElPh32">
-        <category name="Web Tools Platform (WTP)" />
-    </feature>
-
-    <feature
-        url="features/org.apache.commons_logging.feature_1.0.4.v200606152055--0842282_233879.jar"
         id="org.apache.commons_logging.feature"
+        url="features/org.apache.commons_logging.feature_1.0.4.v200606152055--0842282_233879.jar"
         version="1.0.4.v200606152055--0842282_233879">
         <category name="Enabling Features" />
     </feature>
 
     <feature
-        url="features/org.apache.jakarta_log4j.feature_1.2.8.v200605300321--0842282939426_.jar"
         id="org.apache.jakarta_log4j.feature"
+        url="features/org.apache.jakarta_log4j.feature_1.2.8.v200605300321--0842282939426_.jar"
         version="1.2.8.v200605300321--0842282939426_">
         <category name="Enabling Features" />
     </feature>
 
     <feature
-        url="features/org.apache.xerces.feature_2.8.0.v200605151647--08422828353873.jar"
         id="org.apache.xerces.feature"
+        url="features/org.apache.xerces.feature_2.8.0.v200605151647--08422828353873.jar"
         version="2.8.0.v200605151647--08422828353873">
         <category name="Enabling Features" />
     </feature>
 
-    <feature
-        url="features/org.eclipse.wst_1.5.0.v200606092300-U4T922yjOWsGK5Y.jar"
-        id="org.eclipse.wst"
-        version="1.5.0.v200606092300-U4T922yjOWsGK5Y">
-        <category name="Web Tools Platform (WTP)" />
-    </feature>
+
 
     <feature
-        url="features/org.eclipse.jst_1.5.0.v200606092300-kW-O_ysCRLJsxJt.jar"
-        id="org.eclipse.jst"
-        version="1.5.0.v200606092300-kW-O_ysCRLJsxJt">
-        <category name="Web Tools Platform (WTP)" />
-    </feature>
-
-    <feature
-        url="features/org.eclipse.wst.sdk_1.5.0.v200606092300-24KsYkftnYYU8Om.jar"
-        id="org.eclipse.wst.sdk"
-        version="1.5.0.v200606092300-24KsYkftnYYU8Om">
-        <category name="Web Tools Platform (WTP)" />
-    </feature>
-
-    <feature
-        url="features/org.eclipse.jst.sdk_1.5.0.v200606092300-dnUVLo09wQhiy4R.jar"
-        id="org.eclipse.jst.sdk"
-        version="1.5.0.v200606092300-dnUVLo09wQhiy4R">
-        <category name="Web Tools Platform (WTP)" />
-    </feature>
-
-    <feature
-        url="features/org.apache.commons_logging.feature_1.0.4.v200606152055--08422828353873.jar"
-        id="org.apache.commons_logging.feature"
-        version="1.0.4.v200606152055--08422828353873">
-        <category name="Enabling Features" />
-    </feature>
-
-    <feature
-        url="features/org.apache.jakarta_log4j.feature_1.2.8.v200605300321--08422828353873.jar"
-        id="org.apache.jakarta_log4j.feature"
-        version="1.2.8.v200605300321--08422828353873">
-        <category name="Enabling Features" />
-    </feature>
-
-    <feature
-        url="features/org.eclipse.jst.jsf.feature_0.5.1.v20060829-OJnpNuKYI7O7SAU.jar"
         id="org.eclipse.jst.jsf.feature"
+        url="features/org.eclipse.jst.jsf.feature_0.5.1.v20060829-OJnpNuKYI7O7SAU.jar"
         version="0.5.1.v20060829-OJnpNuKYI7O7SAU">
         <category name="Java Server Faces (JSF) -- Preview" />
     </feature>
 
+
     <feature
-        url="features/org.eclipse.jst.jsf_sdk.feature_0.5.1.v20060829-fX45f_dlc_3ccM8.jar"
         id="org.eclipse.jst.jsf_sdk.feature"
+        url="features/org.eclipse.jst.jsf_sdk.feature_0.5.1.v20060829-fX45f_dlc_3ccM8.jar"
         version="0.5.1.v20060829-fX45f_dlc_3ccM8">
         <category name="Java Server Faces (JSF) -- Preview" />
     </feature>
 
     <feature
-        url="features/org.eclipse.jst.jsf.feature_0.5.0.v20060622-OJnpNtoWR7O7OAA.jar"
-        id="org.eclipse.jst.jsf.feature"
-        version="0.5.0.v20060622-OJnpNtoWR7O7OAA">
-        <category name="Java Server Faces (JSF) -- Preview" />
-    </feature>
-
-    <feature
-        url="features/org.eclipse.jst.jsf_sdk.feature_0.5.0.v20060622-fX45f__je9W9WII.jar"
-        id="org.eclipse.jst.jsf_sdk.feature"
-        version="0.5.0.v20060622-fX45f__je9W9WII">
-        <category name="Java Server Faces (JSF) -- Preview" />
-    </feature>
-
-    <feature
-        url="features/org.eclipse.dali_0.5.0.v200606200001--87cMN7N7cPMMMa.jar"
         id="org.eclipse.dali"
-        version="0.5.0.v200606200001--87cMN7N7cPMMMa">
+        url="features/org.eclipse.dali_0.5.0.v200606270000--87cMN7N7crMMMR.jar"
+        version="0.5.0.v200606270000--87cMN7N7crMMMR">
         <category name="EJB 3.0 Java Persistence (Dali JPA) -- Preview" />
     </feature>
 
+
     <feature
-        url="features/org.eclipse.wst_1.0.0.jar"
-        id="org.eclipse.wst"
-        version="1.0.0">
-        <category name="Web Tools Platform (WTP) 1.0.x maintenance" />
+        id="org.eclipse.jem"
+        patch="false"
+        url="features/org.eclipse.jem_1.2.4.v200704181020--6zXJK0L0SE3a95.jar"
+        version="1.2.4.v200704181020--6zXJK0L0SE3a95">
+        <category name="Models and Model Development" />
     </feature>
-
     <feature
-        url="features/org.eclipse.jst_1.0.0.jar"
-        id="org.eclipse.jst"
-        version="1.0.0">
-        <category name="Web Tools Platform (WTP) 1.0.x maintenance" />
-    </feature>
-
-    <feature
-        url="features/org.eclipse.wst.sdk_1.0.0.jar"
-        id="org.eclipse.wst.sdk"
-        version="1.0.0">
-        <category name="Web Tools Platform (WTP) 1.0.x maintenance" />
-    </feature>
-
-    <feature
-        url="features/org.eclipse.jst.sdk_1.0.0.jar"
-        id="org.eclipse.jst.sdk"
-        version="1.0.0">
-        <category name="Web Tools Platform (WTP) 1.0.x maintenance" />
-    </feature>
-
-    <feature
-        url="features/org.eclipse.wst_1.0.1.v200602130105.jar"
-        id="org.eclipse.wst"
-        version="1.0.1.v200602130105">
-        <category name="Web Tools Platform (WTP) 1.0.x maintenance" />
-    </feature>
-
-    <feature
-        url="features/org.eclipse.jst_1.0.1.v200602130105.jar"
-        id="org.eclipse.jst"
-        version="1.0.1.v200602130105">
-        <category name="Web Tools Platform (WTP) 1.0.x maintenance" />
-    </feature>
-
-    <feature
-        url="features/org.eclipse.wst.sdk_1.0.1.v200602130105.jar"
-        id="org.eclipse.wst.sdk"
-        version="1.0.1.v200602130105">
-        <category name="Web Tools Platform (WTP) 1.0.x maintenance" />
-    </feature>
-
-    <feature
-        url="features/org.eclipse.jst.sdk_1.0.1.v200602130105.jar"
-        id="org.eclipse.jst.sdk"
-        version="1.0.1.v200602130105">
-        <category name="Web Tools Platform (WTP) 1.0.x maintenance" />
-    </feature>
-
-    <feature
-        url="features/org.eclipse.wst_1.0.2.v200604280000.jar"
-        id="org.eclipse.wst"
-        version="1.0.2.v200604280000">
-        <category name="Web Tools Platform (WTP) 1.0.x maintenance" />
-    </feature>
-
-    <feature
-        url="features/org.eclipse.jst_1.0.2.v200604280000.jar"
-        id="org.eclipse.jst"
-        version="1.0.2.v200604280000">
-        <category name="Web Tools Platform (WTP) 1.0.x maintenance" />
-    </feature>
-
-    <feature
-        url="features/org.eclipse.wst.sdk_1.0.2.v200604280000.jar"
-        id="org.eclipse.wst.sdk"
-        version="1.0.2.v200604280000">
-        <category name="Web Tools Platform (WTP) 1.0.x maintenance" />
-    </feature>
-
-    <feature
-        url="features/org.eclipse.jst.sdk_1.0.2.v200604280000.jar"
-        id="org.eclipse.jst.sdk"
-        version="1.0.2.v200604280000">
-        <category name="Web Tools Platform (WTP) 1.0.x maintenance" />
-    </feature>
-
-    <feature
-        url="features/org.eclipse.wst_1.0.3.v200607290745.jar"
-        id="org.eclipse.wst"
-        version="1.0.3.v200607290745">
-        <category name="Web Tools Platform (WTP) 1.0.x maintenance" />
-    </feature>
-
-    <feature
-        url="features/org.eclipse.jst_1.0.3.v200607290745.jar"
-        id="org.eclipse.jst"
-        version="1.0.3.v200607290745">
-        <category name="Web Tools Platform (WTP) 1.0.x maintenance" />
-    </feature>
-
-    <feature
-        url="features/org.eclipse.wst.sdk_1.0.3.v200607290745.jar"
-        id="org.eclipse.wst.sdk"
-        version="1.0.3.v200607290745">
-        <category name="Web Tools Platform (WTP) 1.0.x maintenance" />
-    </feature>
-
-    <feature
-        url="features/org.eclipse.jst.sdk_1.0.3.v200607290745.jar"
-        id="org.eclipse.jst.sdk"
-        version="1.0.3.v200607290745">
-        <category name="Web Tools Platform (WTP) 1.0.x maintenance" />
-    </feature>
-
-
-
-    <feature
-        url="features/org.eclipse.wst_1.5.2.v200610070620-X3Tmm8_VLz2EcCH.jar"
-        id="org.eclipse.wst"
-        version="1.5.2.v200610070620-X3Tmm8_VLz2EcCH">
-        <category name="Web Tools Platform (WTP)" />
-    </feature>
-
-    <feature
-        url="features/org.eclipse.jst_1.5.2.v200610070620-kW-OA1vfaZTJtXg.jar"
-        id="org.eclipse.jst"
-        version="1.5.2.v200610070620-kW-OA1vfaZTJtXg">
-        <category name="Web Tools Platform (WTP)" />
-    </feature>
-
-    <feature
-        url="features/org.eclipse.wst.sdk_1.5.2.v200610070620-O2U9W5yZ8Xaybx1.jar"
-        id="org.eclipse.wst.sdk"
-        version="1.5.2.v200610070620-O2U9W5yZ8Xaybx1">
-        <category name="Web Tools Platform (WTP)" />
-    </feature>
-
-    <feature
-        url="features/org.eclipse.jst.sdk_1.5.2.v200610070620-dnUUNbBDstmRfV2.jar"
-        id="org.eclipse.jst.sdk"
-        version="1.5.2.v200610070620-dnUUNbBDstmRfV2">
-        <category name="Web Tools Platform (WTP)" />
+        id="org.eclipse.jem.sdk"
+        url="features/org.eclipse.jem.sdk_1.2.4.v200704140333-GIHlkYKbOQv_rA7.jar"
+        version="1.2.4.v200704140333-GIHlkYKbOQv_rA7">
+        <category name="Models and Model Development" />
     </feature>
 
     <category-def
-        name="EJB 3.0 Java Persistence (Dali JPA) -- Preview"
-        label="EJB 3.0 Java Persistence (Dali JPA) -- Preview">
+        label="EJB 3.0 Java Persistence (Dali JPA) -- Preview"
+        name="EJB 3.0 Java Persistence (Dali JPA) -- Preview">
         <description
             url="http://download.eclipse.org/webtools/updates/index.html">
             This category contains features providing function to use
@@ -328,8 +111,8 @@
     </category-def>
 
     <category-def
-        name="Enabling Features"
-        label="Enabling Features">
+        label="Enabling Features"
+        name="Enabling Features">
         <description
             url="http://download.eclipse.org/webtools/updates/index.html">
             This category contains features used by WTP or even other
@@ -339,8 +122,8 @@
     </category-def>
 
     <category-def
-        name="Java Server Faces (JSF) -- Preview"
-        label="Java Server Faces (JSF) -- Preview">
+        label="Java Server Faces (JSF) -- Preview"
+        name="Java Server Faces (JSF) -- Preview">
         <description
             url="http://download.eclipse.org/webtools/updates/index.html">
             This category contains features providing function to use
@@ -349,8 +132,8 @@
     </category-def>
 
     <category-def
-        name="Web Tools Platform (WTP)"
-        label="Web Tools Platform (WTP)">
+        label="Web Tools Platform (WTP)"
+        name="Web Tools Platform (WTP)">
         <description
             url="http://download.eclipse.org/webtools/updates/index.html">
             This category contains the features of the Eclipse Web Tools
@@ -358,24 +141,13 @@
         </description>
     </category-def>
 
+
     <category-def
-        name="Web Tools Platform (WTP) 1.0.x maintenance"
-        label="Web Tools Platform (WTP) 1.0.x maintenance">
-        <description
-            url="http://download.eclipse.org/webtools/updates/index.html">
-            This category contains the features of the Eclipse Web Tools
-            Project (WTP) 1.0.x maintenance versions. Note: this 1.0.x
-            version of WTP requires the Eclipse Project 3.1 SDK and
-            corresponding pre-reqs.
-        </description>
-    </category-def>
-    <category-def
-        name="Web Tools Platform (WTP) Patches"
-        label=" Web Tools Platform (WTP) Patches">
-        <description
-            url="http://download.eclipse.org/webtools/updates/index.html">
-            This category contains the patches for for the Eclipse Web
-            Tools Project (WTP).
+        label="Models and Model Development"
+        name="Models and Model Development">
+        <description>
+            Model creation and manipulation frameworks (e.g. EMF, GMF)
+            and specific models (SDO, JEM, XSD Infoset).
         </description>
     </category-def>
 
diff --git a/org.eclipse.wtp.releng.webupdatesite/WebContent/siteEnablingFeatures.xml b/org.eclipse.wtp.releng.webupdatesite/WebContent/siteEnablingFeatures.xml
deleted file mode 100644
index 863b9b1..0000000
--- a/org.eclipse.wtp.releng.webupdatesite/WebContent/siteEnablingFeatures.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site pack200="true" digestURL="http://download.eclipse.org/webtools/declaredUpdates" >
-<!-- 
-mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/webtools/declaredUpdates/site.xml&amp;format=xml"
--->
-
-   <description url="http://download.eclipse.org/webtools/declaredUpdates/index.html">
-      The update site contains the features of the of Eclipse Web Tools Project (WTP)
-   </description>
-
-   <feature url="features/org.apache.commons_logging.feature_1.0.4.v200606152055--0842282_233879.jar" id="org.apache.commons_logging.feature" version="1.0.4.v200606152055--0842282_233879">
-      <category name="Enabling Features" />
-   </feature>
-
-   <feature url="features/org.apache.jakarta_log4j.feature_1.2.8.v200605300321--0842282939426_.jar" id="org.apache.jakarta_log4j.feature" version="1.2.8.v200605300321--0842282939426_">
-      <category name="Enabling Features" />
-   </feature>
-
-   <feature url="features/org.apache.xerces.feature_2.8.0.v200605151647--08422828353873.jar" id="org.apache.xerces.feature" version="2.8.0.v200605151647--08422828353873">
-      <category name="Enabling Features" />
-   </feature>
-
-
-   <category-def name="Enabling Features" label="Enabling Features">
-      <description url="http://download.eclipse.org/webtools/updates/index.html">
-         This category contains features used by WTP or even other projects that enable some functionality, but which by themselves are not very interesting.
-      </description>
-   </category-def>
-
-
-
-</site>
diff --git a/org.eclipse.wtp.releng.webupdatesite/WebContent/siteWTPCallisto.xml b/org.eclipse.wtp.releng.webupdatesite/WebContent/siteWTPCallisto.xml
deleted file mode 100644
index 040f266..0000000
--- a/org.eclipse.wtp.releng.webupdatesite/WebContent/siteWTPCallisto.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site
-    digestURL="http://download.eclipse.org/webtools/testUpdates/"
-    pack200="true">
-    <!-- 
-        mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/webtools/testUpdates/site.xml&amp;format=xml"
-    -->
-    <description
-        url="http://download.eclipse.org/webtools/testUpdates/index.html">
-        The update site contains the features of the of Eclipse Web
-        Tools Project (WTP)
-    </description>
-
-
-
-    <feature
-        id="org.eclipse.wst"
-        url="features/org.eclipse.wst_1.5.4.v200704200440-X3TmzmK-W-vP-Fs.jar"
-        version="1.5.4.v200704200440-X3TmzmK-W-vP-Fs">
-        <category name="Web Tools Platform (WTP)" />
-    </feature>
-
-    <feature
-        id="org.eclipse.jst"
-        url="features/org.eclipse.jst_1.5.4.v200704150219-kW-NuyxHh4-w7-n.jar"
-        version="1.5.4.v200704150219-kW-NuyxHh4-w7-n">
-        <category name="Web Tools Platform (WTP)" />
-    </feature>
-
-    <feature
-        id="org.eclipse.wst.sdk"
-        url="features/org.eclipse.wst.sdk_1.5.4.v200704200440-O2U9jyC-ZDAHEgs.jar"
-        version="1.5.4.v200704200440-O2U9jyC-ZDAHEgs">
-        <category name="Web Tools Platform (WTP)" />
-    </feature>
-
-    <feature
-        id="org.eclipse.jst.sdk"
-        url="features/org.eclipse.jst.sdk_1.5.4.v200704150219-dnUU6nyMbgExb_A.jar"
-        version="1.5.4.v200704150219-dnUU6nyMbgExb_A">
-        <category name="Web Tools Platform (WTP)" />
-    </feature>
-
-    <feature
-        id="org.apache.commons_logging.feature"
-        url="features/org.apache.commons_logging.feature_1.0.4.v200606152055--0842282_233879.jar"
-        version="1.0.4.v200606152055--0842282_233879">
-        <category name="Enabling Features" />
-    </feature>
-
-    <feature
-        id="org.apache.jakarta_log4j.feature"
-        url="features/org.apache.jakarta_log4j.feature_1.2.8.v200605300321--0842282939426_.jar"
-        version="1.2.8.v200605300321--0842282939426_">
-        <category name="Enabling Features" />
-    </feature>
-
-    <feature
-        id="org.apache.xerces.feature"
-        url="features/org.apache.xerces.feature_2.8.0.v200605151647--08422828353873.jar"
-        version="2.8.0.v200605151647--08422828353873">
-        <category name="Enabling Features" />
-    </feature>
-
-
-
-    <feature
-        id="org.eclipse.jst.jsf.feature"
-        url="features/org.eclipse.jst.jsf.feature_0.5.1.v20060829-OJnpNuKYI7O7SAU.jar"
-        version="0.5.1.v20060829-OJnpNuKYI7O7SAU">
-        <category name="Java Server Faces (JSF) -- Preview" />
-    </feature>
-
-
-    <feature
-        id="org.eclipse.jst.jsf_sdk.feature"
-        url="features/org.eclipse.jst.jsf_sdk.feature_0.5.1.v20060829-fX45f_dlc_3ccM8.jar"
-        version="0.5.1.v20060829-fX45f_dlc_3ccM8">
-        <category name="Java Server Faces (JSF) -- Preview" />
-    </feature>
-
-    <feature
-        id="org.eclipse.dali"
-        url="features/org.eclipse.dali_0.5.0.v200606270000--87cMN7N7crMMMR.jar"
-        version="0.5.0.v200606270000--87cMN7N7crMMMR">
-        <category name="EJB 3.0 Java Persistence (Dali JPA) -- Preview" />
-    </feature>
-
-
-    <feature
-        id="org.eclipse.jem"
-        patch="false"
-        url="features/org.eclipse.jem_1.2.4.v200704181020--6zXJK0L0SE3a95.jar"
-        version="1.2.4.v200704181020--6zXJK0L0SE3a95">
-        <category name="Models and Model Development" />
-    </feature>
-    <feature
-        id="org.eclipse.jem.sdk"
-        url="features/org.eclipse.jem.sdk_1.2.4.v200704140333-GIHlkYKbOQv_rA7.jar"
-        version="1.2.4.v200704140333-GIHlkYKbOQv_rA7">
-        <category name="Models and Model Development" />
-    </feature>
-
-    <category-def
-        label="EJB 3.0 Java Persistence (Dali JPA) -- Preview"
-        name="EJB 3.0 Java Persistence (Dali JPA) -- Preview">
-        <description
-            url="http://download.eclipse.org/webtools/updates/index.html">
-            This category contains features providing function to use
-            and develop Object-Relational (O/R) mappings for EJB 3.0
-            Java Persistence API (JPA) Entities.
-        </description>
-    </category-def>
-
-    <category-def
-        label="Enabling Features"
-        name="Enabling Features">
-        <description
-            url="http://download.eclipse.org/webtools/updates/index.html">
-            This category contains features used by WTP or even other
-            projects that enable some functionality, but which by
-            themselves are not very interesting.
-        </description>
-    </category-def>
-
-    <category-def
-        label="Java Server Faces (JSF) -- Preview"
-        name="Java Server Faces (JSF) -- Preview">
-        <description
-            url="http://download.eclipse.org/webtools/updates/index.html">
-            This category contains features providing function to use
-            and develop Java Server Faces.
-        </description>
-    </category-def>
-
-    <category-def
-        label="Web Tools Platform (WTP)"
-        name="Web Tools Platform (WTP)">
-        <description
-            url="http://download.eclipse.org/webtools/updates/index.html">
-            This category contains the features of the Eclipse Web Tools
-            Project (WTP).
-        </description>
-    </category-def>
-
-
-    <category-def
-        label="Models and Model Development"
-        name="Models and Model Development">
-        <description>
-            Model creation and manipulation frameworks (e.g. EMF, GMF)
-            and specific models (SDO, JEM, XSD Infoset).
-        </description>
-    </category-def>
-
-</site>
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/callisto-features-jem.xml b/org.eclipse.wtp.releng.webupdatesite/build-home/callisto-features-jem.xml
deleted file mode 100644
index fa1cb75..0000000
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/callisto-features-jem.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="update" default="update">
-	<target name="update">
-
-		<property name="updateSite" value="file://${user.home}/downloads/webtools/downloads/drops/R1.5/R-1.5.4-200705021353/updateSite/" />
-		<echo message="   pulling update jars from ${updateSite}" />
-
-
-
-
-		<ant antfile="updateMirrorProject.xml">
-			<property name="featureId" value="org.eclipse.jem" />
-			<property name="version" value="1.2.4.v200704181020--6zXJK0L0SE3a95" />
-		</ant>
-		<ant antfile="updateMirrorProject.xml">
-			<property name="featureId" value="org.eclipse.jem.sdk" />
-			<property name="version" value="1.2.4.v200704140333-GIHlkYKbOQv_rA7" />
-		</ant>
-
-	</target>
-</project>
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/callisto-features-jpa.xml b/org.eclipse.wtp.releng.webupdatesite/build-home/callisto-features-jpa.xml
deleted file mode 100644
index 01016d2..0000000
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/callisto-features-jpa.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="update" default="update">
-    <target name="update">
-
-        <property name="updateSite"
-                  value="file:///${user.home}/downloads/webtools/jpa/updates/" />
-        <echo message="   pulling update jars from ${updateSite}" />
-
-     
-        <ant antfile="updateMirrorProject.xml">
-            <property name="featureId"
-                      value="org.eclipse.dali" />
-            <property name="version"
-                      value="0.5.0.v200606270000--87cMN7N7crMMMR" />
-                      
-        </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/callisto-features-jsf.xml b/org.eclipse.wtp.releng.webupdatesite/build-home/callisto-features-jsf.xml
deleted file mode 100644
index 8dfc0d1..0000000
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/callisto-features-jsf.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="update" default="update">
-    <target name="update">
-
-        <property name="updateSite"
-            value="file://${user.home}/downloads/webtools/downloads/drops/R1.5/R-1.5.3-200702082048/updateSite/" />
-        <echo message="   pulling update jars from ${updateSite}" />
-
-
-
-
-        <ant antfile="updateMirrorProject.xml">
-            <property name="featureId"
-                      value="org.eclipse.jst.jsf.feature" />
-            <property name="version"
-                      value="0.5.1.v20060829-OJnpNuKYI7O7SAU" />
-
-        </ant>
-        <ant antfile="updateMirrorProject.xml">
-            <property name="featureId"
-                      value="org.eclipse.jst.jsf_sdk.feature" />
-            <property name="version"
-                      value="0.5.1.v20060829-fX45f_dlc_3ccM8" />
-        </ant>
-
-
-
-    </target>
-</project>
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/callisto-features-wtp.xml b/org.eclipse.wtp.releng.webupdatesite/build-home/callisto-features-wtp.xml
deleted file mode 100644
index 82f78bb..0000000
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/callisto-features-wtp.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="update" default="update">
-	<target name="update">
-
-		<property name="updateSite" value="file://${user.home}/downloads/webtools/downloads/drops/R1.5/R-1.5.4-200705021353/updateSite/" />
-		<echo message="   pulling update jars from ${updateSite}" />
-
-
-
-
-		<ant antfile="updateMirrorProject.xml">
-			<property name="featureId" value="org.eclipse.wst" />
-			<property name="version" value="1.5.4.v200704200440-X3TmzmK-W-vP-Fs" />
-		</ant>
-		<ant antfile="updateMirrorProject.xml">
-			<property name="featureId" value="org.eclipse.jst" />
-			<property name="version" value="1.5.4.v200704150219-kW-NuyxHh4-w7-n" />
-		</ant>
-
-		<ant antfile="updateMirrorProject.xml">
-			<property name="featureId" value="org.eclipse.wst.sdk" />
-			<property name="version" value="1.5.4.v200704200440-O2U9jyC-ZDAHEgs" />
-		</ant>
-		<ant antfile="updateMirrorProject.xml">
-			<property name="featureId" value="org.eclipse.jst.sdk" />
-			<property name="version" value="1.5.4.v200704150219-dnUU6nyMbgExb_A" />
-		</ant>
-
-		<!-- 
-        technically, seems Xerces should not have to be listed here, 
-        since is mirrored by above ... but currently is required to get all other 
-        files (e.g. site.xml files) to be correctly updated). 
-        
-        Doesn't hurt, either, to have the redundancy, since other projects 
-        are dependent on it, so less likely to be forgotten and accidently 
-        removed in the future. 
-        -->
-		<ant antfile="updateMirrorProject.xml">
-			<property name="featureId" value="org.apache.commons_logging.feature" />
-			<property name="version" value="1.0.4.v200606152055--0842282_233879" />
-		</ant>
-		<ant antfile="updateMirrorProject.xml">
-			<property name="featureId" value="org.apache.jakarta_log4j.feature" />
-			<property name="version" value="1.2.8.v200605300321--0842282939426_" />
-		</ant>
-		<ant antfile="updateMirrorProject.xml">
-			<property name="featureId" value="org.apache.xerces.feature" />
-			<property name="version" value="2.8.0.v200605151647--08422828353873" />
-		</ant>
-
-
-
-	</target>
-</project>
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/createDigests.xml b/org.eclipse.wtp.releng.webupdatesite/build-home/createDigests.xml
index 25d6f70..3ce6222 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/createDigests.xml
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/createDigests.xml
@@ -35,20 +35,20 @@
             <arg
                 line="-application org.eclipse.update.core.siteOptimizer" />
             <arg
-                line="-digestBuilder -digestOutputDir=${updateSite} -siteXML=${updateSite}/${mainSiteFileName}" />
+                line="-digestBuilder -digestOutputDir=${update.site} -siteXML=${update.site}/${mainSiteFileName}" />
         </java>
 
     </target>
 
     <target name="checkArgs">
-        <fail message="eclipse.home and updateSite must be set.">
+        <fail message="eclipse.home and update.site must be set.">
             <condition>
                 <and>
                     <not>
                         <isset property="eclipse.home" />
                     </not>
                     <not>
-                        <isset property="updateSite" />
+                        <isset property="update.site" />
                     </not>
                 </and>
             </condition>
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/createPack200s.xml b/org.eclipse.wtp.releng.webupdatesite/build-home/createPack200s.xml
index 329bdad..960959e 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/createPack200s.xml
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/createPack200s.xml
@@ -30,19 +30,19 @@
             <arg
                 line="-application org.eclipse.update.core.siteOptimizer" />
             <arg
-                line="-jarProcessor -verbose -outputDir ${updateSite} -pack ${updateSite}" />
+                line="-jarProcessor -verbose -outputDir ${update.site} -pack ${update.site}" />
         </java>
     </target>
 
     <target name="checkArgs">
-        <fail message="eclipse.home and updateSite must be set.">
+        <fail message="eclipse.home and update.site must be set.">
             <condition>
                 <and>
                     <not>
                         <isset property="eclipse.home" />
                     </not>
                     <not>
-                        <isset property="updateSite" />
+                        <isset property="update.site" />
                     </not>
                 </and>
             </condition>
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/eclipseLocation.shsource b/org.eclipse.wtp.releng.webupdatesite/build-home/eclipseLocation.shsource
deleted file mode 100644
index fd68d82..0000000
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/eclipseLocation.shsource
+++ /dev/null
@@ -1 +0,0 @@
-eclipseLocation=${HOME}/eclipse-ppc-33M7
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
new file mode 100644
index 0000000..0102689
--- /dev/null
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-jem.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+    name="update"
+    default="update">
+    <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}" />
+
+
+
+
+        <ant antfile="updateMirrorProject.xml">
+            <property
+                name="featureId"
+                value="org.eclipse.jem" />
+            <property
+                name="version"
+                value="1.2.4.v200704181020--6zXJK0L0SE3a95" />
+        </ant>
+        <ant antfile="updateMirrorProject.xml">
+            <property
+                name="featureId"
+                value="org.eclipse.jem.sdk" />
+            <property
+                name="version"
+                value="1.2.4.v200704140333-GIHlkYKbOQv_rA7" />
+        </ant>
+
+    </target>
+</project>
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
new file mode 100644
index 0000000..0a45e19
--- /dev/null
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-jpa.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+    name="update"
+    default="update">
+    <target name="update">
+
+        <property
+            name="update.site"
+            value="file:///${user.home}/downloads/webtools/jpa/updates/" />
+        <echo message="   pulling update jars from ${update.site}" />
+
+
+        <ant antfile="updateMirrorProject.xml">
+            <property
+                name="featureId"
+                value="org.eclipse.dali" />
+            <property
+                name="version"
+                value="0.5.0.v200606270000--87cMN7N7crMMMR" />
+
+        </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
new file mode 100644
index 0000000..f31d293
--- /dev/null
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-jsf.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+    name="update"
+    default="update">
+    <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}" />
+
+
+
+
+        <ant antfile="updateMirrorProject.xml">
+            <property
+                name="featureId"
+                value="org.eclipse.jst.jsf.feature" />
+            <property
+                name="version"
+                value="0.5.1.v20060829-OJnpNuKYI7O7SAU" />
+
+        </ant>
+        <ant antfile="updateMirrorProject.xml">
+            <property
+                name="featureId"
+                value="org.eclipse.jst.jsf_sdk.feature" />
+            <property
+                name="version"
+                value="0.5.1.v20060829-fX45f_dlc_3ccM8" />
+        </ant>
+
+
+
+    </target>
+</project>
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
new file mode 100644
index 0000000..35bafbb
--- /dev/null
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-wtp.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+    name="update"
+    default="update">
+    <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}" />
+
+
+
+
+        <ant antfile="updateMirrorProject.xml">
+            <property
+                name="featureId"
+                value="org.eclipse.wst" />
+            <property
+                name="version"
+                value="1.5.4.v200704200440-X3TmzmK-W-vP-Fs" />
+        </ant>
+        <ant antfile="updateMirrorProject.xml">
+            <property
+                name="featureId"
+                value="org.eclipse.jst" />
+            <property
+                name="version"
+                value="1.5.4.v200704150219-kW-NuyxHh4-w7-n" />
+        </ant>
+
+        <ant antfile="updateMirrorProject.xml">
+            <property
+                name="featureId"
+                value="org.eclipse.wst.sdk" />
+            <property
+                name="version"
+                value="1.5.4.v200704200440-O2U9jyC-ZDAHEgs" />
+        </ant>
+        <ant antfile="updateMirrorProject.xml">
+            <property
+                name="featureId"
+                value="org.eclipse.jst.sdk" />
+            <property
+                name="version"
+                value="1.5.4.v200704150219-dnUU6nyMbgExb_A" />
+        </ant>
+
+        <!-- 
+            technically, seems Xerces should not have to be listed here, 
+            since is mirrored by above ... but currently is required to get all other 
+            files (e.g. site.xml files) to be correctly updated). 
+            
+            Doesn't hurt, either, to have the redundancy, since other projects 
+            are dependent on it, so less likely to be forgotten and accidently 
+            removed in the future. 
+        -->
+        <ant antfile="updateMirrorProject.xml">
+            <property
+                name="featureId"
+                value="org.apache.commons_logging.feature" />
+            <property
+                name="version"
+                value="1.0.4.v200606152055--0842282_233879" />
+        </ant>
+        <ant antfile="updateMirrorProject.xml">
+            <property
+                name="featureId"
+                value="org.apache.jakarta_log4j.feature" />
+            <property
+                name="version"
+                value="1.2.8.v200605300321--0842282939426_" />
+        </ant>
+        <ant antfile="updateMirrorProject.xml">
+            <property
+                name="featureId"
+                value="org.apache.xerces.feature" />
+            <property
+                name="version"
+                value="2.8.0.v200605151647--08422828353873" />
+        </ant>
+
+
+
+    </target>
+</project>
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/features-wtp.xml b/org.eclipse.wtp.releng.webupdatesite/build-home/features-europa-wtp.xml
similarity index 94%
rename from org.eclipse.wtp.releng.webupdatesite/build-home/features-wtp.xml
rename to org.eclipse.wtp.releng.webupdatesite/build-home/features-europa-wtp.xml
index 1782e40..91667bb 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/features-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="updateSite"
-            value="file://${user.home}/downloads/webtools/committers/drops/R2.0/S-2.0RC1-200705250432/updateSite" />
-        <echo message="   pulling update jars from ${updateSite}" />
+            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}" />
 
 
         <ant antfile="updateMirrorProject.xml">
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/generateMirrorTags.jar b/org.eclipse.wtp.releng.webupdatesite/build-home/generateMirrorTags.jar
deleted file mode 100644
index 753abe4..0000000
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/generateMirrorTags.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/getWTPUpdateToolsFromCVS.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/getWTPUpdateToolsFromCVS.sh
index f3c00fc..7a22602 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/getWTPUpdateToolsFromCVS.sh
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/getWTPUpdateToolsFromCVS.sh
@@ -4,6 +4,8 @@
 # ${updateToolsDir}.
 # This is typically the users ${HOME} directory
 
+# have to code this here, not include, 
+# since normally the properties.shsource is in a different directory
 updateToolsDir=org.eclipse.wtp.releng.webupdatesite
 
 echo "   "
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/mirrorMilestones.xml b/org.eclipse.wtp.releng.webupdatesite/build-home/mirrorMilestones.xml
deleted file mode 100644
index 6f928da..0000000
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/mirrorMilestones.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="update" default="update" basedir=".">
-    <!-- original example received from Richard Gronback from cross-project list (thanks Richard!) -->
-    <!-- see http://help.eclipse.org/help31/index.jsp?topic=/org.eclipse.platform.doc.isv/reference/misc/update_standalone.html -->
-
-    <target name="update">
-        <echo message="Mirroring wtp milestones site to reduced site" />
-        <java jar="${eclipseLocation}/startup.jar"
-              fork="true"
-              failonerror="false">
-            <jvmarg value="-DcontinueOnError=true" />
-            <arg value="-clean" />
-            <arg value="-nosplash" />
-            <arg value="-application" />
-            <arg value="org.eclipse.update.core.standaloneUpdate" />
-            <arg value="-data" />
-            <arg value="${basedir}/buildworkspace" />
-            <arg value="-debug" />
-            <arg value="-consolelog" />
-            <arg value="-command" />
-            <arg value="mirror" />
-            <arg value="-from" />
-            <arg value="${updateSite}" />
-            <arg value="-to" />
-            <arg value="${localUpdateSitePath}" />
-
-        </java>
-
-    </target>
-</project>
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/properties.shsource b/org.eclipse.wtp.releng.webupdatesite/build-home/properties.shsource
new file mode 100644
index 0000000..d5b0328
--- /dev/null
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/properties.shsource
@@ -0,0 +1,7 @@
+
+
+eclipseLocation=${HOME}/eclipse-ppc-33M7
+
+
+# should be no reason to ever change the following
+updateToolsDir=org.eclipse.wtp.releng.webupdatesite
\ No newline at end of file
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/runCreateDigests.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/runCreateDigests.sh
index 48c1951..3119133 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/runCreateDigests.sh
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/runCreateDigests.sh
@@ -8,7 +8,7 @@
 
 mainSiteFileName=site.xml
  
-source eclipseLocation.shsource
+source properties.shsource
 
-ant  -f createDigests.xml      -Declipse.home=${eclipseLocation} -DupdateSite=${updateSite}  -DmainSiteFileName=${mainSiteFileName}
+ant  -f createDigests.xml      -Declipse.home=${eclipseLocation} -Dupdate.site=${updateSite}  -DmainSiteFileName=${mainSiteFileName}
 
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200s.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200s.sh
index e458158..228334d 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200s.sh
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200s.sh
@@ -5,7 +5,7 @@
 updateSite=${HOME}/downloads/webtools/testUpdates
 #updateSite=${HOME}/downloads/webtools/declaredUpdates
  
-source eclipseLocation.shsource
+source properties.shsource
 
-ant  -f createPack200s.xml      -Declipse.home=${eclipseLocation} -DupdateSite=${updateSite}
+ant  -f createPack200s.xml      -Declipse.home=${eclipseLocation} -Dupdate.site=${updateSite}
 
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllCallistoProjects.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllCallistoProjects.sh
index e67c1fa..a9d394f 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllCallistoProjects.sh
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllCallistoProjects.sh
@@ -2,13 +2,12 @@
 
 # script to run update, setting properties, for all projects
 
-# main entry point for Callisto update
 updateSite=${HOME}/downloads/webtools/testUpdates
-mainSiteFileName=siteWTPCallisto.xml
 
-updateToolsDir=org.eclipse.wtp.releng.webupdatesite
-
-source eclipseLocation.shsource
+mainSiteFileName=siteCallisto.xml
+mainIndexFileName=indexCallisto.html
+ 
+source properties.shsource
 
 if [ "${1}" == "-clean" ] ; then
 
@@ -22,18 +21,18 @@
 	 rm -fr ${updateSite}/*
 	
 	 echo "   Updating index and web site files, but not site xml files (yet)"
-      rsync -v -p ${HOME}/${updateToolsDir}/WebContent/index.html ${updateSite}/index.html
+      rsync -v -p ${HOME}/${updateToolsDir}/WebContent/${mainIndexFileName} ${updateSite}/index.html
       rsync -v -p ${HOME}/${updateToolsDir}/WebContent/*.jpg ${updateSite}
 fi
 
 
-ant  -f updateCallistoMirrorAll.xml -Declipse.home=${eclipseLocation} -DlocalUpdateSitePath=${updateSite}
+ant  -f updateCallistoMirrorAll.xml -Declipse.home=${eclipseLocation} -Dupdate.site=${updateSite}
 
 # merge authored site.xml files with the most recent auto generated one
 ./runUpdateSiteXmlFiles.sh ${mainSiteFileName} ${updateSite}
 
-#ant  -f createPack200s.xml     -Declipse.home=${eclipseLocation} -DupdateSite=${updateSite}
+# do create pack's later ... takes a long time
+#ant  -f createPack200s.xml     -Declipse.home=${eclipseLocation} -Dupdate.site=${updateSite}
  
 # run create Digests now, it's a good check if all is well
-ant  -f createDigests.xml      -Declipse.home=${eclipseLocation} -DupdateSite=${updateSite}  -DmainSiteFileName=${mainSiteFileName}
-
+ant  -f createDigests.xml      -Declipse.home=${eclipseLocation} -Dupdate.site=${updateSite}  -DmainSiteFileName=${mainSiteFileName}
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllEuropaProjects.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllEuropaProjects.sh
index 844b1b8..beea70c 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllEuropaProjects.sh
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllEuropaProjects.sh
@@ -2,13 +2,13 @@
 
 # script to run update, setting properties, for all projects
 
-updateToolsDir=org.eclipse.wtp.releng.webupdatesite
-
 updateSite=${HOME}/downloads/webtools/declaredUpdates
- 
-source eclipseLocation.shsource
 
 mainSiteFileName=siteEuropa.xml
+mainIndexFileName=indexEuropa.html
+ 
+source properties.shsource
+
 
 if [ "${1}" == "-clean" ] ; then
 
@@ -22,18 +22,18 @@
 	 rm -fr ${updateSite}/*
 	
 	 echo "   Updating index and web site files, but not site xml files (yet)"
-	    rsync -v -p ${HOME}/${updateToolsDir}/WebContent/indexEuropa.html ${updateSite}/index.html
+	    rsync -v -p ${HOME}/${updateToolsDir}/WebContent/${mainIndexFileName} ${updateSite}/index.html
       rsync -v -p ${HOME}/${updateToolsDir}/WebContent/*.jpg ${updateSite}
 fi
 
 
-ant  -f updateEuropaMirrorAll.xml -Declipse.home=${eclipseLocation} -DlocalUpdateSitePath=${updateSite}
+ant  -f updateEuropaMirrorAll.xml -Declipse.home=${eclipseLocation} -Dupdate.site=${updateSite}
 
 # merge authored site.xml files with the most recent auto generated one
 ./runUpdateSiteXmlFiles.sh ${mainSiteFileName} ${updateSite}
 
 # do create pack's later ... takes a long time
-# ant  -f createPack200s.xml     -Declipse.home=${eclipseLocation} -DupdateSite=${updateSite}
+# ant  -f createPack200s.xml     -Declipse.home=${eclipseLocation} -Dupdate.site=${updateSite}
 
 # run create Digests now, it's a good check if all is well
-ant  -f createDigests.xml      -Declipse.home=${eclipseLocation} -DupdateSite=${updateSite}  -DmainSiteFileName=site.xml
+ant  -f createDigests.xml      -Declipse.home=${eclipseLocation} -Dupdate.site=${updateSite}  -DmainSiteFileName=${mainSiteFileName}
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateProjects.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateProjects.sh
deleted file mode 100644
index 5b3c2b8..0000000
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateProjects.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-# script to run update, setting properties, for an individual project
-
-#updateSite=${HOME}/downloads/webtools/testUpdates
-updateSite=${HOME}/downloads/webtools/declaredUpdates
-
-echo "update site: ${updateSite}"
-
- eclipseLocation=${HOME}/eclipse-ppc-33M5
-
-
-project="${1}"
-if [ "${project}" !=  "" ]
-then
-
-     ant  -f features-${project}.xml -DeclipseLocation=${eclipseLocation} -DlocalUpdateSitePath=${updateSite} -Dosgi.arch=ppc -Dosgi.clean -Dosgi.debug=true -Declipse.consoleLog=true -DcontinueOnError=true
-
-
-else
-     echo "   Usage: ${0} <project> (where project is wtp, jsf, or jpa)"
-
-fi
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateSiteXmlFile.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateSiteXmlFile.sh
deleted file mode 100644
index 3eb5faf..0000000
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateSiteXmlFile.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-# script to update site xml files, by merging new features from "mirror" command, with old "authored" content.
-
-main_name=${1}
-updateSite=${2}
-updateToolsDir=org.eclipse.wtp.releng.webupdatesite
-
-in_authored=${HOME}/${updateToolsDir}/WebContent/${main_name}
-# remember, this 'site.xml' is just the output of mirror command, when ran in context
-in_newFeatures=${updateSite}/.site.xml
-
-# merges newFeautes in to authored, back in original locaion
-java -jar siteFileUpdater.jar ${in_authored} ${in_newFeatures}
-
-# copy to discovery site
-# Note: here we are changing names from site specific site file name, to generic site.xml 
-rsync -v -p ${in_authored} ${updateSite}/site.xml
-
-rm ${in_newFeatures}
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateSiteXmlFiles.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateSiteXmlFiles.sh
index 02e3e98..efb6472 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateSiteXmlFiles.sh
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateSiteXmlFiles.sh
@@ -1,8 +1,11 @@
+
 #set variables
-updateToolsDir=${HOME}/org.eclipse.wtp.releng.webupdatesite
+
+
 updateSiteFile=${1}
 updateSite=${2}
 
+source properties.shsource
 
 
 # save away a clean version of this site file, produced during mirroring commands,
@@ -11,5 +14,16 @@
 
 
 # merge authored site.xml with the autogenerated one
-${updateToolsDir}/build-home/runUpdateSiteXmlFile.sh ${updateSiteFile} ${updateSite}
 
+in_authored=${HOME}/${updateToolsDir}/WebContent/${updateSiteFile}
+# remember, this 'site.xml' is just the output of mirror command, when ran in context
+in_newFeatures=${updateSite}/.site.xml
+
+# merges newFeautes in to authored, back in original locaion
+java -jar siteFileUpdater.jar ${in_authored} ${in_newFeatures}
+
+# copy to discovery site
+# Note: here we are changing names from site specific site file name, to generic site.xml 
+rsync -v -p ${in_authored} ${updateSite}/site.xml
+
+rm ${in_newFeatures}
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/updateCallistoMirrorAll.xml b/org.eclipse.wtp.releng.webupdatesite/build-home/updateCallistoMirrorAll.xml
index 6c35b40..43fa034 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/updateCallistoMirrorAll.xml
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/updateCallistoMirrorAll.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="updatesite" default="all" basedir=".">
+<project
+    name="updateCallisto"
+    default="all"
+    basedir=".">
 
     <target name="all">
-        <ant antfile="callisto-features-jem.xml" />
-        <ant antfile="callisto-features-wtp.xml" />
-        <ant antfile="callisto-features-jsf.xml" />
-        <ant antfile="callisto-features-jpa.xml" />
-        
+        <ant antfile="features-callisto-jem.xml" />
+        <ant antfile="features-callisto-wtp.xml" />
+        <ant antfile="features-callisto-jsf.xml" />
+        <ant antfile="features-callisto-jpa.xml" />
+
         <!-- make sure all can "read" (important for quicker http access, esp. when Eclipse.org overloaded) -->
-        <chmod verbose="true" perm="o+rx" type="both">
-            <fileset dir="${localUpdateSitePath}" />
+        <chmod
+            verbose="true"
+            perm="o+rx"
+            type="both">
+            <fileset dir="${update.site}" />
         </chmod>
 
-        <!-- needs work .. indexer doesn't work well from this ant script (needs paths fixed up)
-        <ant antfile="indexer.xml">
-            <property name="pluginJarPath"
-                      location="${localUpdateSitePath}" />
-        </ant>
-				-->
     </target>
 
 </project>
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/updateEuropaMirrorAll.xml b/org.eclipse.wtp.releng.webupdatesite/build-home/updateEuropaMirrorAll.xml
index 86787f1..f2d7790 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/updateEuropaMirrorAll.xml
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/updateEuropaMirrorAll.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="updatesite" default="all" basedir=".">
+<project
+    name="update.site"
+    default="all"
+    basedir=".">
 
     <target name="all">
-        <ant antfile="features-wtp.xml" />
-        
+        <ant antfile="features-europa-wtp.xml" />
+
         <!-- make sure all can "read" (important for quicker http access, esp. when Eclipse.org overloaded) -->
-        <chmod verbose="true" perm="o+rx" type="both">
-            <fileset dir="${localUpdateSitePath}" />
+        <chmod
+            verbose="true"
+            perm="o+rx"
+            type="both">
+            <fileset dir="${update.site}" />
         </chmod>
 
-        <!-- needs work .. indexer doesn't work well from this ant script (needs paths fixed up)
-        <ant antfile="indexer.xml">
-            <property name="pluginJarPath"
-                      location="${localUpdateSitePath}" />
-        </ant>
-		-->
     </target>
 
 </project>
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/updateMirrorProject.xml b/org.eclipse.wtp.releng.webupdatesite/build-home/updateMirrorProject.xml
index c7ac583..fb4d649 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/updateMirrorProject.xml
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/updateMirrorProject.xml
@@ -1,50 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="update" default="update" basedir=".">
+<project
+    name="update"
+    default="update"
+    basedir=".">
 
 
 
-	<property name="java15-home" value="${user.home}/ibm-java2-ppc-50/jre" />
-	<property name="buildDirectory" value="${basedir}" />
+    <property
+        name="java15-home"
+        value="${user.home}/ibm-java2-ppc-50/jre" />
+    <property
+        name="buildDirectory"
+        value="${basedir}" />
 
-	<target name="update">
-		<echo message="Updating ${featureId} ${version}" />
+    <target name="update">
+        <echo message="Updating ${featureId} ${version}" />
 
-		<java taskname="updateJob" 
-			 fork="true" 
-			 resultProperty="updateResult" 
-			 failonerror="false" 
-			 jvm="${java15-home}/bin/java" 
-			 classname="org.eclipse.equinox.launcher.Main">
-			<classpath>
-				<fileset dir="${eclipse.home}/plugins">
-					<include name="org.eclipse.equinox.launcher_*.jar" />
-				</fileset>
-			</classpath>
+        <java
+            taskname="updateJob"
+            fork="true"
+            resultProperty="updateResult"
+            failonerror="false"
+            jvm="${java15-home}/bin/java"
+            classname="org.eclipse.equinox.launcher.Main">
+            <classpath>
+                <fileset dir="${eclipse.home}/plugins">
+                    <include name="org.eclipse.equinox.launcher_*.jar" />
+                </fileset>
+            </classpath>
 
 
-			<jvmarg value="-DcontinueOnError=true" />
-			<arg value="-clean" />
-			<arg value="-nosplash" />
-			<arg value="-application" />
-			<arg value="org.eclipse.update.core.standaloneUpdate" />
-			<arg value="-data" />
-			<arg value="${basedir}/buildworkspace" />
-			<arg value="-debug" />
-			<arg value="-consolelog" />
-			<arg value="-command" />
-			<arg value="mirror" />
-			<arg value="-featureId" />
-			<arg value="${featureId}" />
-			<arg value="-version" />
-			<arg value="${version}" />
-			<arg value="-from" />
-			<arg value="${updateSite}" />
-			<arg value="-to" />
-			<arg value="${localUpdateSitePath}" />
-			<arg value="-ignoreMissingPlugins" />
-			<arg value="true" />
+            <jvmarg value="-DcontinueOnError=true" />
+            <arg value="-clean" />
+            <arg value="-nosplash" />
+            <arg value="-application" />
+            <arg value="org.eclipse.update.core.standaloneUpdate" />
+            <arg value="-data" />
+            <arg value="${basedir}/buildworkspace" />
+            <arg value="-debug" />
+            <arg value="-consolelog" />
+            <arg value="-command" />
+            <arg value="mirror" />
+            <arg value="-featureId" />
+            <arg value="${featureId}" />
+            <arg value="-version" />
+            <arg value="${version}" />
+            <arg value="-from" />
+            <arg value="${update.site}" />
+            <arg value="-to" />
+            <arg value="${update.site}" />
+            <arg value="-ignoreMissingPlugins" />
+            <arg value="true" />
 
-		</java>
+        </java>
 
-	</target>
+    </target>
 </project>
diff --git a/org.eclipse.wtp.releng.webupdatesite/testmail.xml b/org.eclipse.wtp.releng.webupdatesite/testmail.xml
deleted file mode 100644
index 5c689cb..0000000
--- a/org.eclipse.wtp.releng.webupdatesite/testmail.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="updatesite"   default="updatesite" basedir=".">
-<target name = "updatesite">
-		<email
-				mailhost="localhost"
-				returnaddress="wtpBuild@eclipse.org"
-				skipusers="true"
-				subjectprefix="[wtp-R1.5-I-build]"
-				buildresultsurl="${//cruisecontrol/buildresults/wtp-I">
-
-				<always address="wtp-releng@eclipse.org" />
-		</email>
-			
-	
-</target>
-</project>
\ No newline at end of file