[151925] Need to produce update jars in 1.0.3 build
diff --git a/org.eclipse.wtp.releng.webupdatesite/WebContent/index.html b/org.eclipse.wtp.releng.webupdatesite/WebContent/index.html
index 85d238b..3097872 100644
--- a/org.eclipse.wtp.releng.webupdatesite/WebContent/index.html
+++ b/org.eclipse.wtp.releng.webupdatesite/WebContent/index.html
@@ -7,8 +7,7 @@
 <body>
 
 <div align="right" width="400">
-<p><img
-    src="wtplogosmall.jpg" alt="WTP Logo"></p>
+<p><img src="wtplogosmall.jpg" alt="WTP Logo"></p>
 </div>
 
 <h1 class="title">Eclipse Update Site for <br />
@@ -16,68 +15,25 @@
 
 <p>This update site provides the features of the Eclipse Web Tools
 Platform (WTP).</p>
-<p>It not only provides the data for WTP updates, it also provides
-"pointers" to the prerequisite projects (JDT, EMF, GEF, and JEM).</p>
-<p>It does assume, however, that at least the Eclipse 3.1.2 Platform
-Feature is installed. For example, to start with minimum foot-print, you
-can use the <a
-    href="http://download.eclipse.org/eclipse/downloads/drops/R-3.1.2-200601181600/index.php">Platform
-Runtime Binary</a> appropriate for your operating system. (The Platform
-Runtime Binary section is about half way down that page.)</p>
-
-<p>Note, if you are starting with Eclipse 3.1.0, there are some
-separate and <a
-    href="http://www.eclipse.org/eclipse/platform-releng/updatesfor3.1.1.html">specific
-instructions</a> for updating the base platform to the 3.1.1 or 3.1.2 level.</p>
-
-
+<p>It is very important to know which "base eclipse" you have, as
+that determines which are "legal" selections to update to.</p>
+<p>
+<p>If you are based on Eclipse 3.1, you need to to <b>uncheck</b>
+the <i>show only latest versions</i> checkbox, and select
+something from only the "Web Tools Platform (WTP) 1.0.x maintenance"
+category.</p>
+<p>If you are based on Eclipse 3.2, you can select anything form the
+most recent features (the WTP 1.5 features).
 <p>To use this update site in your existing installation of Eclipse,
-add the following URL as a remote update site in your update manager, if it does not already have it.</p>
+add the following URL as a remote update site in your update manager, if
+it does not already have it.</p>
 <p>&nbsp;&nbsp;&nbsp;&nbsp;<b> <code>http://download.eclipse.org/webtools/updates/</code></b></p>
 <p><b>Tip: </b>any time you get a chance, export your bookmark files
 from the "add a site" dialog. Having them saved away in a safe place
 makes it much easier to re-create another development environment.</p>
 <p>See <a
-    href="http://help.eclipse.org/help31/index.jsp?topic=/org.eclipse.platform.doc.user/tasks/tasks-34.htm">Eclipse
+        href="http://help.eclipse.org/help31/index.jsp?topic=/org.eclipse.platform.doc.user/tasks/tasks-34.htm">Eclipse
 Help</a> for general information about using Update Manager.</p>
-<p><b>Tip: </b>To lessen download time (by installing the minimum
-number of features), first select the desired WTP feature in the Eclipse
-update install dialog, then use the 'select required' button to select
-only the minimum required prerequisite features.</p>
-<p><b>Tip: </b>If you are able, it may be easiest to start a fresh
-development environment based on 3.1.2 and then update to use the latest WTP 
-and its latest pre-reqs. And, since the workbench may have to shutdown and
-restart several times (if updating several features), you can you do the
-upgrade with an empty workspace and once satisfied all is well, then use
-the -data option on the Eclipse command line (or shortcut) to point to
-your workspace of interest.</p>
-<p><b>Tip: </b>Both before and <i>after</i> installing "new"
-features, you may want to use update manager to "check for updates to
-currently installed features". In some scenarios just installing WTP
-will not necessarily upgrade all components, such as EMF, to the highest
-available level.</p>
-<p><b>Tip: </b>After you install WTP, you can enjoy using
-Update Manager again to "Search for New Features to Install". You'll
-notice that once WTP is installed, we (in WTP) add BIRT and TPTP <i>discovery
-sites</i> to your Update Manager sites, since there is some cool
-applications that use WTP, BIRT and TPTP together.</p>
-
-<h3>Known Problems and Issues</h3>
-
-
-<p><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=123191">bug
-123191:</a>&nbsp;&nbsp; If you check "Filter features included in other
-features on the list", then even using the 'select required' button may
-not "find" all the features required. Similar for the 'show only the
-latest version of the feature'.</p>
-<p><b>Workaround: </b>do not check that box! :)</p>
-<p>As always, open bugs you find or open feature requests, to help
-the project improve. Thanks for your help.</p>
-<h3>Example of Update Dialog</h3>
-<p>Here is an example screen shot highlighting the areas discussed
-in the tips and workarounds. The example is from having started with
-just the base 3.1.2 Platform Feature installed.</p>
-<img alt"example view of update dialog" src="update2.gif" />
 
 </body>
 </html>
