pick up minor changes to head versions (so "real" differences appearent).
diff --git a/releng.wtpbuilder/.settings/org.eclipse.core.resources.prefs b/releng.wtpbuilder/.settings/org.eclipse.core.resources.prefs
index c8361d7..4255818 100644
--- a/releng.wtpbuilder/.settings/org.eclipse.core.resources.prefs
+++ b/releng.wtpbuilder/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,3 @@
-#Tue Apr 25 23:14:35 EDT 2006
+#Sun Apr 30 15:22:25 EDT 2006
 eclipse.preferences.version=1
 encoding/<project>=ISO-8859-1
diff --git a/releng.wtpbuilder/build.properties b/releng.wtpbuilder/build.properties
index bf335bb..24b7fb1 100644
--- a/releng.wtpbuilder/build.properties
+++ b/releng.wtpbuilder/build.properties
@@ -131,7 +131,7 @@
 # being used (JDT Compiler, in our case).
 # 'showversion' causes the version of JDT Compiler to be 
 # printed to the compiler log file. 
-compilerArg=-showversion -warn:-discouraged,serial,unusedImport
+compilerArg=-showversion -encoding ISO-8859-1 -warn:-discouraged,serial,unusedImport
 
 
 #############################################################
diff --git a/releng.wtpbuilder/components/jst-sdk/customTargets.xml b/releng.wtpbuilder/components/jst-sdk/customTargets.xml
index d8bcc04..9c55ca5 100644
--- a/releng.wtpbuilder/components/jst-sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/jst-sdk/customTargets.xml
@@ -193,9 +193,12 @@
 
 
         <!-- create zipped up versions for update site -->
+        <!-- removing for now, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=139268
+  
         <property name="UpdateSiteStagingLocation"
-                  value="${buildDirectory}/${buildLabel}/updateSite" />
+            value="${buildDirectory}/${buildLabel}/updateSite" />
         <antcall target="generateUpdateSite" />
+        -->
     </target>
 
     <target name="generateUpdateSite">
diff --git a/releng.wtpbuilder/components/jst.tests/customTargets.xml b/releng.wtpbuilder/components/jst.tests/customTargets.xml
index 9dca1d7..cfce0d3 100644
--- a/releng.wtpbuilder/components/jst.tests/customTargets.xml
+++ b/releng.wtpbuilder/components/jst.tests/customTargets.xml
@@ -178,9 +178,12 @@
     <target name="postBuild">
 
         <!-- create zipped up versions for update site -->
+        <!-- removing for now, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=139268
+  
         <property name="UpdateSiteStagingLocation"
-                  value="${buildDirectory}/${buildLabel}/updateSite" />
+            value="${buildDirectory}/${buildLabel}/updateSite" />
         <antcall target="generateUpdateSite" />
+ 		-->
     </target>
 
     <target name="generateUpdateSite">
diff --git a/releng.wtpbuilder/components/jst/customTargets.xml b/releng.wtpbuilder/components/jst/customTargets.xml
index 1efc537..b3661ea 100644
--- a/releng.wtpbuilder/components/jst/customTargets.xml
+++ b/releng.wtpbuilder/components/jst/customTargets.xml
@@ -183,9 +183,12 @@
 
 
         <!-- create zipped up versions for update site -->
+        <!-- removing for now, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=139268
+  
         <property name="UpdateSiteStagingLocation"
-                  value="${buildDirectory}/${buildLabel}/updateSite" />
+            value="${buildDirectory}/${buildLabel}/updateSite" />
         <antcall target="generateUpdateSite" />
+        -->
     </target>
 
     <target name="generateUpdateSite">
diff --git a/releng.wtpbuilder/components/wst-sdk/customTargets.xml b/releng.wtpbuilder/components/wst-sdk/customTargets.xml
index 20c7505..abdeeda 100644
--- a/releng.wtpbuilder/components/wst-sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/wst-sdk/customTargets.xml
@@ -174,9 +174,11 @@
     <!-- ===================================================================== -->
     <target name="postBuild">
         <!-- create zipped up versions for update site -->
+        <!-- removing for now, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=139268
         <property name="UpdateSiteStagingLocation"
