diff --git a/org.eclipse.wtp.releng.webupdatesite/WebContent/siteWTPCallisto.xml b/org.eclipse.wtp.releng.webupdatesite/WebContent/siteWTPCallisto.xml
index ea7d39f..57e7d02 100644
--- a/org.eclipse.wtp.releng.webupdatesite/WebContent/siteWTPCallisto.xml
+++ b/org.eclipse.wtp.releng.webupdatesite/WebContent/siteWTPCallisto.xml
@@ -1,105 +1,164 @@
 <?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"
--->
-   <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>
+<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 url="features/org.eclipse.wst_1.5.3.v200701251935-X3Tn7ug44nfs8AE.jar" id="org.eclipse.wst" version="1.5.3.v200701251935-X3Tn7ug44nfs8AE">
-      <category name="Web Tools Platform (WTP)" />
-   </feature>
+    <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 url="features/org.eclipse.jst_1.5.3.v200701251935-kW-NqztJbMj98Vy.jar" id="org.eclipse.jst" version="1.5.3.v200701251935-kW-NqztJbMj98Vy">
-      <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 url="features/org.eclipse.wst.sdk_1.5.3.v200701251935-O2U9h5tjqRzyXdC.jar" id="org.eclipse.wst.sdk" version="1.5.3.v200701251935-O2U9h5tjqRzyXdC">
-      <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 url="features/org.eclipse.jst.sdk_1.5.3.v200701251935-dnUTzpmRSVGy2Rb.jar" id="org.eclipse.jst.sdk" version="1.5.3.v200701251935-dnUTzpmRSVGy2Rb">
-      <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 url="features/org.eclipse.jem_1.5.3.v200701251935-O2U9h5tjqRzyXdC.jar" id="org.eclipse.jem" version="1.5.3.v200701251935-O2U9h5tjqRzyXdC">
-      <category name="Web Tools Platform (WTP)" />
-   </feature>
+    <feature
+        id="org.eclipse.jem"
+        url="features/org.eclipse.jem_1.2.4.v200704181020--6zXJK0L0SE3a95.jar"
+        version="1.2.4.v200704181020--6zXJK0L0SE3a95">
+        <category name="Web Tools Platform (WTP)" />
+    </feature>
 
-   <feature url="features/org.eclipse.jem.sdk_1.5.3.v200701251935-dnUTzpmRSVGy2Rb.jar" id="org.eclipse.jem.sdk" version="1.5.3.v200701251935-dnUTzpmRSVGy2Rb">
-      <category name="Web Tools Platform (WTP)" />
-   </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="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" version="1.0.4.v200606152055--0842282_233879">
-      <category name="Enabling Features" />
-   </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 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
+        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" version="2.8.0.v200605151647--08422828353873">
-      <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 url="features/org.eclipse.jst.jsf.feature_0.5.1.v20060829-OJnpNuKYI7O7SAU.jar" id="org.eclipse.jst.jsf.feature" version="0.5.1.v20060829-OJnpNuKYI7O7SAU">
-      <category name="Java Server Faces (JSF) -- Preview" />
-   </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 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
+        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.dali_0.5.0.v200606200001--87cMN7N7cPMMMa.jar" id="org.eclipse.dali" version="0.5.0.v200606200001--87cMN7N7cPMMMa">
-      <category name="EJB 3.0 Java Persistence (Dali JPA) -- 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.0.v20060530_RC2--ZasJzJJez.jar"
-        version="1.2.0.v20060530_RC2--ZasJzJJez">
+        url="features/org.eclipse.jem_1.2.4.v200704181020--6zXJK0L0SE3a95.jar"
+        version="1.2.4.v200704181020--6zXJK0L0SE3a95">
         <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">
-      <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="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 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>
+    <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 name="Java Server Faces (JSF) -- Preview" label="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="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 name="Web Tools Platform (WTP)" label="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="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).
+            Model creation and manipulation frameworks (e.g. EMF, GMF)
+            and specific models (SDO, JEM, XSD Infoset).
         </description>
     </category-def>