diff --git a/org.eclipse.wtp.releng.webupdatesite/WebContent/site.xml b/org.eclipse.wtp.releng.webupdatesite/WebContent/site.xml
index 192a937..035c95d 100644
--- a/org.eclipse.wtp.releng.webupdatesite/WebContent/site.xml
+++ b/org.eclipse.wtp.releng.webupdatesite/WebContent/site.xml
@@ -1,107 +1,216 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<site
-    mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/webtools/updates/site.xml&amp;format=xml&amp;protocol=http&amp;responseType=xml">
-    <description url="index.html">
-        The update site contains the features of the of Eclipse Web
-        Tools Project (WTP)
-    </description>
+<site digestURL="http://download.eclipse.org/webtools/updates/" mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/webtools/updates/site.xml&amp;format=xml" pack200="true">
+
+    <description url="index.html">The update site contains the features of the of Eclipse Web Tools Project (WTP)</description>
+    <!-- WTP BEGIN -->
+    <category-def label="Web Tools Platform (WTP)" name="Web Tools Platform (WTP)">
+        <description>This category contains the features of the Eclipse Web Tools Project (WTP). Note: this version of WTP requires the Eclipse Project 3.2 SDK and corresponding pre-reqs.</description>
+    </category-def>
+    <category-def label="Web Tools Platform (WTP) 1.0.x maintenance" name="Web Tools Platform (WTP) 1.0.x maintenance">
+        <description>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 label="Enabling Features" name="Enabling Features">
+        <description>
+            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>This category contains features providing function to use and develop Java Server Faces.</description>
+    </category-def>
+
+    <category-def label="EJB 3.0 Java Persistence (Dali JPA) -- Preview" name="EJB 3.0 Java Persistence (Dali JPA) -- Preview">
+        <description>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
+        name="Java EMF Model (JEM)"
+        label="Java EMF Model (JEM)">
+        <description>
+            This category contains the features of the JEM (Java EMF
+            Model).
+        </description>
+    </category-def>
+    <category-def
+        name="Graphical Editing Framework (GEF)"
+        label="Graphical Editing Framework (GEF)">
+        <description>
+            This category contains the features of the Graphical Editing
+            Framework.
+        </description>
+    </category-def>
+    <category-def
+        name="Eclipse Modeling Framework (EMF + SDO + XSD)"
+        label="Eclipse Modeling Framework (EMF + SDO + XSD)">
+        <description>
+            This category contains the features of the Eclipse Modeling
+            Framework, which includes EMF, SDO, and XSD: binaries,
+            source, plugins, and documentation.
+        </description>
+    </category-def>
+    <category-def
+        name="The Eclipse Project"
+        label="The Eclipse Project">
+        <description>
+            This category contains the features of Eclipse Project,
+            Platform, Java Development, and Plugin Development.
+        </description>
+    </category-def>
+
+
+
+
+    <!-- begin Version 1.5.x steram -->
+
+    <feature id="org.eclipse.wst" patch="false" url="features/org.eclipse.wst_1.5.0.v200606092300-U4T922yjOWsGK5Y.jar" version="1.5.0.v200606092300-U4T922yjOWsGK5Y">
+        <category name="Web Tools Platform (WTP)"/>
+    </feature>
+
+
+    <feature id="org.eclipse.jst" patch="false" url="features/org.eclipse.jst_1.5.0.v200606092300-kW-O_ysCRLJsxJt.jar" version="1.5.0.v200606092300-kW-O_ysCRLJsxJt">
+        <category name="Web Tools Platform (WTP)"/>
+    </feature>
+
+
+    <feature id="org.eclipse.wst.sdk" patch="false" url="features/org.eclipse.wst.sdk_1.5.0.v200606092300-24KsYkftnYYU8Om.jar" version="1.5.0.v200606092300-24KsYkftnYYU8Om">
+        <category name="Web Tools Platform (WTP)"/>
+    </feature>
+
+    <feature id="org.eclipse.jst.sdk" patch="false" url="features/org.eclipse.jst.sdk_1.5.0.v200606092300-dnUVLo09wQhiy4R.jar" version="1.5.0.v200606092300-dnUVLo09wQhiy4R">
+        <category name="Web Tools Platform (WTP)"/>
+    </feature>
+
+    <feature id="org.apache.commons_logging.feature" patch="false" url="features/org.apache.commons_logging.feature_1.0.4.v200606152055--08422828353873.jar" version="1.0.4.v200606152055--08422828353873">
+        <category name="Enabling Features"/>
+    </feature>
+
+    <feature id="org.apache.jakarta_log4j.feature" patch="false" url="features/org.apache.jakarta_log4j.feature_1.2.8.v200605300321--08422828353873.jar" version="1.2.8.v200605300321--08422828353873">
+        <category name="Enabling Features"/>
+    </feature>
+
+    <feature id="org.apache.xerces.feature" patch="false" 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" patch="false" url="features/org.eclipse.jst.jsf.feature_0.5.0.v20060622-OJnpNtoWR7O7OAA.jar" version="0.5.0.v20060622-OJnpNtoWR7O7OAA">
+        <category name="Java Server Faces (JSF) -- Preview"/>
+    </feature>
+
+    <feature id="org.eclipse.jst.jsf_sdk.feature" patch="false" url="features/org.eclipse.jst.jsf_sdk.feature_0.5.0.v20060622-fX45f__je9W9WII.jar" version="0.5.0.v20060622-fX45f__je9W9WII">
+        <category name="Java Server Faces (JSF) -- Preview"/>
+    </feature>
+
+    <feature id="org.eclipse.dali" patch="false" url="features/org.eclipse.dali_0.5.0.v200606200001--87cMN7N7cPMMMa.jar" version="0.5.0.v200606200001--87cMN7N7cPMMMa">
+        <category name="EJB 3.0 Java Persistence (Dali JPA) -- Preview"/>
+    </feature>
+
+    <!-- end Version 1.5.x steram -->
+
+
+
+    <!-- begin older, Version 1.0.x stream -->
+
     <feature
         url="features/org.eclipse.wst_1.0.0.jar"
         id="org.eclipse.wst"
         version="1.0.0">
