tweaking download site
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 40d1456..0000000
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/callisto-features-wtp.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="update" default="update">
-    <target name="update">
-
-        <property name="updateSite"
-                  value="file:////home/data/users/david_williams/downloads/webtools/downloads/drops/R1.5/M-RC1.5.3-200702082048/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.3.v200701251935-X3Tn7ug44nfs8AE" />
-        </ant>
-        <ant antfile="updateMirrorProject.xml">
-            <property name="featureId"
-                      value="org.eclipse.jst" />
-            <property name="version"
-                      value="1.5.3.v200701251935-kW-NqztJbMj98Vy" />
-        </ant>
-
-        <ant antfile="updateMirrorProject.xml">
-            <property name="featureId"
-                      value="org.eclipse.wst.sdk" />
-            <property name="version"
-                      value="1.5.3.v200701251935-O2U9h5tjqRzyXdC" />
-        </ant>
-        <ant antfile="updateMirrorProject.xml">
-            <property name="featureId"
-                      value="org.eclipse.jst.sdk" />
-            <property name="version"
-                      value="1.5.3.v200701251935-dnUTzpmRSVGy2Rb" />
-        </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/runUpdateAllProjects.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllProjects.sh
index 60c1d4e..b93f6bd 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllProjects.sh
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllProjects.sh
@@ -10,7 +10,7 @@
 
 
  
-eclipseLocation=$HOME/eclipse-ppc-33M5
+eclipseLocation=$HOME/eclipse-ppc-33M6
 
 
 
@@ -34,12 +34,12 @@
  fi
 
 
- ant  -f updateCallistoMirrorAll.xml -DeclipseLocation=$eclipseLocation -DlocalUpdateSitePath=$updateSite
+ ant  -f updateCallistoMirrorAll.xml -Declipse.home=$eclipseLocation -DlocalUpdateSitePath=$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
- ant  -f createDigests.xml      -Declipse.home=$eclipseLocation -DupdateSite=$updateSite -DmainSiteFileName=$mainSiteFileName
+ #ant  -f createPack200s.xml     -Declipse.home=$eclipseLocation -DupdateSite=$updateSite
+ #ant  -f createDigests.xml      -Declipse.home=$eclipseLocation -DupdateSite=$updateSite -DmainSiteFileName=$mainSiteFileName
  
 
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/updateMirrorProject.xml b/org.eclipse.wtp.releng.webupdatesite/build-home/updateMirrorProject.xml
index 94ff247..964ff1b 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/updateMirrorProject.xml
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/updateMirrorProject.xml
@@ -1,40 +1,60 @@
 <?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 -->
+	<!-- 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="init" unless="initialized">
-        <ant antfile="init.xml" />
-    </target>
+	<target name="init" unless="initialized">
+		<ant antfile="init.xml" />
 
-    <target name="update" depends="init">
-        <echo message="Updating ${featureId} ${version}" />
-        <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="-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" />
+		<property name="java15-home" value="/home/data/users/david_williams/ibm-java2-ppc-50/jre" />
 
-        </java>
+		<property name="buildDirectory" value="${basedir}" />
+	</target>
 
-    </target>
+
+
+
+
+
+	<target name="update" depends="init">
+		<echo message="Updating ${featureId} ${version}" />
+
+		<java taskname="suiteUnitTest" 
+			 fork="true" 
+			 resultProperty="updateResult" 
+			 failonerror="false" 
+			 jvm="${java15-home}/bin/java" 
+			 classname="org.eclipse.equinox.launcher.Main">
+			<classpath>
+				<fileset dir="${eclipse.home}/eclipse/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" />
+
+		</java>
+
+	</target>
 </project>