-                  value="${buildDirectory}/${buildLabel}/updateSite" />
+            value="${buildDirectory}/${buildLabel}/updateSite" />
         <antcall target="generateUpdateSite" />
+        -->
     </target>
 
     <target name="generateUpdateSite">
diff --git a/releng.wtpbuilder/components/wst.tests/customTargets.xml b/releng.wtpbuilder/components/wst.tests/customTargets.xml
index 9a8e96c..86c3342 100644
--- a/releng.wtpbuilder/components/wst.tests/customTargets.xml
+++ b/releng.wtpbuilder/components/wst.tests/customTargets.xml
@@ -167,9 +167,12 @@
     <!-- ===================================================================== -->
     <target name="postBuild">
         <!-- create zipped up versions for update site -->
+        <!-- removing for now, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=139268
+  
         <property name="UpdateSiteStagingLocation"
                   value="${buildDirectory}/${buildLabel}/updateSite" />
         <antcall target="generateUpdateSite" />
+        -->
     </target>
 
     <target name="generateUpdateSite">
diff --git a/releng.wtpbuilder/components/wst/customTargets.xml b/releng.wtpbuilder/components/wst/customTargets.xml
index 4181f10..83c7814 100644
--- a/releng.wtpbuilder/components/wst/customTargets.xml
+++ b/releng.wtpbuilder/components/wst/customTargets.xml
@@ -173,9 +173,11 @@
     <!-- ===================================================================== -->
     <target name="postBuild">
         <!-- create zipped up versions for update site -->
+        <!-- removing for now, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=139268
         <property name="UpdateSiteStagingLocation"
-           value="${buildDirectory}/${buildLabel}/updateSite" />
+            value="${buildDirectory}/${buildLabel}/updateSite" />
         <antcall target="generateUpdateSite" />
+ 	    -->
     </target>
 
     <target name="generateUpdateSite">
diff --git a/releng.wtpbuilder/distribution/wtp.upload/build.xml b/releng.wtpbuilder/distribution/wtp.upload/build.xml
index 3e294cd..4385bd9 100644
--- a/releng.wtpbuilder/distribution/wtp.upload/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.upload/build.xml
@@ -1 +1 @@
-<project default="push" basedir=".">
    
    <target name="push" depends="sync">
        <condition property="doTrial">
            <equals arg1="${build.trial}" arg2="true" />
        </condition>
    </target>
    
    <target name="sync" unless="doTrial">
        
        <!-- if this upload properties file hasn't been set yet, we will provide this fallback file -->
        <!-- but, since these properties are machine and user sensitive, its better if set "outside" wtpbuilder, 
               such as in releng.builder -->
        <property name="wtpbuilder.upload.properties.file"
                  value="${basedir}/fallback.upload.properties" />
        
        <property file="${wtpbuilder.upload.properties.file}" />
        
        
        <ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
        <property file="${buildDirectory}/label.properties" />
     

	    <!-- synch on host is a tiny bit faster if permisions already set -->
	    <!-- first set main directory -->
	    <chmod dir="${buildDirectory}/${buildLabel}" perm="o+rx" verbose="true"/>
	    <!-- next all directories under main directory -->
	    <chmod dir="${buildDirectory}/${buildLabel}" perm="o+rx" verbose="true">
	        <dirset dir="${buildDirectory}/${buildLabel}/**" />
	    </chmod>
	    <!-- now all files (notice just o+r needed) -->
	    <chmod dir="${buildDirectory}/${buildLabel}" perm="o+r" verbose="true">
	        <fileset dir="${buildDirectory}/${buildLabel}/**">
	            <include name="**/*"/>
	        </fileset>
	    </chmod>


        <echo message="RSYNC to: ${uploadRemoteDirectory}/${buildLabel}" />
        <exec executable="rsync">
            <arg line="-e ssh -Cavz ${rsyncRootPrefix}${buildDirectory}/${buildLabel} ${uploadUser}@${uploadServer}:${uploadRemoteDirectory}" />
        </exec>
    </target>
    