-        <category name="Web Tools Platform (WTP)" />
+        <category name="Web Tools Platform (WTP) 1.0.x maintenance" />
     </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)" />
+        <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)" />
+        <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)" />
+        <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)" />
+        <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)" />
+        <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)" />
+        <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)" />
+        <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)" />
+        <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)" />
+        <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)" />
+        <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)" />
+        <category name="Web Tools Platform (WTP) 1.0.x maintenance" />
     </feature>
 
     <feature
-        url="features/org.eclipse.wst_1.0.3.v200607261500.jar"
+        url="features/org.eclipse.wst_1.0.3.v200607290745.jar"
         id="org.eclipse.wst"
-        version="1.0.3.v200607261500">
-        <category name="Web Tools Platform (WTP)" />
+        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.v200607261500.jar"
+        url="features/org.eclipse.jst_1.0.3.v200607290745.jar"
         id="org.eclipse.jst"
-        version="1.0.3.v200607261500">
-        <category name="Web Tools Platform (WTP)" />
+        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.v200607261500.jar"
+        url="features/org.eclipse.wst.sdk_1.0.3.v200607290745.jar"
         id="org.eclipse.wst.sdk"
-        version="1.0.3.v200607261500">
-        <category name="Web Tools Platform (WTP)" />
+        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.v200607261500.jar"
+        url="features/org.eclipse.jst.sdk_1.0.3.v200607290745.jar"
         id="org.eclipse.jst.sdk"
-        version="1.0.3.v200607261500">
-        <category name="Web Tools Platform (WTP)" />
+        version="1.0.3.v200607290745">
+        <category name="Web Tools Platform (WTP) 1.0.x maintenance" />
     </feature>
 
 
@@ -163,36 +272,22 @@
         version="3.1.1">
         <category name="The Eclipse Project" />
     </feature>
