tweaking download site
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/callisto-features-wtphold.xml b/org.eclipse.wtp.releng.webupdatesite/build-home/callisto-features-wtp.xml
similarity index 100%
rename from org.eclipse.wtp.releng.webupdatesite/build-home/callisto-features-wtphold.xml
rename to org.eclipse.wtp.releng.webupdatesite/build-home/callisto-features-wtp.xml
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/createDigests.xml b/org.eclipse.wtp.releng.webupdatesite/build-home/createDigests.xml
index 6037590..27e7947 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/createDigests.xml
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/createDigests.xml
@@ -1,22 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project basedir="." default="createDigest">
+<project
+    basedir="."
+    default="createDigest">
 
-    <target name="createDigest" depends="checkArgs">
+    <target
+        name="createDigest"
+        depends="checkArgs">
 
-        <property name="java15-home"
-                  value="/home/data/users/david_williams/ibm-java2-ppc-50/jre" />
-        <property name="buildDirectory"
-                  value="${basedir}" />
+        <property
+            name="java15-home"
+            value="/home/data/users/david_williams/ibm-java2-ppc-50/jre" />
+        <property
+            name="buildDirectory"
+            value="${basedir}" />
 
-        <java jar="${eclipse.home}/startup.jar"
-              fork="true"
-              jvm="${java15-home}/bin/java"
-              failonerror="true"
-              maxmemory="128m"
-              dir="${buildDirectory}">
+
+        <java
+            taskname="createDigestJob"
+            fork="true"
+            resultProperty="createDigestResult"
+            failonerror="true"
+            jvm="${java15-home}/bin/java"
+            classname="org.eclipse.equinox.launcher.Main"
+            maxmemory="128m"
+            dir="${buildDirectory}">
+            <classpath>
+                <fileset dir="${eclipse.home}/plugins">
+                    <include name="org.eclipse.equinox.launcher_*.jar" />
+                </fileset>
+            </classpath>
+
+
             <arg line="-debug -consolelog" />
-            <arg line="-application org.eclipse.update.core.siteOptimizer" />
-            <arg line="-digestBuilder -digestOutputDir=${updateSite} -siteXML=${updateSite}/${mainSiteFileName}" />
+            <arg
+                line="-application org.eclipse.update.core.siteOptimizer" />
+            <arg
+                line="-digestBuilder -digestOutputDir=${updateSite} -siteXML=${updateSite}/${mainSiteFileName}" />
         </java>
 
     </target>
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/createPack200s.xml b/org.eclipse.wtp.releng.webupdatesite/build-home/createPack200s.xml
index 411496f..0120364 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/createPack200s.xml
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/createPack200s.xml
@@ -1,25 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project basedir="." default="createPack200s">
+<project
+    basedir="."
+    default="createPack200s">
 
     <target name="createPack200s">
- 
-        <property name="java15-home"
-                  value="/home/data/users/david_williams/ibm-java2-ppc-50/jre" />
 
-        <property name="buildDirectory"
-                  value="${basedir}" />
+        <property
+            name="java15-home"
+            value="/home/data/users/david_williams/ibm-java2-ppc-50/jre" />
 
-        <java jar="${eclipse.home}/startup.jar"
-              fork="true"
-              jvm="${java15-home}/bin/java"
-              failonerror="true"
-              maxmemory="1024m"
-              dir="${buildDirectory}">
-            <arg line="-application org.eclipse.update.core.siteOptimizer" />
-            <arg line="-jarProcessor -verbose -outputDir ${updateSite} -pack ${updateSite}" />
+        <property
+            name="buildDirectory"
+            value="${basedir}" />
+
+        <java
+            taskname="createDigestJob"
+            fork="true"
+            resultProperty="createDigestResult"
+            failonerror="true"
+            jvm="${java15-home}/bin/java"
+            classname="org.eclipse.equinox.launcher.Main"
+            maxmemory="2048m"
+            dir="${buildDirectory}">
+            <classpath>
+                <fileset dir="${eclipse.home}/plugins">
+                    <include name="org.eclipse.equinox.launcher_*.jar" />
+                </fileset>
+            </classpath>
+            <arg
+                line="-application org.eclipse.update.core.siteOptimizer" />
+            <arg
+                line="-jarProcessor -verbose -outputDir ${updateSite} -pack ${updateSite}" />
         </java>
     </target>
-    
+
     <target name="checkArgs">
         <fail message="eclipse.home and updateSite must be set.">
             <condition>
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/updateMirrorProject.xml b/org.eclipse.wtp.releng.webupdatesite/build-home/updateMirrorProject.xml
index 2de90ac..07ac84c 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/updateMirrorProject.xml
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/updateMirrorProject.xml
@@ -19,7 +19,7 @@
 	<target name="update" depends="init">
 		<echo message="Updating ${featureId} ${version}" />
 
-		<java taskname="suiteUnitTest" 
+		<java taskname="updateJob" 
 			 fork="true" 
 			 resultProperty="updateResult" 
 			 failonerror="false"