</project>
+<project default="push" basedir=".">

    <target name="push" depends="sync">
        <condition property="doTrial">
            <equals arg1="${build.trial}" arg2="true" />
        </condition>
    </target>

    <target name="sync" unless="doTrial">

        <!-- if this upload properties file hasn't been set yet, we will provide this fallback file -->
        <!-- but, since these properties are machine and user sensitive, its better if set "outside" wtpbuilder, 
               such as in releng.builder -->
        <property name="wtpbuilder.upload.properties.file"
                  value="${basedir}/fallback.upload.properties" />

        <property file="${wtpbuilder.upload.properties.file}" />


        <ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
        <property file="${buildDirectory}/label.properties" />

        <!-- synch on host is a tiny bit faster if permisions already set -->
        <!-- first set main directory -->
        <chmod dir="${buildDirectory}/${buildLabel}"
               perm="o+rx"
               verbose="true" />
        <!-- next all directories under main directory -->
        <chmod dir="${buildDirectory}/${buildLabel}"
               perm="o+rx"
               verbose="true">
            <dirset dir="${buildDirectory}/${buildLabel}/**" />
        </chmod>
        <!-- now all files (notice just o+r needed) -->
        <chmod dir="${buildDirectory}/${buildLabel}"
               perm="o+r"
               verbose="true">
            <fileset dir="${buildDirectory}/${buildLabel}/**">
                <include name="**/*" />
            </fileset>
        </chmod>



        <echo message="RSYNC to: ${uploadRemoteDirectory}/${buildLabel}" />

        <exec executable="rsync">
            <arg line="-e ssh -Cavz ${rsyncRootPrefix}${buildDirectory}/${buildLabel} ${uploadUser}@${uploadServer}:${uploadRemoteDirectory}" />
        </exec>
    </target>

</project>
diff --git a/releng.wtpbuilder/distribution/wtp.upload/fallback.upload.properties b/releng.wtpbuilder/distribution/wtp.upload/fallback.upload.properties
index c4df5f5..ab3917b 100644
--- a/releng.wtpbuilder/distribution/wtp.upload/fallback.upload.properties
+++ b/releng.wtpbuilder/distribution/wtp.upload/fallback.upload.properties
@@ -1,5 +1,5 @@
 uploadUser=ndai
-uploadPassword=This is not really used
+uploadPassword="This is not really used since ssh login is assumed (required)"
 uploadServer=download1.eclipse.org
 uploadRemoteDirectory=/home/data/users/ndai/downloads/webtools/committers/drops
 
diff --git a/releng.wtpbuilder/distribution/wtp.whatisfixed/build.properties b/releng.wtpbuilder/distribution/wtp.whatisfixed/build.properties
index 9ab334d..62a6461 100644
--- a/releng.wtpbuilder/distribution/wtp.whatisfixed/build.properties
+++ b/releng.wtpbuilder/distribution/wtp.whatisfixed/build.properties
@@ -11,7 +11,7 @@
 #whatisfixed.to.date=
 #whatisfixed.toBuildId=
 
-# This is not used due to wierd behavios by cvs rlog 
+# This is not used due to wierd behavior by cvs rlog 
 #whatisfixed.to.branch
 
 # What is fixed list will only include bugs targeted to these
diff --git a/releng.wtpbuilder/scripts/whatisfixed/build.xml b/releng.wtpbuilder/scripts/whatisfixed/build.xml
index e1f0a33..6e8b4f9 100644
--- a/releng.wtpbuilder/scripts/whatisfixed/build.xml
+++ b/releng.wtpbuilder/scripts/whatisfixed/build.xml
@@ -33,7 +33,9 @@
 
 		<java taskname="cvsbugz" classpathref="rlog.path" fork="true" classname="org.eclipse.wtp.releng.cvslog.tools.Main" failonerror="false">
 			<jvmarg value="-Xms128m" />
-			<jvmarg value="-Xmx512m" />
+			<jvmarg value="-Xmx1024m" />
+			<jvmarg value="-Xcompactgc" />
+			
 			<arg value="${mapCvsRoot}" />
 			<arg value="${whatisfixed.since.date}" />
 			<arg value="${whatisfixed.to.date}" />