-    <feature
-        url="../../eclipse/updates/3.1/features/org.eclipse.rcp_3.1.1.jar"
-        id="org.eclipse.rcp"
-        version="3.1.1">
-        <category name="The Eclipse Project" />
-    </feature>
+
     <feature
         url="../../eclipse/updates/3.1/features/org.eclipse.jdt_3.1.1.jar"
         id="org.eclipse.jdt"
         version="3.1.1">
         <category name="The Eclipse Project" />
     </feature>
-    <feature
-        url="../../eclipse/updates/3.1/features/org.eclipse.platform_3.1.1.jar"
-        id="org.eclipse.platform"
-        version="3.1.1">
-        <category name="The Eclipse Project" />
-    </feature>
+
     <feature
         url="../../eclipse/updates/3.1/features/org.eclipse.jdt_3.1.2.jar"
         id="org.eclipse.jdt"
         version="3.1.2">
         <category name="The Eclipse Project" />
     </feature>
-    <feature
-        url="../../eclipse/updates/3.1/features/org.eclipse.platform_3.1.2.jar"
-        id="org.eclipse.platform"
-        version="3.1.2">
-        <category name="The Eclipse Project" />
-    </feature>
+
+
     <feature
         url="../../eclipse/updates/3.1/features/org.eclipse.pde_3.1.2.jar"
         id="org.eclipse.pde"
@@ -477,12 +572,8 @@
     <archive
         path="features/org.eclipse.jdt_3.1.2.jar"
         url="../../eclipse/updates/3.1/features/org.eclipse.jdt_3.1.2.jar" />
-    <archive
-        path="features/org.eclipse.platform_3.1.1.jar"
-        url="../../eclipse/updates/3.1/features/org.eclipse.platform_3.1.1.jar" />
-    <archive
-        path="features/org.eclipse.platform_3.1.2.jar"
-        url="../../eclipse/updates/3.1/features/org.eclipse.platform_3.1.2.jar" />
+
+
     <archive
         path="features/org.eclipse.pde_3.1.1.jar"
         url="../../eclipse/updates/3.1/features/org.eclipse.pde_3.1.1.jar" />
@@ -499,9 +590,6 @@
         path="features/org.wsdl4j.feature_1.4.0.jar"
         url="../../eclipse/updates/3.1/features/org.wsdl4j.feature_1.4.0.jar" />
     <archive
-        path="features/org.eclipse.rcp_3.1.1.jar"
-        url="../../eclipse/updates/3.1/features/org.eclipse.rcp_3.1.1.jar" />
-    <archive
         path="features/org.eclipse.rcp_3.1.2.jar"
         url="../../eclipse/updates/3.1/features/org.eclipse.rcp_3.1.2.jar" />
     <archive
@@ -660,15 +748,11 @@
     <archive
         path="plugins/org.eclipse.ltk.ui.refactoring_3.1.1.jar"
         url="../../eclipse/updates/3.1/plugins/org.eclipse.ltk.ui.refactoring_3.1.1.jar" />
-    <archive
-        path="plugins/org.eclipse.platform_3.1.1.jar"
-        url="../../eclipse/updates/3.1/plugins/org.eclipse.platform_3.1.1.jar" />
+
     <archive
         path="plugins/org.eclipse.osgi_3.1.2.jar"
         url="../../eclipse/updates/3.1/plugins/org.eclipse.osgi_3.1.2.jar" />
-    <archive
-        path="plugins/org.eclipse.platform_3.1.2.jar"
-        url="../../eclipse/updates/3.1/plugins/org.eclipse.platform_3.1.2.jar" />
+
     <archive
         path="plugins/org.eclipse.rcp.source.win32.win32.x86_3.1.1.jar"
         url="../../eclipse/updates/3.1/plugins/org.eclipse.rcp.source.win32.win32.x86_3.1.1.jar" />
@@ -912,45 +996,11 @@
     <archive
         path="plugins/org.eclipse.pde.junit.runtime_3.1.0.jar"
         url="../../eclipse/updates/3.1/plugins/org.eclipse.pde.junit.runtime_3.1.0.jar" />
-    <category-def
-        name="Web Tools Platform (WTP)"
-        label="Web Tools Platform (WTP)">
-        <description>
-            This category contains the features of the Eclipse Web Tools
-            Project (WTP).
-        </description>
-    </category-def>
-    <category-def
-        name="Java EMF Model (JEM)"
-        label="Java EMF Model (JEM)">
-        <description>
-            This category contains the features of the JEM (Java EMF
-            Model).
-        </description>
-    </category-def>
-    <category-def
-        name="Graphical Editing Framework (GEF)"
-        label="Graphical Editing Framework (GEF)">
-        <description>
-            This category contains the features of the Graphical Editing
-            Framework.
-        </description>
-    </category-def>
-    <category-def
-        name="Eclipse Modeling Framework (EMF + SDO + XSD)"
-        label="Eclipse Modeling Framework (EMF + SDO + XSD)">
-        <description>
-            This category contains the features of the Eclipse Modeling
-            Framework, which includes EMF, SDO, and XSD: binaries,
-            source, plugins, and documentation.
-        </description>
-    </category-def>
-    <category-def
-        name="The Eclipse Project"
-        label="The Eclipse Project">
-        <description>
-            This category contains the features of Eclipse Project,
-            Platform, Java Development, and Plugin Development.
-        </description>
-    </category-def>
+
+
+
+
+    <!-- end older, Version 1.0.x steram -->
+
+
 </site>
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/copyToRelease-code.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/copyToRelease-code.sh
index 206f2bb..c0c5cdb 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/copyToRelease-code.sh
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/copyToRelease-code.sh
@@ -3,7 +3,7 @@
 # script to copy update jars from their staging area to the releases area
 
 fromDir=$HOME/downloads/webtools/testUpdates
-toDir=$HOME/downloads/webtools/milestones
+toDir=$HOME/downloads/webtools/updates
 
 cp -f -p -r -v --update $fromDir/features --target-directory=$toDir/
 cp -f -p -r -v --update $fromDir/plugins  --target-directory=$toDir/
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/features-wtp.xml b/org.eclipse.wtp.releng.webupdatesite/build-home/features-wtp.xml
index 21d2a94..a79e4ff 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/features-wtp.xml
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/features-wtp.xml
@@ -3,68 +3,111 @@
     <target name="update">
 
         <property name="updateSite"
-                  value="file://${user.home}/downloads/webtools/committers/drops/R-1.5.0-200606281211/updateSite/" />
+                  value="file://${user.home}/downloads/webtools/holdForMaintenance/" />
         <echo message="   pulling update jars from ${updateSite}" />
         
-           
-        
         
         <ant antfile="updateMirrorProject.xml">
             <property name="featureId"
                       value="org.eclipse.wst" />
             <property name="version"
-                      value="1.5.0.v200606092300-U4T922yjOWsGK5Y" />
+                      value="1.0.0" />
         </ant>
         <ant antfile="updateMirrorProject.xml">
             <property name="featureId"
                       value="org.eclipse.jst" />
             <property name="version"
-                      value="1.5.0.v200606092300-kW-O_ysCRLJsxJt" />
+                      value="1.0.0" />
         </ant>
 
         <ant antfile="updateMirrorProject.xml">
             <property name="featureId"
                       value="org.eclipse.wst.sdk" />
             <property name="version"
-                      value="1.5.0.v200606092300-24KsYkftnYYU8Om" />
+                      value="1.0.0" />
         </ant>
         <ant antfile="updateMirrorProject.xml">
             <property name="featureId"
                       value="org.eclipse.jst.sdk" />
             <property name="version"
-                      value="1.5.0.v200606092300-dnUVLo09wQhiy4R" />
+                      value="1.0.0" />
+        </ant>
+        <ant antfile="updateMirrorProject.xml">
+            <property name="featureId"
+                      value="org.eclipse.wst" />
+            <property name="version"
+                      value="1.0.1.v200602130105" />
+        </ant>
+        <ant antfile="updateMirrorProject.xml">
+            <property name="featureId"
+                      value="org.eclipse.jst" />
+            <property name="version"
+                      value="1.0.1.v200602130105" />
         </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" />
+                      value="org.eclipse.wst.sdk" />
             <property name="version"
-                      value="1.0.4.v200606152055--08422828353873" />
+                      value="1.0.1.v200602130105" />
         </ant>
         <ant antfile="updateMirrorProject.xml">
             <property name="featureId"
-                      value="org.apache.jakarta_log4j.feature" />
+                      value="org.eclipse.jst.sdk" />
             <property name="version"
-                      value="1.2.8.v200605300321--08422828353873" />
+                      value="1.0.1.v200602130105" />
+        </ant>
+        
+        <ant antfile="updateMirrorProject.xml">
+            <property name="featureId"
+                      value="org.eclipse.wst" />
+            <property name="version"
+                      value="1.0.2.v200604280000" />
         </ant>
         <ant antfile="updateMirrorProject.xml">
             <property name="featureId"
-                      value="org.apache.xerces.feature" />
+                      value="org.eclipse.jst" />
             <property name="version"
-                      value="2.8.0.v200605151647--08422828353873" />
+                      value="1.0.2.v200604280000" />
         </ant>
-        
-        
+
+        <ant antfile="updateMirrorProject.xml">
+            <property name="featureId"
+                      value="org.eclipse.wst.sdk" />
+            <property name="version"
+                      value="1.0.2.v200604280000" />
+        </ant>
+        <ant antfile="updateMirrorProject.xml">
+            <property name="featureId"
+                      value="org.eclipse.jst.sdk" />
+            <property name="version"
+                      value="1.0.2.v200604280000" />
+        </ant>
+        <ant antfile="updateMirrorProject.xml">
+            <property name="featureId"
+                      value="org.eclipse.wst" />
+            <property name="version"
+                      value="1.0.3.v200607261500" />
+        </ant>
+        <ant antfile="updateMirrorProject.xml">
+            <property name="featureId"
+                      value="org.eclipse.jst" />
+            <property name="version"
+                      value="1.0.3.v200607261500" />
+        </ant>
+
+        <ant antfile="updateMirrorProject.xml">
+            <property name="featureId"
+                      value="org.eclipse.wst.sdk" />
+            <property name="version"
+                      value="1.0.3.v200607261500" />
+        </ant>
+        <ant antfile="updateMirrorProject.xml">
+            <property name="featureId"
+                      value="org.eclipse.jst.sdk" />
+            <property name="version"
+                      value="1.0.3.v200607261500" />
+        </ant>               
         
     </target>
 </project>
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllProjects.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllProjects.sh
index 68dd7c0..6ddca6d 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllProjects.sh
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllProjects.sh
@@ -4,37 +4,11 @@
 
 updateToolsDir=org.eclipse.wtp.releng.webupdatesite
 
-updateSite=$HOME/downloads/webtools/milestones
+updateSite=$HOME/downloads/webtools/testUpdates
  
 eclipseLocation=$HOME/eclipse-ppc-rc7
 
 
 
- if [ "$1" == "-clean" ] ; then
-
-	 echo "   Removing $updateSite/features/"
-	 rm -fr $updateSite/features/
-	
-	 echo "   Removing $updateSite/plugins/"
-	 rm -fr $updateSite/plugins/
-	
-	 echo "   Removing index and site xml files"
-	 rm -fr $updateSite/*
-	
-	 echo "   Updating index and web site files, but not site xml files (yet)"
-	    cp $HOME/$updateToolsDir/WebContent/index.html  $updateSite
-	    cp $HOME/$updateToolsDir/WebContent/*.jpg  $updateSite > /dev/null
-	    cp $HOME/$updateToolsDir/WebContent/*.gif  $updateSite > /dev/null
-	    cp -r $HOME/$updateToolsDir/WebContent/web $updateSite > /dev/null
-
- fi
-
-
  ant  -f updateMirrorAll.xml -DeclipseLocation=$eclipseLocation -DlocalUpdateSitePath=$updateSite
 
- # merge authored site.xml files with the most recent auto generated one
- ./runUpdateSiteXmlFiles.sh
-
- ant  -f createPack200s.xml     -Declipse.home=$eclipseLocation -DupdateSite=$updateSite
- ant  -f createDigests.xml      -Declipse.home=$eclipseLocation -DupdateSite=$updateSite
-
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateDigestPack.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateDigestPack.sh
new file mode 100644
index 0000000..8b5d426
--- /dev/null
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateDigestPack.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# script to run update, setting properties, for all projects
+
+updateToolsDir=org.eclipse.wtp.releng.webupdatesite
+
+updateSite=$HOME/downloads/webtools/updates
+ 
+eclipseLocation=$HOME/eclipse-ppc-R32
+
+
+
+ 
+# ant  -f createPack200s.xml     -Declipse.home=$eclipseLocation -DupdateSite=$updateSite
+ ant  -f createDigests.xml      -Declipse.home=$eclipseLocation -DupdateSite=$updateSite
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/updateMirrorAll.xml b/org.eclipse.wtp.releng.webupdatesite/build-home/updateMirrorAll.xml
index 6962aa0..7ce0238 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/updateMirrorAll.xml
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/updateMirrorAll.xml
@@ -7,8 +7,6 @@
 
     <target name="all" depends="init">
         <ant antfile="features-wtp.xml" />
-        <ant antfile="features-jsf.xml" />
-        <ant antfile="features-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">