### Eclipse Workspace Patch 1.0
#P org.eclipse.releng.eclipsebuilder
Index: buildAll.xml
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/buildAll.xml,v
retrieving revision 1.334.2.10
diff -u -r1.334.2.10 buildAll.xml
--- buildAll.xml	22 Jul 2010 17:07:20 -0000	1.334.2.10
+++ buildAll.xml	27 Sep 2010 15:45:48 -0000
@@ -29,10 +29,10 @@
 	<property name="base.builder" value="${basedir}/../org.eclipse.releng.basebuilder" />
 
 	<!--location of properties file containing last tag used for integration build-->
-	<property name="mapTag.properties" value="/home/users/releng/buildTools/eclipse36/mapTag.properties" />
+	<property name="mapTag.properties" value="/home/users/releng/buildTools/eclipse37/mapTag.properties" />
 
 	<!--location of properties file containing last performance reference test information-->
-	<property name="ref.properties" value="/home/users/releng/buildTools/eclipse.perf/ref36.properties" />
+	<property name="ref.properties" value="/home/users/releng/buildTools/eclipse.perf/ref37.properties" />
 
 	<!--location of test update site-->
 	<property file="${ref.properties}" />
@@ -138,6 +138,7 @@
 		</condition>
 		<property name="p2RepoURL" value="${p2repoN}" />
 		<property name="org.eclipse.equinox.p2.tests.current.build.repo" value="${p2RepoURL}/${buildId}" />
+		<property name="org.eclipse.equinox.p2.tests.last.release.build.repo" value="${p2repopreviousR}" />
 		<property name="previousPlatformZips" value="${buildDirectory}/previousPlatformZips" />
 		<mkdir dir="${previousPlatformZips}" />
 	</target>
@@ -409,19 +410,19 @@
 		<property name="report" value="${postingDirectory}/${buildLabel}/apitools" />
 		<mkdir dir="${report}" />
 		<property name="current_location" value="${postingDirectory}/${buildLabel}/eclipse-SDK-${buildId}-win32.zip" />
-		<property name="reference_location" value="${reference}/eclipse-SDK-3.5M6-win32.zip" />
+		<!--		<property name="reference_location" value="${reference}/eclipse-SDK-3.5M6-win32.zip" />
 		<exec executable="/usr/bin/wget" dir="${reference}" output="${reference}/error.txt" failonerror="false" os="Linux">
-			<arg line="-q -O  ${reference_location} http://archive.eclipse.org/eclipse/downloads/drops/S-3.6M6-201003121448/eclipse-SDK-3.6M6-win32.zip" />
-		</exec>
-		<property name="report" value="${postingDirectory}/${buildLabel}/apitools" />
+			<arg line="-q -O  ${reference_location} http://${localmirror}/eclipse/downloads/drops/S-3.6M6-201003121448/eclipse-SDK-3.6M6-win32.zip" />
+		</exec> -->
+		<!--	<property name="report" value="${postingDirectory}/${buildLabel}/apitools" />
 		<mkdir dir="${report}" />
 		<property name="report_location" value="${report}/report.xml" />
 		<property name="report_html_location" value="${report}/reporthtml" />
 		<property name="exclude_list_location" value="${buildDirectory}/maps/org.eclipse.releng/apiexclude/exclude_list.txt" />
 		<property name="exclude_list_external_location" value="${buildDirectory}/maps/org.eclipse.releng/apiexclude/exclude_list_external.txt" />
-		<apitooling.apifreeze baseline="${reference_location}" profile="${current_location}" report="${report_location}" excludelist="${exclude_list_location}" debug="true" />
+		<apitooling.apifreeze baseline="${reference_location}" profile="${current_location}" report="${report_location}" excludelist="${exclude_list_location}" debug="true" /> -->
 		<!-- html report will be dumped at the same location as the xml report -->
-		<apitooling.apifreeze_reportconversion xmlfile="${report_location}" debug="true" />
+		<!--	<apitooling.apifreeze_reportconversion xmlfile="${report_location}" debug="true" /> -->
 		<property name="filter_store" value="${buildDirectory}/apifilters" />
 		<mkdir dir="${filter_store}" />
 		<property name="exclude_list_external_location" value="${buildDirectory}/maps/org.eclipse.releng/apiexclude/exclude_list_external.txt" />
@@ -435,12 +436,20 @@
 		</exec>
 		<property name="html_directory_location" value="${report}/apitoolsverifications/html" />
 		<property name="report_directory_location" value="${report}/apitoolsverifications/xml" />
-		<property name="3_5_reference_location" value="${reference}/eclipse-SDK-3.5.2-win32.zip" />
+		<property name="3_6_reference_location" value="${reference}/eclipse-SDK-3.6-win32.zip" />
 		<exec executable="/usr/bin/wget" dir="${reference}" output="${reference}/error.txt" failonerror="false" os="Linux">
-			<arg line="-q -O  ${3_5_reference_location} http://${localmirror}/eclipse/downloads/drops/R-3.5.2-201002111343/eclipse-SDK-3.5.2-win32.zip" />
+			<arg line="-q -O  ${3_6_reference_location} http://${localmirror}/eclipse/downloads/drops/R-3.6-201006080911/eclipse-SDK-3.6-win32.zip" />
 		</exec>
-		<apitooling.analysis baseline="${3_5_reference_location}" profile="${current_location}" report="${report_directory_location}" filters="${filter_store}" excludelist="${exclude_list_external_location}" debug="true" />
+		<apitooling.analysis baseline="${3_6_reference_location}" profile="${current_location}" report="${report_directory_location}" filters="${filter_store}" excludelist="${exclude_list_external_location}" debug="true" />
+
 		<apitooling.analysis_reportconversion xmlfiles="${report_directory_location}" debug="true" htmlfiles="${html_directory_location}" />
+		<!--check for api deprecation in comparison with previous release -->
+
+		<property name="api_deprecation_report" value="${report}/apitoolsdeprecations/apideprecation.xml" />
+		<property name="api_deprecation_html" value="${report}/apitoolsdeprecations/apideprecation.html" />
+		<apitooling.apideprecation baseline="${3_6_reference_location}" profile="${current_location}" report="${api_deprecation_report}" debug="true" />
+		<apitooling.apideprecation_reportconversion xmlfile="${api_deprecation_report}" debug="true" htmlfile="${api_deprecation_html}" />
+
 		<property name="equinox_api_report" value="${equinoxPostingDirectory}/${buildLabel}/apitools" />
 		<mkdir dir="${equinox_api_report}" />
 		<copy todir="${equinox_api_report}">
@@ -451,13 +460,14 @@
 				<include name="index.html" />
 			</fileset>
 		</copy>
+		<copy todir="${equinox_api_report}" file="${api_deprecation_html}" />
 	</target>
 
 	<target name="publishEclipse">
 		<parallel>
-			<!-- <ant antfile="eclipse/helper.xml" target="rSyncWithSnzZrh" /> -->
+			<ant antfile="eclipse/helper.xml" target="rSyncWithSnzZrh" />
 			<sequential>
-				<!--	<ant antfile="eclipse/helper.xml" target="buildStandAloneSWT" /> -->
+				<ant antfile="eclipse/helper.xml" target="buildStandAloneSWT" />
 				<ant antfile="eclipse/helper.xml" target="publish" />
 			</sequential>
 		</parallel>
@@ -532,7 +542,6 @@
 			<config os="win32" ws="win32" arch="x86_64" />
 			<config os="linux" ws="gtk" arch="x86" />
 			<config os="linux" ws="gtk" arch="x86_64" />
-			<!-- <config os="linux" ws="gtk" arch="ppc" /> -->
 			<config os="linux" ws="gtk" arch="ppc64" />
 			<!--<config os="linux" ws="motif" arch="x86" /> 
 			<config os="linux" ws="gtk" arch="s390x" />
@@ -670,6 +679,16 @@
 			<fileset file="${eclipse.build.configs}/../../extras/sdkinstaller.properties" />
 		</copy>
 
+		<!--mirror JUnit test bundles and test framework bundles to the repo -->
+		<p2.mirror source="file://${buildDirectory}/buildRepoTests" ignoreErrors="true">
+			<destination compressed="true" name="${p2.repo.name}" location="file:${buildRepo}" append="true" format="file:${reposource}" />
+			<comparator comparator="org.eclipse.equinox.p2.repository.tools.jar.comparator" comparatorLog="${buildlogs}/comparatorlogtests.txt">
+				<repository location="${repoBaseline}" />
+			</comparator>
+			<iu id="org.eclipse.sdk.tests.feature.group" version="" />
+			<iu id="org.eclipse.test.feature.group" version="" />
+		</p2.mirror>
+
 		<!--try create composite repository-->
 		<p2.composite.artifact.repository.create location="file://${updateSite}" name="${p2.repo.name}" compressed="true" failOnExists="false" />
 		<p2.composite.metadata.repository.create location="file://${updateSite}" name="${p2.repo.name}" compressed="true" failOnExists="false" />
Index: eclipse/buildConfigs/master/build.properties
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/master/build.properties,v
retrieving revision 1.53
diff -u -r1.53 build.properties
--- eclipse/buildConfigs/master/build.properties	28 May 2010 15:37:16 -0000	1.53
+++ eclipse/buildConfigs/master/build.properties	27 Sep 2010 15:45:48 -0000
@@ -37,7 +37,6 @@
 	win32, win32, x86_64 &\
 	wce_ppc, win32, arm &\
 	linux, gtk, x86 & \
-	linux, gtk, ppc & \
 	linux, gtk, ppc64 & \
 	linux, gtk, x86_64 &\
 	linux, gtk, s390x &\
@@ -72,5 +71,5 @@
 skipMaps=false
 mapsRepo=${mapsRepo}
 mapsRoot=org.eclipse.releng
-mapsCheckoutTag=HEAD
+mapsCheckoutTag=${mapVersionTag}
 mapsTagTag=v${buildId}
Index: eclipse/buildConfigs/master/customTargets.xml
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/master/customTargets.xml,v
retrieving revision 1.49
diff -u -r1.49 customTargets.xml
--- eclipse/buildConfigs/master/customTargets.xml	19 Apr 2010 18:57:01 -0000	1.49
+++ eclipse/buildConfigs/master/customTargets.xml	27 Sep 2010 15:45:48 -0000
@@ -35,7 +35,7 @@
 	<!-- ===================================================================== -->
 
 	<target name="getMapFiles" depends="checkLocalMaps" unless="skipMaps">
-		<property name="mapsCheckoutTag" value="HEAD" />
+		<property name="mapsCheckoutTag" value="${mapVersionTag}" />
 		<cvs cvsRoot="${mapsRepo}" package="${mapsRoot}" dest="${buildDirectory}/maps" tag="${mapsCheckoutTag}" />
 	</target>
 
@@ -162,12 +162,12 @@
 		</copy>
 
 		<!--copy linux gtk ppc about_files to in temp location where it will be copied into root of eclipse at assembly time-->
-		<property name="linux.gtk.ppc.rootfiles" value="${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.ppc" />
-		<mkdir dir="${linux.gtk.ppc.rootfiles}" />
-		<copy tofile="${linux.gtk.ppc.rootfiles}/about.html" file="${buildDirectory}/plugins/org.eclipse.swt.gtk.linux.ppc/about.html" />
+		<property name="linux.gtk.ppc64.rootfiles" value="${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.ppc64" />
+		<mkdir dir="${linux.gtk.ppc64.rootfiles}" />
+		<copy tofile="${linux.gtk.ppc64.rootfiles}/about.html" file="${buildDirectory}/plugins/org.eclipse.swt.gtk.linux.ppc64/about.html" />
 
-		<copy todir="${linux.gtk.ppc.rootfiles}">
-			<fileset dir="${buildDirectory}/plugins/org.eclipse.swt.gtk.linux.ppc" includes="about_files/**" />
+		<copy todir="${linux.gtk.ppc64.rootfiles}">
+			<fileset dir="${buildDirectory}/plugins/org.eclipse.swt.gtk.linux.ppc64" includes="about_files/**" />
 		</copy>
 	</target>
 
Index: eclipse/buildConfigs/master/example_customTargets.xml
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/master/example_customTargets.xml,v
retrieving revision 1.2
diff -u -r1.2 example_customTargets.xml
--- eclipse/buildConfigs/master/example_customTargets.xml	19 Apr 2010 18:57:00 -0000	1.2
+++ eclipse/buildConfigs/master/example_customTargets.xml	27 Sep 2010 15:45:48 -0000
@@ -35,7 +35,7 @@
 	<!-- ===================================================================== -->
 
 	<target name="getMapFiles" depends="checkLocalMaps" unless="skipMaps">
-		<property name="mapsCheckoutTag" value="HEAD" />
+		<property name="mapsCheckoutTag" value="${mapVersionTag}" />
 		<cvs cvsRoot="${mapsRepo}" package="${mapsRoot}" dest="${buildDirectory}/maps" tag="${mapsCheckoutTag}" />
 	</target>
 
@@ -162,12 +162,12 @@
 		</copy>
 
 		<!--copy linux gtk ppc about_files to in temp location where it will be copied into root of eclipse at assembly time-->
-		<property name="linux.gtk.ppc.rootfiles" value="${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.ppc" />
-		<mkdir dir="${linux.gtk.ppc.rootfiles}" />
-		<copy tofile="${linux.gtk.ppc.rootfiles}/about.html" file="${buildDirectory}/plugins/org.eclipse.swt.gtk.linux.ppc/about.html" />
+		<property name="linux.gtk.ppc64.rootfiles" value="${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.ppc64" />
+		<mkdir dir="${linux.gtk.ppc64.rootfiles}" />
+		<copy tofile="${linux.gtk.ppc64.rootfiles}/about.html" file="${buildDirectory}/plugins/org.eclipse.swt.gtk.linux.ppc64/about.html" />
 
-		<copy todir="${linux.gtk.ppc.rootfiles}">
-			<fileset dir="${buildDirectory}/plugins/org.eclipse.swt.gtk.linux.ppc" includes="about_files/**" />
+		<copy todir="${linux.gtk.ppc64.rootfiles}">
+			<fileset dir="${buildDirectory}/plugins/org.eclipse.swt.gtk.linux.ppc64" includes="about_files/**" />
 		</copy>
 	</target>
 
Index: eclipse/buildConfigs/org.eclipse.equinox.executable/build.properties
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/org.eclipse.equinox.executable/build.properties,v
retrieving revision 1.18
diff -u -r1.18 build.properties
--- eclipse/buildConfigs/org.eclipse.equinox.executable/build.properties	19 May 2010 13:52:49 -0000	1.18
+++ eclipse/buildConfigs/org.eclipse.equinox.executable/build.properties	27 Sep 2010 15:45:48 -0000
@@ -24,7 +24,6 @@
 configs=win32, win32, x86 &\
 	win32, win32, x86_64 &\
 	linux, gtk, x86 & \
-	linux, gtk, ppc & \
 	linux, gtk, ppc64 & \
 	linux, gtk, x86_64 &\
 	linux, gtk, s390x &\
Index: eclipse/buildConfigs/rcp.config/build.properties
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/rcp.config/build.properties,v
retrieving revision 1.18
diff -u -r1.18 build.properties
--- eclipse/buildConfigs/rcp.config/build.properties	19 May 2010 13:52:49 -0000	1.18
+++ eclipse/buildConfigs/rcp.config/build.properties	27 Sep 2010 15:45:48 -0000
@@ -20,11 +20,8 @@
 
 root.linux.gtk.x86=absolute:${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.x86,absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/gtk/linux/x86
 root.linux.gtk.x86.permissions.755=*.so*
-root.linux.gtk.ppc=absolute:${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.ppc,absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/gtk/linux/ppc
-root.linux.gtk.ppc.permissions.755=*.so*
 root.linux.gtk.ppc64=absolute:${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.ppc,absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/gtk/linux/ppc64
 root.linux.gtk.ppc64.permissions.755=*.so*
-root.linux.gtk.ppc=absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/gtk/linux/ppc
 root.linux.gtk.x86_64=absolute:${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.x86_64,absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/gtk/linux/x86_64
 root.linux.gtk.x86_64.permissions.755=*.so*
 root.linux.gtk.s390x=absolute:${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.s390x,absolute:${buildDirectory}/features/org.eclipse.equinox.executable/contributed/gtk/linux/s390x
Index: eclipse/buildConfigs/rcp.config/buildConfiguration.xml
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/rcp.config/buildConfiguration.xml,v
retrieving revision 1.9
diff -u -r1.9 buildConfiguration.xml
--- eclipse/buildConfigs/rcp.config/buildConfiguration.xml	21 May 2009 16:06:15 -0000	1.9
+++ eclipse/buildConfigs/rcp.config/buildConfiguration.xml	27 Sep 2010 15:45:48 -0000
@@ -15,6 +15,7 @@
 		<!-- generate a feature based on our .product file -->
 		<property file="${eclipse.build.configs}/master/build.properties" />
 		<ant antfile="${eclipse.pdebuild.scripts}/productBuild/productBuild.xml" target="generateFeature" >
+			<property name="nestedInclusions" value="false" />
 			<property name="buildDirectory" value="${basedir}/temp"/>
 		</ant>
 		<!-- generate product build scripts for the generated feature -->
Index: eclipse/buildConfigs/sdk.examples/build.properties
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.examples/build.properties,v
retrieving revision 1.18
diff -u -r1.18 build.properties
--- eclipse/buildConfigs/sdk.examples/build.properties	28 May 2010 15:37:16 -0000	1.18
+++ eclipse/buildConfigs/sdk.examples/build.properties	27 Sep 2010 15:45:48 -0000
@@ -52,5 +52,5 @@
 skipMaps=false
 mapsRepo=${mapsRepo}
 mapsRoot=org.eclipse.releng
-mapsCheckoutTag=HEAD
+mapsCheckoutTag=${mapVersionTag}
 mapsTagTag=v${buildId}
Index: eclipse/buildConfigs/sdk.tests/build.properties
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/build.properties,v
retrieving revision 1.34
diff -u -r1.34 build.properties
--- eclipse/buildConfigs/sdk.tests/build.properties	28 May 2010 15:37:16 -0000	1.34
+++ eclipse/buildConfigs/sdk.tests/build.properties	27 Sep 2010 15:45:51 -0000
@@ -180,7 +180,7 @@
 
 mapsRepo=${mapsRepo}
 mapsRoot=org.eclipse.releng
-mapsCheckoutTag=HEAD
+mapsCheckoutTag=${mapVersionTag}
 mapsTagTag=v${buildId}
 
 #tagMaps=true
Index: eclipse/buildConfigs/sdk.tests/customTargets.xml
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/customTargets.xml,v
retrieving revision 1.34
diff -u -r1.34 customTargets.xml
--- eclipse/buildConfigs/sdk.tests/customTargets.xml	24 Feb 2010 18:23:43 -0000	1.34
+++ eclipse/buildConfigs/sdk.tests/customTargets.xml	27 Sep 2010 15:45:51 -0000
@@ -34,7 +34,7 @@
 	<!-- Replace values for mapsCheckoutTag as desired. -->
 	<!-- ===================================================================== -->
 	<target name="getMapFiles" depends="checkLocalMaps" unless="skipMaps">
-		<property name="mapsCheckoutTag" value="HEAD" />
+		<property name="mapsCheckoutTag" value="${mapVersionTag}" />
 		<cvs cvsRoot="${mapsRepo}" package="${mapsRoot}" dest="${buildDirectory}/maps" tag="${mapsCheckoutTag}" />
 	</target>
 
@@ -244,6 +244,7 @@
 			<entry key="org.eclipse.equinox.p2.reconciler.tests.35.platform.archive.linux" value="${org.eclipse.equinox.p2.reconciler.tests.35.platform.archive.linux}" />
 			<entry key="org.eclipse.equinox.p2.reconciler.tests.35.platform.archive.macosx" value="${org.eclipse.equinox.p2.reconciler.tests.35.platform.archive.macosx}" />
 			<entry key="org.eclipse.equinox.p2.tests.current.build.repo" value="${org.eclipse.equinox.p2.tests.current.build.repo}" />
+			<entry key="org.eclipse.equinox.p2.tests.last.release.build.repo" value="${org.eclipse.equinox.p2.tests.last.release.build.repo}" />
 		</propertyfile>
 
 		<!-- rezip the JUnit plugin tests -->
Index: eclipse/buildConfigs/sdk.tests/testConfigs/macosx/customTest.xml
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/macosx/customTest.xml,v
retrieving revision 1.2
diff -u -r1.2 customTest.xml
--- eclipse/buildConfigs/sdk.tests/testConfigs/macosx/customTest.xml	11 Sep 2009 18:12:21 -0000	1.2
+++ eclipse/buildConfigs/sdk.tests/testConfigs/macosx/customTest.xml	27 Sep 2010 15:45:51 -0000
@@ -29,6 +29,11 @@
 		<exec dir="." executable="${copyClient}">
 			<arg line="-r ${previousPlatformZips}/${previousRuntimePlatform} ${testMachine}:${executionDir}" />
 		</exec>
+
+		<!--copy comparator log so it's accessible via releng tests -->
+		<exec dir="." executable="${copyClient}">
+			<arg line="-r ${buildlogs}/comparatorlog.txt ${testMachine}:${executionDir}" />
+		</exec>
 	</target>
 
 </project>
\ No newline at end of file
Index: eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5-6.0/customTest.xml
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5-6.0/customTest.xml,v
retrieving revision 1.2
diff -u -r1.2 customTest.xml
--- eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5-6.0/customTest.xml	11 Sep 2009 18:12:21 -0000	1.2
+++ eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5-6.0/customTest.xml	27 Sep 2010 15:45:51 -0000
@@ -44,6 +44,11 @@
 		<exec dir="." executable="${copyClient}">
 			<arg line="-r ${previousPlatformZips}/${previousRuntimePlatform} ${testMachine}:${executionDir}" />
 		</exec>
+
+		<!--copy comparator log so it's accessible via releng tests -->
+		<exec dir="." executable="${copyClient}">
+			<arg line="-r ${buildlogs}/comparatorlog.txt ${testMachine}:${executionDir}" />
+		</exec>
 	</target>
 
 	<target name="install5.0Vm">
Index: eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5-6.0/testAll.sh
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5-6.0/testAll.sh,v
retrieving revision 1.2
diff -u -r1.2 testAll.sh
--- eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5-6.0/testAll.sh	14 Jan 2010 16:05:52 -0000	1.2
+++ eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5-6.0/testAll.sh	27 Sep 2010 15:45:51 -0000
@@ -13,4 +13,4 @@
 
 #execute command to run tests
 
-./runtests -os linux -ws gtk -arch x86 -vm `pwd`/../jdk6_17/jre/bin/java -properties vm.properties 1> linux.gtk-5.0_consolelog.txt 2>&1
+./runtests -os linux -ws gtk -arch x86 -vm `pwd`/../jdk6_17/jre/bin/java -properties vm.properties 1> linux.gtk-6.0_consolelog.txt 2>&1
Index: eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5-perf/customTest.xml
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5-perf/customTest.xml,v
retrieving revision 1.4
diff -u -r1.4 customTest.xml
--- eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5-perf/customTest.xml	27 Oct 2009 13:49:24 -0000	1.4
+++ eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5-perf/customTest.xml	27 Sep 2010 15:45:51 -0000
@@ -45,6 +45,11 @@
 		<exec dir="." executable="${copyClient}">
 			<arg line="-r ${previousPlatformZips}/${previousRuntimePlatform} ${testMachine}:${executionDir}" />
 		</exec>
+
+		<!--copy comparator log so it's accessible via releng tests -->
+		<exec dir="." executable="${copyClient}">
+			<arg line="-r ${buildlogs}/comparatorlog.txt ${testMachine}:${executionDir}" />
+		</exec>
 	</target>
 
 	<target name="installdb" if="db.available">
Index: eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5-perf/vm.properties
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5-perf/vm.properties,v
retrieving revision 1.4
diff -u -r1.4 vm.properties
--- eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5-perf/vm.properties	21 Jul 2009 15:51:06 -0000	1.4
+++ eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5-perf/vm.properties	27 Sep 2010 15:45:51 -0000
@@ -8,4 +8,4 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-extraVMargs=-Declipse.perf.dbloc=net://trelenggtk.ottawa.ibm.com:1528;dbname=perfDb36 -Declipse.perf.config=config=@testMachine@;build=@buildType@@timestamp@;jvm=sun -Declipse.perf.assertAgainst=config=@testMachine@;build=@reference@;jvm=sun
+extraVMargs=-Declipse.perf.dbloc=net://minsky.ottawa.ibm.com:1528;dbname=perfDb37 -Declipse.perf.config=config=@testMachine@;build=@buildType@@timestamp@;jvm=sun -Declipse.perf.assertAgainst=config=@testMachine@;build=@reference@;jvm=sun
Index: eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5/customTest.xml
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5/Attic/customTest.xml,v
retrieving revision 1.5
diff -u -r1.5 customTest.xml
--- eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5/customTest.xml	11 Sep 2009 18:12:21 -0000	1.5
+++ eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5/customTest.xml	27 Sep 2010 15:45:51 -0000
@@ -1,71 +0,0 @@
-<project name="Customized testing instructions" default="customSetup">
-
-	<target name="customSetup">
-
-		<antcall target="installVm" />
-
-		<!--copy the script which sets up environment and invokes the tests on test machine-->
-		<chmod file="${tester}/testAll.sh" perm="755" />
-		<exec dir="." executable="${copyClient}">
-			<arg line="${tester}/testAll.sh ${testMachine}:${executionDir}" />
-		</exec>
-
-		<!--copy in test script modified for running Team CVS tests-->
-		<exec dir="." executable="${copyClient}">
-			<arg line="${tester}/../../testScripts/test.xml ${testMachine}:${executionDir}" />
-		</exec>
-
-		<!--copy in the properties file for testing with J9 vm args-->
-		<exec dir="." executable="${copyClient}">
-			<arg line="${tester}/vm.properties ${testMachine}:${executionDir}" />
-		</exec>
-
-		<!--copy in the extra binaries needed to run tests-->
-		<exec dir="." executable="${copyClient}">
-			<arg line="-r ${extraBinariesDir} ${testMachine}:${testDir}" />
-		</exec>
-
-		<!--copy deltapack needed to run pdebuild tests-->
-		<exec dir="." executable="${copyClient}">
-			<arg line="-r ${postingDirectory}/${buildId}/${runtimeDeltapack} ${testMachine}:${executionDir}" />
-		</exec>
-
-		<!--copy platform runtime needed to run p2 tests-->
-		<exec dir="." executable="${copyClient}">
-			<arg line="-r ${postingDirectory}/${buildId}/${runtimePlatform} ${testMachine}:${executionDir}" />
-		</exec>
-
-		<!--copy previous platform runtime needed to run p2 tests-->
-		<exec dir="." executable="${copyClient}">
-			<arg line="-r ${previousPlatformZips}/${previousRuntimePlatform} ${testMachine}:${executionDir}" />
-		</exec>
-	</target>
-
-	<target name="installVm">
-		<property name="testVmTag" value="HEAD" />
-		<!--get and install the vm to test with-->
-		<cvs cvsRoot="${cvsRoot}" command="export -r ${testVmTag} ${vmUrl}" dest="${tester}" />
-
-		<exec dir="${tester}" executable="${copyClient}">
-			<arg line="${vmUrl} ${testMachine}:${testDir}" />
-		</exec>
-
-		<exec dir="." executable="${loginClient}">
-			<arg line="${testMachine} ${vmInstallCommand}" />
-		</exec>
-	</target>
-
-	<target name="install5.0Vm">
-		<property name="testVmTag" value="HEAD" />
-		<!--get and install the vm to test with-->
-		<cvs cvsRoot="${cvsRoot}" command="export -r ${testVmTag} ${vmUrl5}" dest="${tester}" />
-
-		<exec dir="${tester}" executable="${copyClient}">
-			<arg line="${vmUrl5} ${testMachine}:${testDir}" />
-		</exec>
-
-		<exec dir="." executable="${loginClient}">
-			<arg line="${testMachine} ${vmInstallCommand5}" />
-		</exec>
-	</target>
-</project>
\ No newline at end of file
Index: eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5/testAll.sh
===================================================================
RCS file: eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5/testAll.sh
diff -N eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5/testAll.sh
--- eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5/testAll.sh	14 Jan 2010 16:05:54 -0000	1.4
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-# !/bin/sh
-cd .
-#environment variables
-PATH=$PATH:`pwd`/../linux;export PATH
-xhost +$HOSTNAME
-MOZILLA_FIVE_HOME=/usr/lib/firefox-1.5.0.12;export MOZILLA_FIVE_HOME
-LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$MOZILLA_FIVE_HOME
-USERNAME=`whoami`
-DISPLAY=$HOSTNAME:0.0
-ulimit -c unlimited
-
-export USERNAME DISPLAY LD_LIBRARY_PATH
-
-#execute command to run tests
-
-./runtests -os linux -ws gtk -arch x86 -vm `pwd`/../jdk1.5.0_22/jre/bin/java -properties vm.properties 1> linux.gtk_consolelog.txt 2>&1
-
Index: eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5/testing.properties
===================================================================
RCS file: eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5/testing.properties
diff -N eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5/testing.properties
--- eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5/testing.properties	14 Jan 2010 16:05:55 -0000	1.9
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,67 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-#target to call in test.xml:  runtests-local | runtests-remote
-testTarget=runtests-remote
-
-#directory on test machine where automated testing framework will be installed
-testDir=/buildtest/${buildLabel}
-
-#name of zip file containing automated testing framework and JUnit test plug-ins
-testFramework=eclipse-Automated-Tests-${buildId}.zip
-
-#name of runtime to install and test
-runtime=eclipse-SDK-${buildId}-linux-gtk.tar.gz
-
-#name of deltaPack to install and test
-runtimeDeltapack=eclipse-${buildId}-delta-pack.zip
-
-#name of Platform runtime to install and test
-runtimePlatform=eclipse-platform-${buildId}-linux-gtk.tar.gz
-previousRuntimePlatform=eclipse-platform-3.5-linux-gtk.tar.gz
-
-#directory where test scripts are launched
-executionDir=${testDir}/eclipse-testing
-
-#name of file that captures console output from running JUnit plug-in tests
-consolelog=linux.gtk_consolelog.txt
-
-#name of script to execute on remote machine
-testScript=cd  ${executionDir};./testAll.sh
-
-#arguments to $(testScript)
-args=${executionDir} linux.gtk_consolelog.txt
-
-#cvsroot
-cvsRoot=kmoir@ottcvs1:/home/cvs/releng
-
-#name and path to downloaded vm.
-vmDest=jdk-1_5_0_22-fcs-bin-b03-linux-i586-09_oct_2009.zip
-
-#URL to vm used to run tests
-vmUrl=jdks/${vmDest}
-
-#command to execute via rsh to install the vm
-vmInstallCommand=cd ${testDir};unzip ${vmDest}
-
-#name and path to downloaded 5.0 vm.
-vmDest6=jdk-6u17-fcs-bin-b04-linux-i586-11_oct_2009.zip
-
-#URL to 5.0 vm used to run JDT Core tests
-vmUrl6=jdks/${vmDest6}
-
-#command to execute via rsh to install the vm
-vmInstallCommand6=cd ${testDir};unzip ${vmDest6}
-
-#Ant property to set if default vm installation not required
-skipVmInstall=true
-
-#extra binaries directory relative to testConfigs directory
-extraBinariesDir=${base.builder}/../eclipseInternalBuildTools/bin/linux
Index: eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5/vm.properties
===================================================================
RCS file: eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5/vm.properties
diff -N eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5/vm.properties
--- eclipse/buildConfigs/sdk.tests/testConfigs/rhelws5/vm.properties	20 Jan 2010 15:27:18 -0000	1.4
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-#J2SE-5.0=/buildtest/@buildid@/jdk1.5.0_22/jre/bin/java
Index: eclipse/buildConfigs/sdk.tests/testConfigs/sled10-perf/customTest.xml
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/sled10-perf/customTest.xml,v
retrieving revision 1.4
diff -u -r1.4 customTest.xml
--- eclipse/buildConfigs/sdk.tests/testConfigs/sled10-perf/customTest.xml	27 Oct 2009 13:49:24 -0000	1.4
+++ eclipse/buildConfigs/sdk.tests/testConfigs/sled10-perf/customTest.xml	27 Sep 2010 15:45:51 -0000
@@ -30,6 +30,7 @@
 		<!--add db to junit test zip if it is available-->
 		<available file="${internalPlugins}/org.apache.derby_10.4.2.0" type="dir" property="db.available" />
 		<antcall target="installdb" />
+
 		<!--copy deltapack needed to run pdebuild tests-->
 		<exec dir="." executable="${copyClient}">
 			<arg line="-r ${postingDirectory}/${buildId}/${runtimeDeltapack} ${testMachine}:${executionDir}" />
@@ -44,6 +45,11 @@
 		<exec dir="." executable="${copyClient}">
 			<arg line="-r ${previousPlatformZips}/${previousRuntimePlatform} ${testMachine}:${executionDir}" />
 		</exec>
+
+		<!--copy comparator log so it's accessible via releng tests -->
+		<exec dir="." executable="${copyClient}">
+			<arg line="-r ${buildlogs}/comparatorlog.txt ${testMachine}:${executionDir}" />
+		</exec>
 	</target>
 
 	<target name="installdb" if="db.available">
@@ -74,4 +80,6 @@
 		</exec>
 	</target>
 
+
+
 </project>
\ No newline at end of file
Index: eclipse/buildConfigs/sdk.tests/testConfigs/sled10-perf/testAll.sh
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/sled10-perf/testAll.sh,v
retrieving revision 1.4
diff -u -r1.4 testAll.sh
--- eclipse/buildConfigs/sdk.tests/testConfigs/sled10-perf/testAll.sh	14 Jan 2010 16:05:53 -0000	1.4
+++ eclipse/buildConfigs/sdk.tests/testConfigs/sled10-perf/testAll.sh	27 Sep 2010 15:45:51 -0000
@@ -15,6 +15,6 @@
 zip eclipse-junit-tests-$1.zip -rm eclipse
 
 #all tests
-./runtests -os linux -ws gtk -arch x86 -vm `pwd`/../jdk1.5.0_22/jre/bin/java -properties vm.properties -Dtest.target=performance -Dplatform=linuxgtkperf1 1> linux.gtk.perf1_consolelog.txt 2>&1
+./runtests -os linux -ws gtk -arch x86 -vm `pwd`/../jdk6_17/jre/bin/java -properties vm.properties -Dtest.target=performance -Dplatform=linuxgtkperf1 1> linux.gtk.perf1_consolelog.txt 2>&1
 
 
Index: eclipse/buildConfigs/sdk.tests/testConfigs/sled10-perf/testing.properties
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/sled10-perf/testing.properties,v
retrieving revision 1.7
diff -u -r1.7 testing.properties
--- eclipse/buildConfigs/sdk.tests/testConfigs/sled10-perf/testing.properties	14 Jan 2010 16:05:53 -0000	1.7
+++ eclipse/buildConfigs/sdk.tests/testConfigs/sled10-perf/testing.properties	27 Sep 2010 15:45:51 -0000
@@ -46,10 +46,10 @@
 cvsRoot=kmoir@ottcvs1:/home/cvs/releng
 
 #name and path to downloaded vm.
-vmDest=jdk-1_5_0_22-fcs-bin-b03-linux-i586-09_oct_2009.zip
+vmDest=jdk-6u17-fcs-bin-b04-linux-i586-11_oct_2009.zip
 
 #URL to vm used to run tests
-vmUrl=jdks/${vmDest}
+vmUrl=jdks/1.6/${vmDest}
 
 #command to execute via rsh to install the vm
 vmInstallCommand=cd ${testDir};unzip ${vmDest}
Index: eclipse/buildConfigs/sdk.tests/testConfigs/sled10-perf/vm.properties
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/sled10-perf/vm.properties,v
retrieving revision 1.4
diff -u -r1.4 vm.properties
--- eclipse/buildConfigs/sdk.tests/testConfigs/sled10-perf/vm.properties	21 Jul 2009 15:51:06 -0000	1.4
+++ eclipse/buildConfigs/sdk.tests/testConfigs/sled10-perf/vm.properties	27 Sep 2010 15:45:51 -0000
@@ -8,4 +8,4 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-extraVMargs=-Declipse.perf.dbloc=net://trelenggtk.ottawa.ibm.com:1528;dbname=perfDb36 -Declipse.perf.config=config=@testMachine@;build=@buildType@@timestamp@;jvm=sun -Declipse.perf.assertAgainst=config=@testMachine@;build=@reference@;jvm=sun
+extraVMargs=-Declipse.perf.dbloc=net://minsky.ottawa.ibm.com:1528;dbname=perfDb37 -Declipse.perf.config=config=@testMachine@;build=@buildType@@timestamp@;jvm=sun -Declipse.perf.assertAgainst=config=@testMachine@;build=@reference@;jvm=sun
Index: eclipse/buildConfigs/sdk.tests/testConfigs/testAll.xml
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/testAll.xml,v
retrieving revision 1.32
diff -u -r1.32 testAll.xml
--- eclipse/buildConfigs/sdk.tests/testConfigs/testAll.xml	2 Oct 2009 15:48:05 -0000	1.32
+++ eclipse/buildConfigs/sdk.tests/testConfigs/testAll.xml	27 Sep 2010 15:45:51 -0000
@@ -39,16 +39,11 @@
 				<param name="cfgKey" value="macosx" />
 				<param name="markerName" value="eclipse-macosx-${buildId}" />
 			</antcall>
-			<antcall target="test">
+		<!--	<antcall target="test">
 				<param name="tester" value="${basedir}/rhelws5" />
 				<param name="cfgKey" value="rhelws5" />
 				<param name="markerName" value="eclipse-rhelws5-${buildId}" />
-			</antcall>
-			<antcall target="test">
-				<param name="tester" value="${basedir}/win32xp" />
-				<param name="cfgKey" value="win32xp" />
-				<param name="markerName" value="eclipse-win32xp-${buildId}" />
-			</antcall>
+			</antcall> -->			
 			<antcall target="test">
 				<param name="tester" value="${basedir}/rhelws5-6.0" />
 				<param name="cfgKey" value="rhelws5-6.0" />
Index: eclipse/buildConfigs/sdk.tests/testConfigs/vista-perf/customTest.xml
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/vista-perf/Attic/customTest.xml,v
retrieving revision 1.4
diff -u -r1.4 customTest.xml
--- eclipse/buildConfigs/sdk.tests/testConfigs/vista-perf/customTest.xml	27 Oct 2009 13:49:24 -0000	1.4
+++ eclipse/buildConfigs/sdk.tests/testConfigs/vista-perf/customTest.xml	27 Sep 2010 15:45:51 -0000
@@ -1,76 +1 @@
 
-<project name="Customized testing instructions" default="customSetup">
-
-	<target name="customSetup">
-		<!--property file containing key value pair for ${eclipse.perf.ref}-->
-		<property file="${ref.properties}" />
-
-		<antcall target="installVm" />
-		<!--copy the script which sets up environment and invokes the tests on test machine-->
-		<exec dir="." executable="${copyClient}">
-			<arg line="${tester}/testAll.bat ${testMachine}:${executionDir}" />
-		</exec>
-
-		<!--copy in test script modified for running Team CVS tests-->
-		<exec dir="." executable="${copyClient}">
-			<arg line="${tester}/../../testScripts/test.xml ${testMachine}:${executionDir}" />
-		</exec>
-
-		<antcall target="replaceBuildId" />
-
-		<replace file="${tester}/vm.properties" token="@buildType@@timestamp@" value="${buildId}" />
-		<replace file="${tester}/vm.properties" token="@reference@" value="${eclipse.perf.ref}" />
-		<replace file="${tester}/vm.properties" token="@testMachine@" value="${testMachine}" />
-
-		<!--copy in the properties file for testing with performance vm args-->
-		<exec dir="." executable="${copyClient}">
-			<arg line="${tester}/vm.properties ${testMachine}:${executionDir}" />
-		</exec>
-
-		<!--add db to junit test zip if it is available-->
-		<available file="${internalPlugins}/org.apache.derby_10.4.2.0" type="dir" property="db.available" />
-		<antcall target="installdb" />
-
-		<!--copy deltapack needed to run pdebuild tests-->
-		<exec dir="." executable="${copyClient}">
-			<arg line="-r ${postingDirectory}/${buildId}/${runtimeDeltapack} ${testMachine}:${executionDir}" />
-		</exec>
-
-		<!--copy platform runtime needed to run p2 tests-->
-		<exec dir="." executable="${copyClient}">
-			<arg line="-r ${postingDirectory}/${buildId}/${runtimePlatform} ${testMachine}:${executionDir}" />
-		</exec>
-
-		<!--copy previous platform runtime needed to run p2 tests-->
-		<exec dir="." executable="${copyClient}">
-			<arg line="-r ${previousPlatformZips}/${previousRuntimePlatform} ${testMachine}:${executionDir}" />
-		</exec>
-	</target>
-
-	<target name="installdb" if="db.available">
-		<mkdir dir="${tester}/eclipse/dropins/eclipse/plugins" />
-		<copy todir="${tester}/eclipse/dropins/eclipse/plugins">
-			<fileset dir="${internalPlugins}" includes="org.apache.derby_10.4.2.0/**" />
-		</copy>
-		<exec dir="${tester}" executable="${copyClient}">
-			<arg line="-r eclipse ${testMachine}:${executionDir}" />
-		</exec>
-	</target>
-
-	<target name="replaceBuildId" if="performance.base">
-		<replace file="${tester}/vm.properties" token="@buildType@@timestamp@" value="${testedBuildIdDBLabel}" />
-	</target>
-
-	<target name="installVm">
-		<property name="testVmTag" value="HEAD" />
-		<!--get and install the vm to test with-->
-		<cvs cvsRoot="${cvsRoot}" command="export -r ${testVmTag} ${vmUrl}" dest="${tester}" />
-
-		<exec dir="${tester}" executable="${copyClient}">
-			<arg line="${vmUrl} ${testMachine}:${testDir}" />
-		</exec>
-		<exec dir="." executable="${loginClient}">
-			<arg line="${testMachine} ${vmInstallCommand}" />
-		</exec>
-	</target>
-</project>
\ No newline at end of file
Index: eclipse/buildConfigs/sdk.tests/testConfigs/vista-perf/testAll.bat
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/vista-perf/Attic/testAll.bat,v
retrieving revision 1.5
diff -u -r1.5 testAll.bat
--- eclipse/buildConfigs/sdk.tests/testConfigs/vista-perf/testAll.bat	14 Jan 2010 16:05:54 -0000	1.5
+++ eclipse/buildConfigs/sdk.tests/testConfigs/vista-perf/testAll.bat	27 Sep 2010 15:45:51 -0000
@@ -1,14 +1,3 @@
-@echo off
-cd %1
-REM test script
-
-REM add the extra binaries to the system path
-set PATH=%PATH%;%1\..\windowsBin
-
-mkdir results
-
-REM add Cloudscape plugin to junit tests zip file
-zip eclipse-junit-tests-%3%.zip -rm eclipse
 
 REM run all tests.  -vm argument used as is to eclipse launcher for target eclipse
 call runtests.bat -vm %cd%\..\jdk6_17\jre\bin\javaw -properties vm.properties "-Dtest.target=performance" "-Dplatform=win32perf2" 1> %2 2>&1
Index: eclipse/buildConfigs/sdk.tests/testConfigs/vista-perf/testing.properties
===================================================================
RCS file: eclipse/buildConfigs/sdk.tests/testConfigs/vista-perf/testing.properties
diff -N eclipse/buildConfigs/sdk.tests/testConfigs/vista-perf/testing.properties
--- eclipse/buildConfigs/sdk.tests/testConfigs/vista-perf/testing.properties	14 Jan 2010 16:05:53 -0000	1.8
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,67 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-#target to call in test.xml:  runtests-local | runtests-remote
-testTarget=runtests-remote
-
-#use rsh as protocol for login and copying files.
-rsh=true
-
-#directory on test machine where automated testing framework will be installed
-testDir=c:\\buildtest\\${buildLabel}
-
-#name of zip file containing automated testing framework and JUnit test plug-ins
-testFramework=eclipse-Automated-Tests-${buildId}.zip
-
-#name of runtime to install and test
-runtime=eclipse-SDK-${buildId}-win32.zip
-
-#name of deltaPack to install and test
-runtimeDeltapack=eclipse-${buildId}-delta-pack.zip
-
-#name of Platform runtime to install and test
-runtimePlatform=eclipse-platform-${buildId}-win32.zip
-previousRuntimePlatform=eclipse-platform-3.5-win32.zip
-
-#directory where test scripts are launched
-executionDir=${testDir}\\eclipse-testing
-
-#eclipse platforms:  win32 | linux-motif | linux-gtk | aix-motif | hpux-motif |solaris-motif
-platform=win32perf2
-
-#name of file that captures console output from running JUnit plug-in tests
-consolelog=winxp.perf2_consolelog.txt
-
-#name of script to execute on remote machine
-testScript=start /min /wait ${executionDir}\\testAll.bat
-
-#arguments to $(testScript)
-args=${executionDir} winxp.perf2_consolelog.txt ${buildId}
-
-#name and path to downloaded vm.
-vmDest=jdk-6u17-fcs-bin-b04-windows-i586-11_oct_2009.zip
-
-#cvsroot
-cvsRoot=kmoir@ottcvs1:/home/cvs/releng
-
-#URL to vm used to run tests
-vmUrl=jdks/1.6/${vmDest}
-
-#command to execute via rsh to install the vm
-vmInstallCommand="unzip -o -qq ${testDir}\\${vmDest} -d ${testDir}"
-
-#Ant property to set default vm installation
-skipVmInstall=true
-
-#extra binaries directory relative to testConfigs directory
-extraBinariesDir=${base.builder}/../eclipseInternalBuildTools/bin/windowsBin
-
-#Cloudscape plug-in location
-internalPlugins=${base.builder}/../eclipseInternalBuildTools/plugins
Index: eclipse/buildConfigs/sdk.tests/testConfigs/vista-perf/vm.properties
===================================================================
RCS file: eclipse/buildConfigs/sdk.tests/testConfigs/vista-perf/vm.properties
diff -N eclipse/buildConfigs/sdk.tests/testConfigs/vista-perf/vm.properties
--- eclipse/buildConfigs/sdk.tests/testConfigs/vista-perf/vm.properties	21 Jul 2009 15:51:06 -0000	1.4
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-extraVMargs=-Declipse.perf.dbloc=net://trelenggtk.ottawa.ibm.com:1528;dbname=perfDb36 -Declipse.perf.config=config=@testMachine@;build=@buildType@@timestamp@;jvm=sun -Declipse.perf.assertAgainst=config=@testMachine@;build=@reference@;jvm=sun
Index: eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-6.0/customTest.xml
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-6.0/customTest.xml,v
retrieving revision 1.5
diff -u -r1.5 customTest.xml
--- eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-6.0/customTest.xml	11 Sep 2009 18:12:21 -0000	1.5
+++ eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-6.0/customTest.xml	27 Sep 2010 15:45:51 -0000
@@ -38,6 +38,11 @@
 		<exec dir="." executable="${copyClient}">
 			<arg line="-r ${previousPlatformZips}/${previousRuntimePlatform} ${testMachine}:${executionDir}" />
 		</exec>
+
+		<!--copy comparator log so it's accessible via releng tests -->
+		<exec dir="." executable="${copyClient}">
+			<arg line="-r ${buildlogs}/comparatorlog.txt ${testMachine}:${executionDir}" />
+		</exec>
 	</target>
 
 	<target name="install6.0Vm">
Index: eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-perf/customTest.xml
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-perf/customTest.xml,v
retrieving revision 1.8
diff -u -r1.8 customTest.xml
--- eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-perf/customTest.xml	27 Oct 2009 13:49:24 -0000	1.8
+++ eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-perf/customTest.xml	27 Sep 2010 15:45:51 -0000
@@ -45,6 +45,11 @@
 		<exec dir="." executable="${copyClient}">
 			<arg line="-r ${previousPlatformZips}/${previousRuntimePlatform} ${testMachine}:${executionDir}" />
 		</exec>
+
+		<!--copy comparator log so it's accessible via releng tests -->
+		<exec dir="." executable="${copyClient}">
+			<arg line="-r ${buildlogs}/comparatorlog.txt ${testMachine}:${executionDir}" />
+		</exec>
 	</target>
 
 	<target name="installdb" if="db.available">
Index: eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-perf/testAll.bat
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-perf/testAll.bat,v
retrieving revision 1.6
diff -u -r1.6 testAll.bat
--- eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-perf/testAll.bat	14 Jan 2010 16:05:54 -0000	1.6
+++ eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-perf/testAll.bat	27 Sep 2010 15:45:51 -0000
@@ -8,5 +8,5 @@
 zip eclipse-junit-tests-%3%.zip -rm eclipse
 
 REM run all tests
-call runtests.bat -vm %cd%\..\jdk1.5.0_22\jre\bin\javaw -properties vm.properties "-Dtest.target=performance" "-Dplatform=win32perf1" 1> %2 2>&1
+call runtests.bat -vm %cd%\..\jdk6_17\jre\bin\javaw -properties vm.properties "-Dtest.target=performance" "-Dplatform=win32perf1" 1> %2 2>&1
 exit
\ No newline at end of file
Index: eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-perf/testing.properties
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-perf/testing.properties,v
retrieving revision 1.11
diff -u -r1.11 testing.properties
--- eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-perf/testing.properties	14 Jan 2010 16:05:54 -0000	1.11
+++ eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-perf/testing.properties	27 Sep 2010 15:45:51 -0000
@@ -46,17 +46,26 @@
 args=${executionDir} winxp.perf1_consolelog.txt ${buildId}
 
 #name and path to downloaded vm.
-vmDest=jdk-1_5_0_22-fcs-bin-b03-windows-i586-09_oct_2009.zip
+vmDest=jdk-6u17-fcs-bin-b04-windows-i586-11_oct_2009.zip
 
 #cvsroot
 cvsRoot=kmoir@ottcvs1:/home/cvs/releng
 
 #URL to vm used to run tests
-vmUrl=jdks/${vmDest}
+vmUrl=jdks/1.6/${vmDest}
 
 #command to execute via rsh to install the vm
 vmInstallCommand="unzip -o -qq ${testDir}\\${vmDest} -d ${testDir}"
 
+#name and path to 5.0 vm.
+vmDest6=jdk-6u17-fcs-bin-b04-windows-i586-11_oct_2009.zip
+
+#URL to 5.0 vm used to run jdt core tests
+vmUrl6=jdks/1.6/${vmDest6}
+
+#command to execute via rsh to install the 5.0 vm
+vmInstallCommand6="unzip -o -qq ${testDir}\\${vmDest6} -d ${testDir}"
+
 #Ant property to set default vm installation
 skipVmInstall=true
 
Index: eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-perf/vm.properties
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-perf/vm.properties,v
retrieving revision 1.6
diff -u -r1.6 vm.properties
--- eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-perf/vm.properties	21 Jul 2009 15:51:06 -0000	1.6
+++ eclipse/buildConfigs/sdk.tests/testConfigs/win32xp-perf/vm.properties	27 Sep 2010 15:45:51 -0000
@@ -8,4 +8,4 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-extraVMargs=-Declipse.perf.dbloc=net://trelenggtk.ottawa.ibm.com:1528;dbname=perfDb36 -Declipse.perf.config=config=@testMachine@;build=@buildType@@timestamp@;jvm=sun -Declipse.perf.assertAgainst=config=@testMachine@;build=@reference@;jvm=sun
+extraVMargs=-Declipse.perf.dbloc=net://minsky.ottawa.ibm.com:1528;dbname=perfDb37 -Declipse.perf.config=config=@testMachine@;build=@buildType@@timestamp@;jvm=sun -Declipse.perf.assertAgainst=config=@testMachine@;build=@reference@;jvm=sun
Index: eclipse/buildConfigs/sdk.tests/testConfigs/win32xp/customTest.xml
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/win32xp/Attic/customTest.xml,v
retrieving revision 1.5
diff -u -r1.5 customTest.xml
--- eclipse/buildConfigs/sdk.tests/testConfigs/win32xp/customTest.xml	11 Sep 2009 18:12:21 -0000	1.5
+++ eclipse/buildConfigs/sdk.tests/testConfigs/win32xp/customTest.xml	27 Sep 2010 15:45:51 -0000
@@ -1,76 +0,0 @@
-<project name="Customized testing instructions" default="customSetup">
-
-	<target name="customSetup">
-		<antcall target="installVm" />
-		<antcall target="install1.6Vm" />
-
-		<!--copy the script which sets up environment and invokes the tests on test machine-->
-		<exec dir="." executable="${copyClient}">
-			<arg line="${tester}/testAll.bat ${testMachine}:${executionDir}" />
-		</exec>
-
-		<!--copy in test script modified for running Team CVS tests-->
-		<exec dir="." executable="${copyClient}">
-			<arg line="${tester}/../../testScripts/test.xml ${testMachine}:${executionDir}" />
-		</exec>
-
-		<replace file="${tester}/vm.properties" token="@buildid@" value="${buildId}" />
-		<exec dir="." executable="${copyClient}">
-			<arg line="${tester}/vm.properties ${testMachine}:${executionDir}" />
-		</exec>
-
-		<!--copy deltapack needed to run pdebuild tests-->
-		<exec dir="." executable="${copyClient}">
-			<arg line="-r ${postingDirectory}/${buildId}/${runtimeDeltapack} ${testMachine}:${executionDir}" />
-		</exec>
-
-		<!--copy platform runtime needed to run p2 tests-->
-		<exec dir="." executable="${copyClient}">
-			<arg line="-r ${postingDirectory}/${buildId}/${runtimePlatform} ${testMachine}:${executionDir}" />
-		</exec>
-
-		<!--copy previous platform runtime needed to run p2 tests-->
-		<exec dir="." executable="${copyClient}">
-			<arg line="-r ${previousPlatformZips}/${previousRuntimePlatform} ${testMachine}:${executionDir}" />
-		</exec>
-	</target>
-
-	<target name="installVm">
-		<property name="testVmTag" value="HEAD" />
-		<!--get and install the vm to test with-->
-		<cvs cvsRoot="${cvsRoot}" command="export -r ${testVmTag} ${vmUrl}" dest="${tester}" />
-
-		<exec dir="${tester}" executable="${copyClient}">
-			<arg line="${vmUrl} ${testMachine}:${testDir}" />
-		</exec>
-		<exec dir="." executable="${loginClient}">
-			<arg line="${testMachine} ${vmInstallCommand}" />
-		</exec>
-	</target>
-
-	<target name="install5.0Vm">
-		<property name="testVmTag" value="HEAD" />
-		<!--get and install the vm to test with-->
-		<cvs cvsRoot="${cvsRoot}" command="export -r ${testVmTag} ${vmUrl6}" dest="${tester}" />
-
-		<exec dir="${tester}" executable="${copyClient}">
-			<arg line="${vmUrl6} ${testMachine}:${testDir}" />
-		</exec>
-		<exec dir="." executable="${loginClient}">
-			<arg line="${testMachine} ${vmInstallCommand5}" />
-		</exec>
-	</target>
-
-	<target name="install1.6Vm">
-		<property name="testVmTag" value="HEAD" />
-		<!--get and install the vm to test with-->
-		<cvs cvsRoot="${cvsRoot}" command="export -r ${testVmTag} ${vmUrl6}" dest="${tester}" />
-
-		<exec dir="${tester}" executable="${copyClient}">
-			<arg line="${vmUrl6} ${testMachine}:${testDir}" />
-		</exec>
-		<exec dir="." executable="${loginClient}">
-			<arg line="${testMachine} ${vmInstallCommand6}" />
-		</exec>
-	</target>
-</project>
\ No newline at end of file
Index: eclipse/buildConfigs/sdk.tests/testConfigs/win32xp/testAll.bat
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/win32xp/Attic/testAll.bat,v
retrieving revision 1.6
diff -u -r1.6 testAll.bat
--- eclipse/buildConfigs/sdk.tests/testConfigs/win32xp/testAll.bat	14 Jan 2010 16:05:55 -0000	1.6
+++ eclipse/buildConfigs/sdk.tests/testConfigs/win32xp/testAll.bat	27 Sep 2010 15:45:51 -0000
@@ -1,11 +1 @@
-@echo off
-cd %1
-REM test script
 
-REM add the extra binaries to the system path
-set PATH=%PATH%;%1\..\windowsBin
-
-REM run all tests
-call runtests.bat -vm %cd%\..\jdk1.5.0_22\jre\bin\javaw -properties vm.properties 1> %2 2>&1
-
-exit
\ No newline at end of file
Index: eclipse/buildConfigs/sdk.tests/testConfigs/win32xp/testing.properties
===================================================================
RCS file: eclipse/buildConfigs/sdk.tests/testConfigs/win32xp/testing.properties
diff -N eclipse/buildConfigs/sdk.tests/testConfigs/win32xp/testing.properties
--- eclipse/buildConfigs/sdk.tests/testConfigs/win32xp/testing.properties	14 Jan 2010 16:05:55 -0000	1.14
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,78 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-#target to call in test.xml:  runtests-local | runtests-remote
-testTarget=runtests-remote
-
-#use rsh as protocol for login and copying files.
-rsh=true
-
-#directory on test machine where automated testing framework will be installed
-testDir=c:\\buildtest\\${buildLabel}
-
-#name of zip file containing automated testing framework and JUnit test plug-ins
-testFramework=eclipse-Automated-Tests-${buildId}.zip
-
-#name of runtime to install and test
-runtime=eclipse-SDK-${buildId}-win32.zip
-
-#name of deltaPack to install and test
-runtimeDeltapack=eclipse-${buildId}-delta-pack.zip
-
-#name of Platform runtime to install and test
-runtimePlatform=eclipse-platform-${buildId}-win32.zip
-previousRuntimePlatform=eclipse-platform-3.5-win32.zip
-
-#directory where test scripts are launched
-executionDir=${testDir}\\eclipse-testing
-
-#name of file that captures console output from running JUnit plug-in tests
-consolelog=win32_consolelog.txt
-
-#name of script to execute on remote machine
-testScript=start /min /wait ${executionDir}\\testAll.bat
-
-#arguments to $(testScript)
-args=${executionDir} win32_consolelog.txt
-
-#name and path to downloaded vm.
-vmDest=jdk-1_5_0_22-fcs-bin-b03-windows-i586-09_oct_2009.zip
-
-#cvsroot
-cvsRoot=kmoir@ottcvs1:/home/cvs/releng
-
-#URL to vm used to run tests
-vmUrl=jdks/${vmDest}
-
-#command to execute via rsh to install the vm
-vmInstallCommand="unzip -o -qq ${testDir}\\${vmDest} -d ${testDir}"
-
-#name and path to 5.0 vm.
-vmDest6=jdk-6u17-fcs-bin-b04-windows-i586-11_oct_2009.zip
-
-#URL to 5.0 vm used to run jdt core tests
-vmUrl6=jdks/${vmDest6}
-
-#command to execute via rsh to install the 5.0 vm
-vmInstallCommand6="unzip -o -qq ${testDir}\\${vmDest6} -d ${testDir}"
-
-#name and path to 1.6 vm.
-vmDest6=jdk-6u17-fcs-bin-b04-windows-i586-11_oct_2009.zip
-
-#URL to 1.6 vm used to run jdt core tests
-vmUrl6=jdks/1.6/${vmDest6}
-
-#command to execute via rsh to install the 1.6 vm
-vmInstallCommand6="unzip -o -qq ${testDir}\\${vmDest6} -d ${testDir}"
-#Ant property to set default vm installation
-skipVmInstall=true
-
-#extra binaries directory relative to testConfigs directory
-extraBinariesDir=${base.builder}/../eclipseInternalBuildTools/bin/windowsBin
Index: eclipse/buildConfigs/sdk.tests/testConfigs/win32xp/vm.properties
===================================================================
RCS file: eclipse/buildConfigs/sdk.tests/testConfigs/win32xp/vm.properties
diff -N eclipse/buildConfigs/sdk.tests/testConfigs/win32xp/vm.properties
--- eclipse/buildConfigs/sdk.tests/testConfigs/win32xp/vm.properties	20 Jan 2010 15:27:21 -0000	1.4
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-#J2SE-5.0=c:/buildtest/@buildid@/jdk1.5.0_06/jre/bin/java
-J2SE-6.0=c:/buildtest/@buildid@/jdk6_17/jre/bin/javaw
Index: eclipse/buildConfigs/sdk.tests/testConfigs/win32xp2-perf/customTest.xml
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/win32xp2-perf/customTest.xml,v
retrieving revision 1.3
diff -u -r1.3 customTest.xml
--- eclipse/buildConfigs/sdk.tests/testConfigs/win32xp2-perf/customTest.xml	27 Oct 2009 13:49:24 -0000	1.3
+++ eclipse/buildConfigs/sdk.tests/testConfigs/win32xp2-perf/customTest.xml	27 Sep 2010 15:45:51 -0000
@@ -45,6 +45,11 @@
 		<exec dir="." executable="${copyClient}">
 			<arg line="-r ${previousPlatformZips}/${previousRuntimePlatform} ${testMachine}:${executionDir}" />
 		</exec>
+
+		<!--copy comparator log so it's accessible via releng tests -->
+		<exec dir="." executable="${copyClient}">
+			<arg line="-r ${buildlogs}/comparatorlog.txt ${testMachine}:${executionDir}" />
+		</exec>
 	</target>
 
 	<target name="installdb" if="db.available">
Index: eclipse/buildConfigs/sdk.tests/testConfigs/win32xp2-perf/vm.properties
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testConfigs/win32xp2-perf/vm.properties,v
retrieving revision 1.2
diff -u -r1.2 vm.properties
--- eclipse/buildConfigs/sdk.tests/testConfigs/win32xp2-perf/vm.properties	2 Oct 2009 15:48:05 -0000	1.2
+++ eclipse/buildConfigs/sdk.tests/testConfigs/win32xp2-perf/vm.properties	27 Sep 2010 15:45:51 -0000
@@ -8,4 +8,4 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-extraVMargs=-Declipse.perf.dbloc=net://trelenggtk.ottawa.ibm.com:1528;dbname=perfDb36 -Declipse.perf.config=config=@testMachine@;build=@buildType@@timestamp@;jvm=sun -Declipse.perf.assertAgainst=config=@testMachine@;build=@reference@;jvm=sun
+extraVMargs=-Declipse.perf.dbloc=net://minsky.ottawa.ibm.com:1528;dbname=perfDb37 -Declipse.perf.config=config=@testMachine@;build=@buildType@@timestamp@;jvm=sun -Declipse.perf.assertAgainst=config=@testMachine@;build=@reference@;jvm=sun
Index: eclipse/buildConfigs/sdk.tests/testScripts/readme.html
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testScripts/readme.html,v
retrieving revision 1.10
diff -u -r1.10 readme.html
--- eclipse/buildConfigs/sdk.tests/testScripts/readme.html	23 Apr 2009 21:26:41 -0000	1.10
+++ eclipse/buildConfigs/sdk.tests/testScripts/readme.html	27 Sep 2010 15:45:51 -0000
@@ -150,8 +150,6 @@
     <td>linux</td><td>gtk</td><td>x86</td></tr>
   <tr>
     <td>linux</td><td>gtk</td><td>x86_64</td></tr>
-  <tr>
-    <td>linux</td><td>gtk</td><td>ppc</td></tr>
   <tr> 
     <td>linux</td><td>motif</td><td>x86</td></tr>
   <tr>
Index: eclipse/buildConfigs/sdk.tests/testScripts/runtests
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testScripts/runtests,v
retrieving revision 1.18
diff -u -r1.18 runtests
--- eclipse/buildConfigs/sdk.tests/testScripts/runtests	4 Nov 2009 16:46:57 -0000	1.18
+++ eclipse/buildConfigs/sdk.tests/testScripts/runtests	27 Sep 2010 15:45:51 -0000
@@ -66,7 +66,7 @@
 cd $dir
 
 # verify os, ws and arch values passed in are valid before running tests
-if [ "$os-$ws-$arch" = "linux-motif-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86" ] || [ "$os-$ws-$arch" = "macosx-carbon-ppc" ] || [ "$os-$ws-$arch" = "macosx-carbon-x86" ] || [ "$os-$ws-$arch" = "macosx-cocoa-ppc" ] || [ "$os-$ws-$arch" = "macosx-cocoa-x86" ]|| [ "$os-$ws-$arch" = "solaris-motif-sparc" ] || [ "$os-$ws-$arch" = "aix-motif-ppc" ] || [ "$os-$ws-$arch" = "solaris-gtk-sparc" ] || [ "$os-$ws-$arch" = "solaris-gtk-x86" ] ||[ "$os-$ws-$arch" = "qnx-photon-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc64" ] ||  [ "$os-$ws-$arch" = "linux-gtk-ia64" ] ||  [ "$os-$ws-$arch" = "linux-gtk-x86_64" ] ||  [ "$os-$ws-$arch" = "hpux-motif-ia64_32"]
+if [ "$os-$ws-$arch" = "linux-motif-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86" ] || [ "$os-$ws-$arch" = "macosx-carbon-ppc" ] || [ "$os-$ws-$arch" = "macosx-carbon-x86" ] || [ "$os-$ws-$arch" = "macosx-cocoa-ppc" ] || [ "$os-$ws-$arch" = "macosx-cocoa-x86" ]|| [ "$os-$ws-$arch" = "solaris-motif-sparc" ] || [ "$os-$ws-$arch" = "aix-motif-ppc" ] || [ "$os-$ws-$arch" = "solaris-gtk-sparc" ] || [ "$os-$ws-$arch" = "solaris-gtk-x86" ] ||[ "$os-$ws-$arch" = "qnx-photon-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc64" ] ||  [ "$os-$ws-$arch" = "linux-gtk-ia64" ] ||  [ "$os-$ws-$arch" = "linux-gtk-x86_64" ] ||  [ "$os-$ws-$arch" = "hpux-motif-ia64_32"]
 then
 	if [ ! -r eclipse ]
 	then
Index: eclipse/buildConfigs/sdk.tests/testScripts/test.xml
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testScripts/test.xml,v
retrieving revision 1.96
diff -u -r1.96 test.xml
--- eclipse/buildConfigs/sdk.tests/testScripts/test.xml	21 Apr 2010 18:18:26 -0000	1.96
+++ eclipse/buildConfigs/sdk.tests/testScripts/test.xml	27 Sep 2010 15:45:51 -0000
@@ -82,10 +82,18 @@
 	<target name="setupPlatform">
 		<property file="equinoxp2tests.properties" />
 		<condition property="platformArchive" value="${org.eclipse.equinox.p2.reconciler.tests.35.platform.archive.linux}">
-			<os family="unix" />
+			<and>
+				<os family="unix" />
+				<not>
+					<os family="mac" />
+				</not>
+			</and>
 		</condition>
 		<condition property="platformArchive" value="${org.eclipse.equinox.p2.reconciler.tests.35.platform.archive.macosx}">
-			<os family="mac" />
+			<and>
+				<os family="mac" />
+				<os family="unix" />
+			</and>
 		</condition>
 		<condition property="platformArchive" value="${org.eclipse.equinox.p2.reconciler.tests.platform.archive.win32}">
 			<os family="windows" />
@@ -121,13 +129,16 @@
 
 	<target name="installExtraPlugins" if="extraIU">
 		<property file="equinoxp2tests.properties" />
+		<path id="launcher.paths">
+			<fileset dir="${eclipse-home}" includes="plugins/org.eclipse.equinox.launcher_*" />
+		</path>
+		<property name="launcherPath" refid="launcher.paths" />
+
 		<property name="currentBuildRepo" value="${org.eclipse.equinox.p2.tests.current.build.repo}" />
 		<echo>-installIU ${extraIU} +</echo>
-		<exec executable="${eclipse-home}/eclipse" failonerror="false" dir="${eclipse-home}" timeout="900000" output="${basedir}/director.log" resultproperty="directorcode">
+		<java jar="${launcherPath}" failonerror="false" dir="${eclipse-home}" timeout="900000" fork="true" output="${basedir}/director.log" resultproperty="directorcode">
 			<arg line="-vm ${java.home}/bin/java" />
 			<arg line="-application org.eclipse.equinox.p2.director" />
-			<arg line="-nosplash" />
-			<arg line="--launcher.suppressErrors" />
 			<arg line="-consoleLog" />
 			<arg line="-flavor tooling" />
 			<arg line="-installIUs ${extraIU}" />
@@ -139,17 +150,19 @@
 			<arg line="-repository ${currentBuildRepo}" />
 			<arg line="-destination ${eclipse-home}" />
 			<arg line="-bundlepool ${eclipse-home}" />
-		</exec>
+		</java>
 	</target>
 
 	<target name="installTestPlugins">
+		<path id="launcher.paths">
+			<fileset dir="${eclipse-home}" includes="plugins/org.eclipse.equinox.launcher_*" />
+		</path>
+		<property name="launcherPath" refid="launcher.paths" />
 		<antcall target="setupPlatform" />
 		<echo>-installIU ${testPlugin} +</echo>
-		<exec executable="${eclipse-home}/eclipse" failonerror="false" dir="${eclipse-home}" timeout="900000" output="${basedir}/director.log" resultproperty="directorcode">
+		<java jar="${launcherPath}" failonerror="false" dir="${eclipse-home}" timeout="900000" fork="true" output="${basedir}/director.log" resultproperty="directorcode">
 			<arg line="-vm ${java.home}/bin/java" />
 			<arg line="-application org.eclipse.equinox.p2.director" />
-			<arg line="-nosplash" />
-			<arg line="--launcher.suppressErrors" />
 			<arg line="-consoleLog" />
 			<arg line="-flavor tooling" />
 			<arg line="-installIUs ${testPlugin},org.eclipse.test,org.eclipse.ant.optional.junit,org.eclipse.test.performance,org.eclipse.test.performance.win32,org.easymock" />
@@ -161,7 +174,7 @@
 			<arg line="-repository file:${repoLocation}" />
 			<arg line="-destination ${eclipse-home}" />
 			<arg line="-bundlepool ${eclipse-home}" />
-		</exec>
+		</java>
 		<antcall target="configureTeamTest" />
 		<antcall target="unzipderby" />
 	</target>
@@ -217,13 +230,6 @@
 				<equals arg1="${arch}" arg2="x86" />
 			</and>
 		</condition>
-		<condition property="runtimeArchive" value="eclipse-SDK-${buildId}-linux-gtk-ppc.tar.gz">
-			<and>
-				<equals arg1="${os}" arg2="linux" />
-				<equals arg1="${ws}" arg2="gtk" />
-				<equals arg1="${arch}" arg2="ppc" />
-			</and>
-		</condition>
 		<condition property="runtimeArchive" value="eclipse-SDK-${buildId}-linux-gtk-ppc64.tar.gz">
 			<and>
 				<equals arg1="${os}" arg2="linux" />
@@ -775,7 +781,6 @@
 		<antcall target="uadoc" />
 		<antcall target="debug" />
 		<antcall target="ui" />
-	
 	</target>
 </project>
 
Index: eclipse/buildConfigs/sdk/build.properties
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk/build.properties,v
retrieving revision 1.38
diff -u -r1.38 build.properties
--- eclipse/buildConfigs/sdk/build.properties	19 May 2010 13:52:49 -0000	1.38
+++ eclipse/buildConfigs/sdk/build.properties	27 Sep 2010 15:45:48 -0000
@@ -30,7 +30,6 @@
 	macosx, cocoa, x86 & \
 	macosx, cocoa, x86_64 & \
 	linux, gtk, x86 & \
-	linux, gtk, ppc & \
 	linux, gtk, ppc64 & \
 	linux, gtk, x86_64 &\
 	linux, gtk, s390x &\
Index: eclipse/buildConfigs/sdk/customTargets.xml
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk/customTargets.xml,v
retrieving revision 1.102
diff -u -r1.102 customTargets.xml
--- eclipse/buildConfigs/sdk/customTargets.xml	19 Apr 2010 18:57:00 -0000	1.102
+++ eclipse/buildConfigs/sdk/customTargets.xml	27 Sep 2010 15:45:48 -0000
@@ -69,11 +69,6 @@
 		<antcall target="assemble" />
 	</target>
 
-	<target name="assemble.org.eclipse.sdk.linux.gtk.ppc">
-		<property name="archiveName" value="eclipse-SDK-${buildId}-linux-gtk-ppc.tar.gz" />
-		<antcall target="assemble" />
-	</target>
-
 	<target name="assemble.org.eclipse.sdk.linux.gtk.ppc64">
 		<property name="archiveName" value="eclipse-SDK-${buildId}-linux-gtk-ppc64.tar.gz" />
 		<antcall target="assemble" />
Index: eclipse/buildConfigs/sdk/oldsrcBuild/build.bat
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk/oldsrcBuild/build.bat,v
retrieving revision 1.3
diff -u -r1.3 build.bat
--- eclipse/buildConfigs/sdk/oldsrcBuild/build.bat	1 Feb 2010 14:22:37 -0000	1.3
+++ eclipse/buildConfigs/sdk/oldsrcBuild/build.bat	27 Sep 2010 15:45:51 -0000
@@ -32,7 +32,6 @@
 if %installOs%-%ws%-%arch%==win32-win32-x86 goto run
 if %installOs%-%ws%-%arch%==linux-motif-x86 goto run
 if %installOs%-%ws%-%arch%==linux-gtk-x86 goto run
-if %installOs%-%ws%-%arch%==linux-gtk-ppc goto run
 if %installOs%-%ws%-%arch%==linux-gtk-x86_64 goto run
 if %installOs%-%ws%-%arch%==linux-gtk-s390 goto run
 if %installOs%-%ws%-%arch%==linux-gtk-s390x goto run
Index: eclipse/buildConfigs/sdk/oldsrcBuild/fetch/instructions.html
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk/oldsrcBuild/fetch/instructions.html,v
retrieving revision 1.2
diff -u -r1.2 instructions.html
--- eclipse/buildConfigs/sdk/oldsrcBuild/fetch/instructions.html	1 Feb 2010 14:22:38 -0000	1.2
+++ eclipse/buildConfigs/sdk/oldsrcBuild/fetch/instructions.html	27 Sep 2010 15:45:51 -0000
@@ -85,12 +85,7 @@
     <td width="48%">linux</td>
     <td width="52%">gtk</td>
     <td width="52%">x86_64</td>
-  </tr>
-  <tr> 
-    <td width="48%">linux</td>
-    <td width="52%">gtk</td>
-    <td width="52%">ppc</td>
-  </tr>
+  </tr>  
   <tr> 
     <td width="48%">macosx</td>
     <td width="52%">carbon</td>
Index: eclipse/buildConfigs/sdk/oldsrcBuild/incl/instructions.html
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk/oldsrcBuild/incl/instructions.html,v
retrieving revision 1.2
diff -u -r1.2 instructions.html
--- eclipse/buildConfigs/sdk/oldsrcBuild/incl/instructions.html	1 Feb 2010 14:22:38 -0000	1.2
+++ eclipse/buildConfigs/sdk/oldsrcBuild/incl/instructions.html	27 Sep 2010 15:45:51 -0000
@@ -96,12 +96,7 @@
     <td width="48%">linux</td>
     <td width="52%">gtk</td>
     <td width="52%">x86_64</td>
-  </tr>
-  <tr> 
-    <td width="48%">linux</td>
-    <td width="52%">gtk</td>
-    <td width="52%">ppc</td>
-  </tr>
+  </tr>  
   <tr> 
     <td width="48%">macosx</td>
     <td width="52%">carbon</td>
Index: eclipse/buildConfigs/sdk/srcBuild/build
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk/srcBuild/build,v
retrieving revision 1.32
diff -u -r1.32 build
--- eclipse/buildConfigs/sdk/srcBuild/build	1 Feb 2010 14:22:38 -0000	1.32
+++ eclipse/buildConfigs/sdk/srcBuild/build	27 Sep 2010 15:45:51 -0000
@@ -52,7 +52,7 @@
         exit 1
 fi
 
-if [ "$os-$ws-$arch" = "linux-motif-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86_64" ] || [ "$os-$ws-$arch" = "solaris-motif-sparc" ] || [ "$os-$ws-$arch" = "solaris-gtk-x86" ] || [ "$os-$ws-$arch" = "solaris-gtk-sparc" ] || [ "$os-$ws-$arch" = "aix-motif-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-PA_RISC" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64_32"]  || [ "$os-$ws-$arch" = "qnx-photon-x86" ] || [ "$os-$ws-$arch" = "win32-win32-x86" ] || [ "$os-$ws-$arch" = "win32-win32-x86_64" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc64" ] || [ "$os-$ws-$arch" = "macosx-carbon-ppc" ] || [ "$os-$ws-$arch" = "macosx-cocoa-x86" ] || [ "$os-$ws-$arch" = "macosx-cocoa-x86_64" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64_32" ] 
+if [ "$os-$ws-$arch" = "linux-motif-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86_64" ] || [ "$os-$ws-$arch" = "solaris-motif-sparc" ] || [ "$os-$ws-$arch" = "solaris-gtk-x86" ] || [ "$os-$ws-$arch" = "solaris-gtk-sparc" ] || [ "$os-$ws-$arch" = "aix-motif-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-PA_RISC" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64_32"]  || [ "$os-$ws-$arch" = "qnx-photon-x86" ] || [ "$os-$ws-$arch" = "win32-win32-x86" ] || [ "$os-$ws-$arch" = "win32-win32-x86_64" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc64" ] || [ "$os-$ws-$arch" = "macosx-carbon-ppc" ] || [ "$os-$ws-$arch" = "macosx-cocoa-x86" ] || [ "$os-$ws-$arch" = "macosx-cocoa-x86_64" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64_32" ] 
 then
 			          
                  if [ ! -r eclipse ]
Index: eclipse/buildConfigs/sdk/srcBuild/run.xml
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk/srcBuild/run.xml,v
retrieving revision 1.5.4.1
diff -u -r1.5.4.1 run.xml
--- eclipse/buildConfigs/sdk/srcBuild/run.xml	20 Jul 2010 13:19:21 -0000	1.5.4.1
+++ eclipse/buildConfigs/sdk/srcBuild/run.xml	27 Sep 2010 15:45:51 -0000
@@ -28,7 +28,7 @@
 		 <target name="provision.sdk">
 		 		 <antcall target="run.director">
 		 		 		 <param name="p2.director.installIU" value="org.eclipse.sdk.ide" />
-		 		 		 <param name="p2.director.version" value="3.6.0.${buildId}" />
+		 		 		 <param name="p2.director.version" value="3.7.0.${buildId}" />
 		 		 		 <param name="p2.director.profile" value="SDKProfile" />
 		 		 		 <param name="p2.director.install.path" value="${p2.sdk.install}/eclipse" />
 		 		 		 <param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
Index: eclipse/buildConfigs/test.framework/build.properties
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/test.framework/build.properties,v
retrieving revision 1.10
diff -u -r1.10 build.properties
--- eclipse/buildConfigs/test.framework/build.properties	29 Feb 2008 15:41:40 -0000	1.10
+++ eclipse/buildConfigs/test.framework/build.properties	27 Sep 2010 15:45:51 -0000
@@ -39,3 +39,17 @@
 
 zipargs=
 tarargs=
+
+individualSourceBundles=true
+collPlace=eclipse
+collBase=.
+flattenDependencies=true
+parallelCompilation=true
+p2.gathering=true
+p2.compress=true
+p2.publishonerror=true
+p2.build.repo=file:${buildDirectory}/buildRepoTestFramework
+zipargs=
+tarargs=
+skipMirroring=true
+
Index: eclipse/buildConfigs/test.framework/customTargets.xml
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/test.framework/customTargets.xml,v
retrieving revision 1.6
diff -u -r1.6 customTargets.xml
--- eclipse/buildConfigs/test.framework/customTargets.xml	20 Nov 2009 21:03:36 -0000	1.6
+++ eclipse/buildConfigs/test.framework/customTargets.xml	27 Sep 2010 15:45:51 -0000
@@ -1,194 +1,188 @@
 <project name="Build specific targets and properties" default="noDefault" basedir=".">
 
-<property name="postingDirectory" value="${buildDirectory}" />
+	<property name="postingDirectory" value="${buildDirectory}" />
 
-<!-- ===================================================================== -->
-<!-- Run a given ${target} on all elements being built -->
-<!-- ===================================================================== -->
-<target name="allElements">
-	<ant antfile="${genericTargets}" target="${target}" >
-		<property name="type" value="feature" />
-		<property name="id" value="org.eclipse.test" />
-	</ant>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Targets to assemble the built elements for particular configurations  -->
-<!-- These generally call the generated assemble scripts (named in -->
-<!-- ${assembleScriptName}) but may also add pre and post processing -->
-<!-- Add one target for each root element and each configuration -->
-<!-- ===================================================================== -->
-
-<target name="assemble.org.eclipse.test">
-	<property name="archiveName" value="eclipse-test-framework-${buildId}.zip"/>
-	<antcall target="assemble" />
-</target>
-
-	<target name="assemble">
-		<mkdir dir="${postingDirectory}/${buildLabel}/checksum"/>
-		<property name="archiveFullPath" value="${postingDirectory}/${buildLabel}/${archiveName}" />
-		<ant antfile="${assembleScriptName}" />
-		<checksum file="${archiveFullPath}" property="md5"/>
-		<checksum file="${archiveFullPath}" algorithm="SHA" property="sha"/>
-		<echo message="${md5} *${archiveName}" file="${postingDirectory}/${buildLabel}/checksum/${archiveName}.md5"/>
-		<echo message="${sha} *${archiveName}" file="${postingDirectory}/${buildLabel}/checksum/${archiveName}.sha1"/>
+	<!-- ===================================================================== -->
+	<!-- Run a given ${target} on all elements being built -->
+	<!-- ===================================================================== -->
+	<available property="allElementsFile" file="${builder}/allElements.xml" value="${builder}/allElements.xml" />
+	<property name="allElementsFile" location="${eclipse.pdebuild.templates}/headless-build/allElements.xml" />
+
+	<import file="${allElementsFile}" />
+	<target name="allElements">
+		<antcall target="allElementsDelegator" />
 	</target>
 
+	<!-- ===================================================================== -->
+	<!-- Targets to assemble the built elements for particular configurations  -->
+	<!-- These generally call the generated assemble scripts (named in -->
+	<!-- ${assembleScriptName}) but may also add pre and post processing -->
+	<!-- Add one target for each root element and each configuration -->
+	<!-- ===================================================================== -->
+
 	<target name="postPackage">
 	</target>
 
-<!-- ===================================================================== -->
-<!-- Check out map files from correct repository -->
-<!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
-<!-- ===================================================================== -->
-<target name="checkLocal">
-	<available property="mapsLocal" file="${buildDirectory}/maps/org.eclipse.releng" />
-</target>
-
-<target name="getMapFiles" depends="checkLocal" unless="mapsLocal">
-
-	<!-- ***  change the repo info -->
-	<property name="mapCvsRoot" value="${mapsRepo}" />
-
-	<property name="mapVersionTag" value="HEAD" />
-	<cvs cvsRoot="${mapCvsRoot}"
-		package="org.eclipse.releng"
-		dest="${buildDirectory}/maps"
-		tag="${mapVersionTag}"
-	/>
-	<!--tag the map files project-->
-	<antcall target="tagMapFiles" />
-	<antcall target="getPrebuiltElements" />
-</target>
-
-<target name="compareMapFiles" if="compareMaps">
-	<property file="${mapTag.properties}"/>
-	<property name="cvsDiffFile" value="${buildDirectory}/cvsDiff.txt" />
-	<cvs cvsRoot="${mapCvsRoot}" dest="${buildDirectory}/maps" command="diff -w -r ${lastMapTag}" output="${cvsDiffFile}" />
-	<modifiedMaps mapDiffFile="${cvsDiffFile}" />
-</target>
-
-<target name="tagMapFiles" if="tagMaps">
-	<!-- Stores tag on the filesystem so map files can be compared -->
-	<echo file="${mapTag.properties}">
+	<!-- ===================================================================== -->
+	<!-- Check out map files from correct repository -->
+	<!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
+	<!-- ===================================================================== -->
+	<target name="checkLocal">
+		<available property="mapsLocal" file="${buildDirectory}/maps/org.eclipse.releng" />
+	</target>
+
+	<target name="getMapFiles" depends="checkLocal" unless="mapsLocal">
+
+		<!-- ***  change the repo info -->
+		<property name="mapCvsRoot" value="${mapsRepo}" />
+
+		<property name="mapVersionTag" value="HEAD" />
+		<cvs cvsRoot="${mapCvsRoot}" package="org.eclipse.releng" dest="${buildDirectory}/maps" tag="${mapVersionTag}" />
+		<!--tag the map files project-->
+		<antcall target="tagMapFiles" />
+		<antcall target="getPrebuiltElements" />
+	</target>
+
+	<target name="compareMapFiles" if="compareMaps">
+		<property file="${mapTag.properties}" />
+		<property name="cvsDiffFile" value="${buildDirectory}/cvsDiff.txt" />
+		<cvs cvsRoot="${mapCvsRoot}" dest="${buildDirectory}/maps" command="diff -w -r ${lastMapTag}" output="${cvsDiffFile}" />
+		<modifiedMaps mapDiffFile="${cvsDiffFile}" />
+	</target>
+
+	<target name="tagMapFiles" if="tagMaps">
+		<!-- Stores tag on the filesystem so map files can be compared -->
+		<echo file="${mapTag.properties}">
 	lastMapTag=${buildId}
 </echo>
-	<cvs dest="${buildDirectory}/maps/org.eclipse.releng" command="tag ${buildId}" />
-</target>
+		<cvs dest="${buildDirectory}/maps/org.eclipse.releng" command="tag ${buildId}" />
+	</target>
+
+	<target name="getPrebuiltElements">
+	</target>
+
+	<!-- ===================================================================== -->
+	<!-- Steps to do before setup -->
+	<!-- ===================================================================== -->
+	<target name="preSetup">
+	</target>
 
-<target name="getPrebuiltElements">
-</target>
+	<!-- ===================================================================== -->
+	<!-- Steps to do after setup but before starting the build proper -->
+	<!-- ===================================================================== -->
+	<target name="postSetup">
+	</target>
 
-<!-- ===================================================================== -->
-<!-- Steps to do before setup -->
-<!-- ===================================================================== -->
-<target name="preSetup">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do after setup but before starting the build proper -->
-<!-- ===================================================================== -->
-<target name="postSetup">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do before fetching the build elements -->
-<!-- ===================================================================== -->
-<target name="preFetch">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do after the fetch -->
-<!-- ===================================================================== -->
-<target name="postFetch">
-	<replace dir="${buildDirectory}/plugins" value="${buildId}" token="@build@">
-		<include name="**/about.mappings" />
-	</replace>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do before generating build scripts -->
-<!-- ===================================================================== -->
-<target name="preGenerate">
-
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do after generating the build scripts -->
-<!-- ===================================================================== -->
-<target name="postGenerate">
-	<antcall target="clean" />
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do before assembling -->
-<!-- ===================================================================== -->
-<target name="preAssemble">
-
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do after assembling-->
-<!-- ===================================================================== -->
-<target name="postAssemble">
-</target>
-
-
-<!-- ===================================================================== -->
-<!-- Steps to do before running the build.xmls for the elements being built. -->
-<!-- ===================================================================== -->
-<target name="preProcess">
-	<replace dir="${buildDirectory}/plugins" value="${buildId}" token="@build@">
-		<include name="**/about.mappings" />
-	</replace>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do after running the build.xmls for the elements being built. -->
-<!-- ===================================================================== -->
-<target name="postProcess">
-	<condition property="logsAvailable">
-		<istrue value="${javacVerbose}"/> 
-	</condition>
-	<antcall target="gatherLogs" />
-</target>
+	<!-- ===================================================================== -->
+	<!-- Steps to do before fetching the build elements -->
+	<!-- ===================================================================== -->
+	<target name="preFetch">
+	</target>
+
+	<!-- ===================================================================== -->
+	<!-- Steps to do after the fetch -->
+	<!-- ===================================================================== -->
+	<target name="postFetch">
+		<replace dir="${buildDirectory}/plugins" value="${buildId}" token="@build@">
+			<include name="**/about.mappings" />
+		</replace>
+	</target>
+
+	<!-- ===================================================================== -->
+	<!-- Steps to do before generating build scripts -->
+	<!-- ===================================================================== -->
+	<target name="preGenerate">
+
+	</target>
+
+	<!-- ===================================================================== -->
+	<!-- Steps to do after generating the build scripts -->
+	<!-- ===================================================================== -->
+	<target name="postGenerate">
+		<antcall target="clean" />
+	</target>
+
+	<!-- ===================================================================== -->
+	<!-- Steps to do before assembling -->
+	<!-- ===================================================================== -->
+	<target name="preAssemble">
+
+	</target>
+
+	<!-- ===================================================================== -->
+	<!-- Steps to do after assembling-->
+	<!-- ===================================================================== -->
+	<target name="postAssemble">
+	</target>
+
+
+	<!-- ===================================================================== -->
+	<!-- Steps to do before running the build.xmls for the elements being built. -->
+	<!-- ===================================================================== -->
+	<target name="preProcess">
+		<replace dir="${buildDirectory}/plugins" value="${buildId}" token="@build@">
+			<include name="**/about.mappings" />
+		</replace>
+	</target>
+
+	<!-- ===================================================================== -->
+	<!-- Steps to do after running the build.xmls for the elements being built. -->
+	<!-- ===================================================================== -->
+	<target name="postProcess">
+		<condition property="logsAvailable">
+			<istrue value="${javacVerbose}" />
+		</condition>
+		<antcall target="gatherLogs" />
+	</target>
 
 	<target name="prePackage" />
 
 
-<!-- ===================================================================== -->
-<!-- Steps to do after everything is built and assembled -->
-<!-- (e.g., testing, posting, emailing, ...) -->
-<!-- ===================================================================== -->
-<target name="postBuild">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Helper targets -->
-<!-- ===================================================================== -->
-<target name="gatherLogs" if="logsAvailable">
-	<mkdir dir="${postingDirectory}/${buildLabel}/compilelogs" />
-	<antcall target="allElements">
-		<param name="target" value="gatherLogs" />
-	</antcall>
-
-	<unzip dest="${postingDirectory}/${buildLabel}/compilelogs" overwrite="true">
-		<fileset dir="${buildDirectory}/features/org.eclipse.test">
-			<include name="*.log.zip" />
-		</fileset>
-	</unzip>
-</target>
-<target name="clean" unless="noclean">
-	<antcall target="allElements">
-		<param name="target" value="cleanElement" />
-	</antcall>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Default target                                                        -->
-<!-- ===================================================================== -->
-<target name="noDefault">
-	<echo message="You must specify a target when invoking this file" />
-</target>
+	<!-- ===================================================================== -->
+	<!-- Steps to do after everything is built and assembled -->
+	<!-- (e.g., testing, posting, emailing, ...) -->
+	<!-- ===================================================================== -->
+	<target name="postBuild">
+		<antcall target="packageTestFramework" />
+	</target>
+
+
+	<!-- ===================================================================== -->
+	<!-- Helper targets -->
+	<!-- ===================================================================== -->
+	<target name="gatherLogs" if="logsAvailable">
+		<mkdir dir="${postingDirectory}/${buildLabel}/compilelogs" />
+		<antcall target="allElements">
+			<param name="target" value="gatherLogs" />
+		</antcall>
+
+		<unzip dest="${postingDirectory}/${buildLabel}/compilelogs" overwrite="true">
+			<fileset dir="${buildDirectory}/features/org.eclipse.test">
+				<include name="*.log.zip" />
+			</fileset>
+		</unzip>
+	</target>
+	<target name="clean" unless="noclean">
+		<antcall target="allElements">
+			<param name="target" value="cleanElement" />
+		</antcall>
+	</target>
+
+	<target name="packageTestFramework">
+		<zip zipfile="${postingDirectory}/${buildLabel}/eclipse-test-framework-${buildId}.zip" basedir="${buildDirectory}/buildRepoTestFramework"/>		
+		<mkdir dir="${postingDirectory}/${buildLabel}/checksum" />
+		<checksum file="${postingDirectory}/${buildLabel}/eclipse-test-framework-${buildId}.zip" property="md5" />
+		<checksum file="${postingDirectory}/${buildLabel}/eclipse-test-framework-${buildId}.zip" algorithm="SHA" property="sha" />
+		<echo message="${md5} *eclipse-test-framework-${buildId}.zip" file="${postingDirectory}/${buildLabel}/checksum/eclipse-test-framework-${buildId}.zip.md5" />
+		<echo message="${sha} *eclipse-test-framework-${buildId}.zip" file="${postingDirectory}/${buildLabel}/checksum/eclipse-test-framework-${buildId}.zip.sha1" />
+	</target>
+
+
+	<!-- ===================================================================== -->
+	<!-- Default target                                                        -->
+	<!-- ===================================================================== -->
+	<target name="noDefault">
+		<echo message="You must specify a target when invoking this file" />
+	</target>
 
 </project>
Index: eclipse/buildConfigs/test.framework/packager/customTargets.xml
===================================================================
RCS file: eclipse/buildConfigs/test.framework/packager/customTargets.xml
diff -N eclipse/buildConfigs/test.framework/packager/customTargets.xml
--- eclipse/buildConfigs/test.framework/packager/customTargets.xml	31 Aug 2006 16:01:09 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-<project default="noDefault">
-
-<target name="noDefault" />
-
-<!-- set the root of the output file name -->
-<property name="archiveRoot" value="eclipse-test-framework-${buildId}"/>
-	
-<!-- Target to get the packaging map files for the components of interest
-     The files must be fetched into the downloadDirectory folder -->
-<target name="getMapFiles" unless="mapsFetched">
-	<copy file="${packagingInfo}/../../../../packaging.map" tofile="${downloadDirectory}/packaging.map" />
-</target>
-
-<target name="assemble.common.common.common.xml">
-	<antcall target="assembler">
-		<param name="archiveName" value="${archiveRoot}.zip"/>
-	</antcall>
-</target>
-	
-<target name="assembler">
-	<mkdir dir="${postingDirectory}/${buildLabel}/checksum" />
-	<property name="archiveFullPath" value="${postingDirectory}/${buildLabel}/${archiveName}" />
-	<ant antfile="${assembleScriptName}" />
-	<checksum file="${archiveFullPath}" property="md5"/>
-	<checksum file="${archiveFullPath}" algorithm="SHA" property="sha"/>
-	<echo message="${md5} *${archiveName}" file="${postingDirectory}/${buildLabel}/checksum/${archiveName}.md5"/>
-	<echo message="${sha} *${archiveName}" file="${postingDirectory}/${buildLabel}/checksum/${archiveName}.sha1"/>
-</target>
-
-</project>
Index: eclipse/buildConfigs/test.framework/packager/packager.properties
===================================================================
RCS file: eclipse/buildConfigs/test.framework/packager/packager.properties
diff -N eclipse/buildConfigs/test.framework/packager/packager.properties
--- eclipse/buildConfigs/test.framework/packager/packager.properties	24 Mar 2006 18:03:56 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,77 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-################## CONTENT ##########################
-# A comma separated list of feature ids that will be part of the archive.
-# This list must completely cover the features you want and all their dependencies.
-featureList = \
-	org.eclipse.test
-
-# A comma seperated list of the components from which the features listed 
-# in featureList can be found.  This is used to optimize the set of zips downloaded.
-# The values given here should match those found at the end of the lines in the map file
-# Specify * if you don't know
-componentFilter=full,root
-
-# The zip content types to fetch.  Like the componentFilter, this filters the set of 
-# available zips and allows the packager to optimize the set of zips downloaded.
-contentFilter=runtime
-
-# The platform configuration (e.g., os, ws, arch) being packaged. *,*,* can be
-# specified when the config is completely platform independent. Only one configuration
-# can be specified at a time.
-config=\
-	common,common,common
-
-archivesFormat =\
- 	common, common, common-zip
-
-################ FOLDERS ############################
-#The directory used as a base for the all process
-baseDirectory = ${packagingInfo}
-
-# The place in which all the scripts will be contained
-workingDirectory = ${baseDirectory}/workingPlace
-
-# The folder in which all the zips will be downloaded
-downloadDirectory = ${buildDirectory}/toPackage
-
-# The folder where all the operations are being done
-tempDirectory = ${baseDirectory}/temp
-
-# The place in which the zips are located
-sourceFolder = ${downloadDirectory}
-
-################# SOURCES ###########################
-# A comma separated list of the path where features and plugins are located.
-# Locations can either be relative or absolute.
-# An entry must point to one level above the "features" and "plugins" directory
-featurePaths = eclipse
-baseLocation=${tempDirectory}/${featurePaths}
-
-################## MISC ##########################
-# This controls the build id in the default name of the archive
-buildId=
-
-# extra arguments to be passed to zip / unzip (-y is usually used on unix for zip) / tar
-zipargs=-y -q
-unzipArgs=-qq
-tarargs=--owner=0 --group=0 
-
-# the prefix in the archive
-archivePrefix=eclipse
-
-# the folder in which the files that will be added to the archive will be placed
-collectingFolder=eclipse
-
-
-############### PACKAGING.PROPERTIES #############################
-# a relative path to the file containing the properties for element to package
-packagingProperties = packaging.properties
Index: eclipse/buildConfigs/test.framework/packager/packaging.properties
===================================================================
RCS file: eclipse/buildConfigs/test.framework/packager/packaging.properties
diff -N eclipse/buildConfigs/test.framework/packager/packaging.properties
--- eclipse/buildConfigs/test.framework/packager/packaging.properties	24 Mar 2006 18:03:56 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# The chmod and links must indicate a path relative to the root directory.
-
-# List the files and folders to be copied into the root of eclipse for all platform
-# configurations
-root=epl-v10.html, notice.html
Index: eclipse/helper.xml
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/helper.xml,v
retrieving revision 1.140
diff -u -r1.140 helper.xml
--- eclipse/helper.xml	1 Feb 2010 14:22:37 -0000	1.140
+++ eclipse/helper.xml	27 Sep 2010 15:45:48 -0000
@@ -358,7 +358,7 @@
 						-print					    
 						-output ${postingDirectory}/${buildLabel}/performance/
 						-config eplnx1,eplnx2,epwin2,epwin3
-			            -dataDir ${postingDirectory}/../../data/v36
+			            -dataDir ${postingDirectory}/../../data/v37
 						-config.properties ${eclipse.perf.config.descriptors}
 						-scenario.pattern org.eclipse.%.test%" />
 		<!-- baselines arguments are no longer necessary since bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=209322 has been fixed...
@@ -376,7 +376,7 @@
 
 	<replace file="${postingDirectory}/${buildLabel}/performance/performance.php" token="@buildType@" value="${buildType}" />
 	<copy todir="/home/users/ecperf/data/" failonerror="false" overwrite="true">
-		<fileset dir=" /builds/transfer/files/master/data/v36" />
+		<fileset dir=" /builds/transfer/files/master/data/v37" />
 	</copy>
 
 </target>
Index: eclipse/publishingFiles/staticDropFiles/logs.php
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/publishingFiles/staticDropFiles/logs.php,v
retrieving revision 1.22
diff -u -r1.22 logs.php
--- eclipse/publishingFiles/staticDropFiles/logs.php	1 Apr 2010 21:34:04 -0000	1.22
+++ eclipse/publishingFiles/staticDropFiles/logs.php	27 Sep 2010 15:45:51 -0000
@@ -182,7 +182,7 @@
     $buildId = getBuildId(); 
     echo "<title>Test Results for $buildId </title>\n";
 
-echo "<h3>Logs $buildType $buildName</h3>\n";
+echo "<h3>Logs</h3>\n";
 
 echo <<<END
 <ul>
@@ -217,13 +217,9 @@
 <?php
         
         listLogs("testresults/consolelogs");
-        echo "<br><strong>Individual linux.gtk.x86 test logs</strong>";
-        listLogs("testresults/linux.gtk.x86");
         echo "<strong>Individual linux.gtk.x86_6.0 test logs</strong>";
         listLogs("testresults/linux.gtk.x86_6.0");
         listLogs("testresults/consolelogs");
-        echo "<strong>Individual win32.win32.x86 test logs</strong>";
-        listLogs("testresults/win32.win32.x86");
         echo "<strong>Individual win32.win32.x86_6.0 test logs</strong>";
         listLogs("testresults/win32.win32.x86_6.0");
         echo "<strong>Individual macosx.cocoa.x86_5.0 test logs</strong>";
@@ -231,19 +227,6 @@
 ?>
 </ul>
 </li>
-<?php if (! (preg_match("/N/i",$buildId))) {
-echo " <li><a href=\"testresults/versiontool/results.xml\"><b> Versioning Compare Tool Output Logs </b></a>";
-echo "This log compares the build's plugin and features versions with 3.5. </li> ";
-}
-?>
-<?php
-echo " <li><a href=\"apitools/apitoolsverifications/html/index.html\"><b>API Tools Version Verification Report</b></a>";
-echo "  This tool verifies the versions of the plugins against Eclipse 3.5.2.  Exclusions are listed in org.eclipse.releng/apiexclude/exclude_list_external.txt. </li> ";
-?>
-
-</li>
-</li>
-</div>
 </div>
 </br></br></br>
 <div id="footer">
Index: eclipse/publishingFiles/templateFiles/testResults.php.template
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/publishingFiles/templateFiles/testResults.php.template,v
retrieving revision 1.62
diff -u -r1.62 testResults.php.template
--- eclipse/publishingFiles/templateFiles/testResults.php.template	1 Apr 2010 21:34:03 -0000	1.62
+++ eclipse/publishingFiles/templateFiles/testResults.php.template	27 Sep 2010 15:45:51 -0000
@@ -126,16 +126,22 @@
 </li>
 <?php if (! (preg_match("/N/i",$buildName))) {
 echo " <li><a href=\"testresults/versiontool/results.xml\"><b> Versioning Compare Tool Output Logs </b></a>";
-echo "This log compares the build's plugin and features versions with 3.5 </li> ";
+echo "This log compares the build's plugin and features versions with 3.6</li> ";
 }
 ?>
 <?php
 echo " <li><a href=\"apitools/apitoolsverifications/html/index.html\"><b>API Tools Version Verification Report</b></a>";
-echo "  This tool verifies the versions of the plugins against Eclipse 3.5.2.  Exclusions are listed in org.eclipse.releng/apiexclude/exclude_list_external.txt. </li> ";
+echo "  This tool verifies the versions of the plugins against Eclipse 3.6.  Exclusions are listed in org.eclipse.releng/apiexclude/exclude_list_external.txt. </li> ";
 ?>
+
 <?php
-echo"<li><a href=\"apitools/report.html\"><b>API Tools Post-API Freeze Report</b></a>  This report describes API changes since 3.6M6.  Exclusions are listed in org.eclipse.releng/apiexclude/exclude_list.txt. </li>";
+echo " <li><a href=\"apitools/apitoolsdeprecations/apideprecation.html\"><b>API Tools Deprecation Report</b></a>";
+echo "  This tool generates a report for API deprecated since 3.6. </li> ";
 ?>
+
+<!-- <?php
+echo"<li><a href=\"apitools/report.html\"><b>API Tools Post-API Freeze Report</b></a>  This report describes API changes since 3.6M6.  Exclusions are listed in org.eclipse.releng/apiexclude/exclude_list.txt. </li>";
+?> -->
 <?php
 echo " <li><a href=\"apitools/apifilters-$buildName.zip\"><b>Zip of .api_filters files used in the build</b></a></li>";
 ?>
@@ -153,8 +159,8 @@
 the number of errors is indicated in a red bold font and you may access the page specific to each component on
 a specific platform by clicking the cell link.</br></br>
 <table width="85%" border="1" bgcolor="#EEEEEE" rules="groups" align="center">
-<tr bgcolor="#9999CC"> <th rowspan="2" width="40%" align="center"> org.eclipse <br> Component </th><th colspan="5" align="center"> Test Configurations </th></tr> 
-<tr bgcolor="#9999CC"><th width="12%">RHEL4, SUN 1.5.0<th width="12%">RHEL4, SUN 1.6.0 </th><th width="12%"> MacOSX, Apple  1.5.0_16-133</th><th width="12%"> WIN XP, SUN 1.5.0 </th><th width="12%"> WIN XP, SUN 1.6.0 </th></tr>
+<tr bgcolor="#9999CC"> <th rowspan="2" width="40%" align="center"> org.eclipse <br> Component </th><th colspan="5" align="center"> Test Configurations </th></tr>
+<tr bgcolor="#9999CC"><th width="20%">RHEL5, SUN 1.6.0 </th><th width="20%"> MacOSX, Apple  1.5.0_16-133</th><th width="20%"> WIN XP, SUN 1.6.0 </th><th><th width="20%"></th></tr>
 %testresults% </table>
 </br>
 </div>
Index: eclipse/publishingFiles/testManifest.xml
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/publishingFiles/testManifest.xml,v
retrieving revision 1.90.2.1
diff -u -r1.90.2.1 testManifest.xml
--- eclipse/publishingFiles/testManifest.xml	8 Jun 2010 19:12:50 -0000	1.90.2.1
+++ eclipse/publishingFiles/testManifest.xml	27 Sep 2010 15:45:51 -0000
@@ -490,14 +490,6 @@
 		<effectedFile id="RE"></effectedFile>
 	</logFile>
 
-<logFile name="org.eclipse.releng.tests_win32.win32.x86.xml">
-	<effectedFile id="SW"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.releng.tests_linux.gtk.x86.xml">
-	<effectedFile id="SLG2"></effectedFile>
-</logFile>
-
 <logFile name="org.eclipse.releng.tests_macosx.cocoa.x86_5.0.xml">
 	<effectedFile id="SMCC"></effectedFile>
 </logFile>
@@ -506,30 +498,6 @@
 	<effectedFile id="SLG2"></effectedFile>
 </logFile>
 
-<logFile name="org.eclipse.pde.ui.tests_win32.win32.x86.xml">
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SW"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.pde.api.tools.tests_win32.win32.x86.xml">
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SW"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.pde.ui.tests_linux.gtk.x86.xml">
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SLG2"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.pde.api.tools.tests_linux.gtk.x86.xml">
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SLG2"></effectedFile>
-</logFile>
-
 <logFile name="org.eclipse.pde.ui.tests_macosx.cocoa.x86_5.0.xml">
 	<effectedFile id="PDE"></effectedFile>
 	<effectedFile id="PDESDK"></effectedFile>
@@ -554,18 +522,6 @@
 	<effectedFile id="SLG2"></effectedFile>
 </logFile>
 
-<logFile name="org.eclipse.pde.ds.tests_win32.win32.x86.xml">
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SW"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.pde.ds.tests_linux.gtk.x86.xml">
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SLG2"></effectedFile>
-</logFile>
-
 <logFile name="org.eclipse.pde.ds.tests_macosx.cocoa.x86_5.0.xml">
 	<effectedFile id="PDE"></effectedFile>
 	<effectedFile id="PDESDK"></effectedFile>
@@ -578,24 +534,12 @@
 	<effectedFile id="SLG2"></effectedFile>
 </logFile>
 
-<logFile name="org.eclipse.pde.build.tests_win32.win32.x86.xml">
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SW"></effectedFile>
-</logFile>
-
 <logFile name="org.eclipse.pde.build.tests_win32.win32.x86_6.0.xml">
 	<effectedFile id="PDE"></effectedFile>
 	<effectedFile id="PDESDK"></effectedFile>
 	<effectedFile id="SW"></effectedFile>
 </logFile>
 
-<logFile name="org.eclipse.pde.build.tests_linux.gtk.x86.xml">
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SLG2"></effectedFile>
-</logFile>
-
 <logFile name="org.eclipse.pde.build.tests_macosx.cocoa.x86_5.0.xml">
 	<effectedFile id="PDE"></effectedFile>
 	<effectedFile id="PDESDK"></effectedFile>
@@ -608,150 +552,6 @@
 	<effectedFile id="SLG2"></effectedFile>
 </logFile>
 
-<logFile name="org.eclipse.jdt.core.tests.builder_win32.win32.x86.xml">
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SW"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.jdt.core.tests.compiler_win32.win32.x86.xml">
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SW"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.jdt.core.tests.model_win32.win32.x86.xml">
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SW"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.jdt.core.tests.performance_win32.win32.x86.xml">
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SW"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.jdt.debug.tests_win32.win32.x86.xml">
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SW"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.jdt.text.tests_win32.win32.x86.xml">
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SW"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.search.tests_win32.win32.x86.xml">
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SW"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.jdt.ui.tests_win32.win32.x86.xml">
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SW"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.jdt.ui.tests.refactoring_win32.win32.x86.xml">
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SW"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.jdt.core.tests.builder_linux.gtk.x86.xml">
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SLG2"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.jdt.core.tests.compiler_linux.gtk.x86.xml">
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SLG2"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.jdt.core.tests.model_linux.gtk.x86.xml">
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SLG2"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.jdt.core.tests.performance_linux.gtk.x86.xml">
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SLG2"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.jdt.debug.tests_linux.gtk.x86.xml">
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SLG2"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.jdt.text.tests_linux.gtk.x86.xml">
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SLG2"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.search.tests_linux.gtk.x86.xml">
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SLG2"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.jdt.ui.tests_linux.gtk.x86.xml">
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SLG2"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.jdt.ui.tests.refactoring_linux.gtk.x86.xml">
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SLG2"></effectedFile>
-</logFile>
-
 <logFile name="org.eclipse.jdt.apt.tests_macosx.cocoa.x86_5.0.xml">
 	<effectedFile id="JMC"></effectedFile>
 	<effectedFile id="JMCSDK"></effectedFile>
@@ -829,345 +629,10 @@
 	<effectedFile id="JMCSDK"></effectedFile>
 	<effectedFile id="PDE"></effectedFile>
 	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SMCC"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.jdt.apt.tests_linux.gtk.x86_6.0.xml">
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SLG2"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.jdt.compiler.tool.tests_linux.gtk.x86_6.0.xml">
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SLG2"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.jdt.apt.pluggable.tests_linux.gtk.x86_6.0.xml">
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SLG2"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.jdt.core.tests.builder_linux.gtk.x86_6.0.xml">
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SLG2"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.jdt.core.tests.compiler_linux.gtk.x86_6.0.xml">
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SLG2"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.jdt.core.tests.model_linux.gtk.x86_6.0.xml">
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SLG2"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.jdt.core.tests.performance_linux.gtk.x86_6.0.xml">
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SLG2"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.jdt.debug.tests_linux.gtk.x86_6.0.xml">
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SLG2"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.jdt.text.tests_linux.gtk.x86_6.0.xml">
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SLG2"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.search.tests_linux.gtk.x86_6.0.xml">
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SLG2"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.jdt.ui.tests_linux.gtk.x86_6.0.xml">
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SLG2"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.jdt.ui.tests.refactoring_linux.gtk.x86_6.0.xml">
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SLG2"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.ant.tests.core_win32.win32.x86.xml">
-	<effectedFile id="PW"></effectedFile>
-	<effectedFile id="PWSDK"></effectedFile>
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SW"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.ant.tests.ui_win32.win32.x86.xml">
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SLG2"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.compare.tests_win32.win32.x86.xml">
-	<effectedFile id="PW"></effectedFile>
-	<effectedFile id="PWSDK"></effectedFile>
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SW"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.core.filebuffers.tests_win32.win32.x86.xml">
-	<effectedFile id="PW"></effectedFile>
-	<effectedFile id="PWSDK"></effectedFile>
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SW"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.core.tests.resources_win32.win32.x86.xml">
-	<effectedFile id="PW"></effectedFile>
-	<effectedFile id="PWSDK"></effectedFile>
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SW"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.jface.text.tests_win32.win32.x86.xml">
-	<effectedFile id="PW"></effectedFile>
-	<effectedFile id="PWSDK"></effectedFile>
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SW"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.team.tests.core_win32.win32.x86.xml">
-	<effectedFile id="PW"></effectedFile>
-	<effectedFile id="PWSDK"></effectedFile>
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SW"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.team.tests.cvs.core_win32.win32.x86.xml">
-	<effectedFile id="PW"></effectedFile>
-	<effectedFile id="PWSDK"></effectedFile>
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SW"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.core.tests.net_win32.win32.x86.xml">
-	<effectedFile id="PW"></effectedFile>
-	<effectedFile id="PWSDK"></effectedFile>
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SW"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.text.tests_win32.win32.x86.xml">
-	<effectedFile id="PW"></effectedFile>
-	<effectedFile id="PWSDK"></effectedFile>
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SW"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.ua.tests_win32.win32.x86.xml">
-	<effectedFile id="PW"></effectedFile>
-	<effectedFile id="PWSDK"></effectedFile>
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SW"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.ui.editors.tests_win32.win32.x86.xml">
-	<effectedFile id="PW"></effectedFile>
-	<effectedFile id="PWSDK"></effectedFile>
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SW"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.ui.tests.navigator_win32.win32.x86.xml">
-	<effectedFile id="PW"></effectedFile>
-	<effectedFile id="PWSDK"></effectedFile>
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SW"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.ui.tests.views.properties.tabbed_win32.win32.x86.xml">
-	<effectedFile id="PW"></effectedFile>
-	<effectedFile id="PWSDK"></effectedFile>
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SW"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.ui.workbench.texteditor.tests_win32.win32.x86.xml">
-	<effectedFile id="PW"></effectedFile>
-	<effectedFile id="PWSDK"></effectedFile>
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SW"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.update.tests.core_win32.win32.x86.xml">
-	<effectedFile id="PW"></effectedFile>
-	<effectedFile id="PWSDK"></effectedFile>
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SW"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.ltk.core.refactoring.tests_win32.win32.x86.xml">
-	<effectedFile id="PW"></effectedFile>
-	<effectedFile id="PWSDK"></effectedFile>
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SW"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.ltk.ui.refactoring.tests_win32.win32.x86.xml">
-	<effectedFile id="PW"></effectedFile>
-	<effectedFile id="PWSDK"></effectedFile>
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SW"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.ant.tests.core_linux.gtk.x86.xml">
-	<effectedFile id="PLG2"></effectedFile>
-	<effectedFile id="PLG2SDK"></effectedFile>
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SLG2"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.ant.tests.ui_linux.gtk.x86.xml">
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SLG2"></effectedFile>
-</logFile>
-
-
-<logFile name="org.eclipse.compare.tests_linux.gtk.x86.xml">
-	<effectedFile id="PLG2"></effectedFile>
-	<effectedFile id="PLG2SDK"></effectedFile>
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SLG2"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.core.filebuffers.tests_linux.gtk.x86.xml">
-	<effectedFile id="PLG2"></effectedFile>
-	<effectedFile id="PLG2SDK"></effectedFile>
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SLG2"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.core.tests.resources_linux.gtk.x86.xml">
-	<effectedFile id="PLG2"></effectedFile>
-	<effectedFile id="PLG2SDK"></effectedFile>
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SLG2"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.jface.text.tests_linux.gtk.x86.xml">
-	<effectedFile id="PLG2"></effectedFile>
-	<effectedFile id="PLG2SDK"></effectedFile>
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SLG2"></effectedFile>
+	<effectedFile id="SMCC"></effectedFile>
 </logFile>
 
-<logFile name="org.eclipse.team.tests.core_linux.gtk.x86.xml">
-	<effectedFile id="PLG2"></effectedFile>
-	<effectedFile id="PLG2SDK"></effectedFile>
+<logFile name="org.eclipse.jdt.apt.tests_linux.gtk.x86_6.0.xml">
 	<effectedFile id="JA"></effectedFile>
 	<effectedFile id="JASDK"></effectedFile>
 	<effectedFile id="PDE"></effectedFile>
@@ -1175,9 +640,7 @@
 	<effectedFile id="SLG2"></effectedFile>
 </logFile>
 
-<logFile name="org.eclipse.team.tests.cvs.core_linux.gtk.x86.xml">
-	<effectedFile id="PLG2"></effectedFile>
-	<effectedFile id="PLG2SDK"></effectedFile>
+<logFile name="org.eclipse.jdt.compiler.tool.tests_linux.gtk.x86_6.0.xml">
 	<effectedFile id="JA"></effectedFile>
 	<effectedFile id="JASDK"></effectedFile>
 	<effectedFile id="PDE"></effectedFile>
@@ -1185,9 +648,7 @@
 	<effectedFile id="SLG2"></effectedFile>
 </logFile>
 
-<logFile name="org.eclipse.core.tests.net_linux.gtk.x86.xml">
-	<effectedFile id="PLG2"></effectedFile>
-	<effectedFile id="PLG2SDK"></effectedFile>
+<logFile name="org.eclipse.jdt.apt.pluggable.tests_linux.gtk.x86_6.0.xml">
 	<effectedFile id="JA"></effectedFile>
 	<effectedFile id="JASDK"></effectedFile>
 	<effectedFile id="PDE"></effectedFile>
@@ -1195,9 +656,7 @@
 	<effectedFile id="SLG2"></effectedFile>
 </logFile>
 
-<logFile name="org.eclipse.text.tests_linux.gtk.x86.xml">
-	<effectedFile id="PLG2"></effectedFile>
-	<effectedFile id="PLG2SDK"></effectedFile>
+<logFile name="org.eclipse.jdt.core.tests.builder_linux.gtk.x86_6.0.xml">
 	<effectedFile id="JA"></effectedFile>
 	<effectedFile id="JASDK"></effectedFile>
 	<effectedFile id="PDE"></effectedFile>
@@ -1205,9 +664,7 @@
 	<effectedFile id="SLG2"></effectedFile>
 </logFile>
 
-<logFile name="org.eclipse.ua.tests_linux.gtk.x86.xml">
-	<effectedFile id="PLG2"></effectedFile>
-	<effectedFile id="PLG2SDK"></effectedFile>
+<logFile name="org.eclipse.jdt.core.tests.compiler_linux.gtk.x86_6.0.xml">
 	<effectedFile id="JA"></effectedFile>
 	<effectedFile id="JASDK"></effectedFile>
 	<effectedFile id="PDE"></effectedFile>
@@ -1215,9 +672,7 @@
 	<effectedFile id="SLG2"></effectedFile>
 </logFile>
 
-<logFile name="org.eclipse.ui.editors.tests_linux.gtk.x86.xml">
-	<effectedFile id="PLG2"></effectedFile>
-	<effectedFile id="PLG2SDK"></effectedFile>
+<logFile name="org.eclipse.jdt.core.tests.model_linux.gtk.x86_6.0.xml">
 	<effectedFile id="JA"></effectedFile>
 	<effectedFile id="JASDK"></effectedFile>
 	<effectedFile id="PDE"></effectedFile>
@@ -1225,9 +680,7 @@
 	<effectedFile id="SLG2"></effectedFile>
 </logFile>
 
-<logFile name="org.eclipse.ui.tests.navigator_linux.gtk.x86.xml">
-	<effectedFile id="PLG2"></effectedFile>
-	<effectedFile id="PLG2SDK"></effectedFile>
+<logFile name="org.eclipse.jdt.core.tests.performance_linux.gtk.x86_6.0.xml">
 	<effectedFile id="JA"></effectedFile>
 	<effectedFile id="JASDK"></effectedFile>
 	<effectedFile id="PDE"></effectedFile>
@@ -1235,9 +688,7 @@
 	<effectedFile id="SLG2"></effectedFile>
 </logFile>
 
-<logFile name="org.eclipse.ui.tests.views.properties.tabbed_linux.gtk.x86.xml">
-	<effectedFile id="PLG2"></effectedFile>
-	<effectedFile id="PLG2SDK"></effectedFile>
+<logFile name="org.eclipse.jdt.debug.tests_linux.gtk.x86_6.0.xml">
 	<effectedFile id="JA"></effectedFile>
 	<effectedFile id="JASDK"></effectedFile>
 	<effectedFile id="PDE"></effectedFile>
@@ -1245,9 +696,7 @@
 	<effectedFile id="SLG2"></effectedFile>
 </logFile>
 
-<logFile name="org.eclipse.ui.workbench.texteditor.tests_linux.gtk.x86.xml">
-	<effectedFile id="PLG2"></effectedFile>
-	<effectedFile id="PLG2SDK"></effectedFile>
+<logFile name="org.eclipse.jdt.text.tests_linux.gtk.x86_6.0.xml">
 	<effectedFile id="JA"></effectedFile>
 	<effectedFile id="JASDK"></effectedFile>
 	<effectedFile id="PDE"></effectedFile>
@@ -1255,9 +704,7 @@
 	<effectedFile id="SLG2"></effectedFile>
 </logFile>
 
-<logFile name="org.eclipse.update.tests.core_linux.gtk.x86.xml">
-	<effectedFile id="PLG2"></effectedFile>
-	<effectedFile id="PLG2SDK"></effectedFile>
+<logFile name="org.eclipse.search.tests_linux.gtk.x86_6.0.xml">
 	<effectedFile id="JA"></effectedFile>
 	<effectedFile id="JASDK"></effectedFile>
 	<effectedFile id="PDE"></effectedFile>
@@ -1265,9 +712,7 @@
 	<effectedFile id="SLG2"></effectedFile>
 </logFile>
 
-<logFile name="org.eclipse.ltk.core.refactoring.tests_linux.gtk.x86.xml">
-	<effectedFile id="PLG2"></effectedFile>
-	<effectedFile id="PLG2SDK"></effectedFile>
+<logFile name="org.eclipse.jdt.ui.tests_linux.gtk.x86_6.0.xml">
 	<effectedFile id="JA"></effectedFile>
 	<effectedFile id="JASDK"></effectedFile>
 	<effectedFile id="PDE"></effectedFile>
@@ -1275,9 +720,7 @@
 	<effectedFile id="SLG2"></effectedFile>
 </logFile>
 
-<logFile name="org.eclipse.ltk.ui.refactoring.tests_linux.gtk.x86.xml">
-	<effectedFile id="PLG2"></effectedFile>
-	<effectedFile id="PLG2SDK"></effectedFile>
+<logFile name="org.eclipse.jdt.ui.tests.refactoring_linux.gtk.x86_6.0.xml">
 	<effectedFile id="JA"></effectedFile>
 	<effectedFile id="JASDK"></effectedFile>
 	<effectedFile id="PDE"></effectedFile>
@@ -1641,247 +1084,6 @@
 	<effectedFile id="SLG2"></effectedFile>
 </logFile>
 
-
-<logFile name="org.eclipse.core.tests.runtime_win32.win32.x86.xml">
-	<effectedFile id="RCPW"></effectedFile>
-	<effectedFile id="RCPWSDK"></effectedFile>
-	<effectedFile id="PW"></effectedFile>
-	<effectedFile id="PWSDK"></effectedFile>
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SW"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.ui.tests_win32.win32.x86.xml">
-	<effectedFile id="RCPW"></effectedFile>
-	<effectedFile id="RCPWSDK"></effectedFile>
-	<effectedFile id="PW"></effectedFile>
-	<effectedFile id="PWSDK"></effectedFile>
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SW"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.jface.tests.databinding_win32.win32.x86.xml">
-	<effectedFile id="RCPW"></effectedFile>
-	<effectedFile id="RCPWSDK"></effectedFile>
-	<effectedFile id="PW"></effectedFile>
-	<effectedFile id="PWSDK"></effectedFile>
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SW"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.swt.tests_win32.win32.x86.xml">
-	<effectedFile id="RCPW"></effectedFile>
-	<effectedFile id="RCPWSDK"></effectedFile>
-	<effectedFile id="PW"></effectedFile>
-	<effectedFile id="PWSDK"></effectedFile>
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SW"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.core.expressions.tests_win32.win32.x86.xml">
-	<effectedFile id="RCPW"></effectedFile>
-	<effectedFile id="RCPWSDK"></effectedFile>
-	<effectedFile id="PW"></effectedFile>
-	<effectedFile id="PWSDK"></effectedFile>
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SW"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.osgi.tests_win32.win32.x86.xml">
-	<effectedFile id="RCPW"></effectedFile>
-	<effectedFile id="RCPWSDK"></effectedFile>
-	<effectedFile id="PW"></effectedFile>
-	<effectedFile id="PWSDK"></effectedFile>
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SW"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.equinox.security.tests_win32.win32.x86.xml">
-	<effectedFile id="RCPW"></effectedFile>
-	<effectedFile id="RCPWSDK"></effectedFile>
-	<effectedFile id="PW"></effectedFile>
-	<effectedFile id="PWSDK"></effectedFile>	
-	<effectedFile id="SW"></effectedFile>
-</logFile> 
-
-<logFile name="org.eclipse.equinox.p2.tests_win32.win32.x86.xml">
-	<effectedFile id="RCPW"></effectedFile>
-	<effectedFile id="RCPWSDK"></effectedFile>
-	<effectedFile id="PW"></effectedFile>
-	<effectedFile id="PWSDK"></effectedFile>	
-	<effectedFile id="SW"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.equinox.p2.tests.ui_win32.win32.x86.xml">
-	<effectedFile id="RCPW"></effectedFile>
-	<effectedFile id="RCPWSDK"></effectedFile>
-	<effectedFile id="PW"></effectedFile>
-	<effectedFile id="PWSDK"></effectedFile>	
-	<effectedFile id="SW"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.ui.tests.rcp_win32.win32.x86.xml">
-	<effectedFile id="RCPW"></effectedFile>
-	<effectedFile id="RCPWSDK"></effectedFile>
-	<effectedFile id="PW"></effectedFile>
-	<effectedFile id="PWSDK"></effectedFile>
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SW"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.ui.tests.forms_win32.win32.x86.xml">
-	<effectedFile id="RCPW"></effectedFile>
-	<effectedFile id="RCPWSDK"></effectedFile>
-	<effectedFile id="PW"></effectedFile>
-	<effectedFile id="PWSDK"></effectedFile>
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SW"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.core.tests.runtime_linux.gtk.x86.xml">
-	<effectedFile id="RCPLG2"></effectedFile>
-	<effectedFile id="RCPLG2SDK"></effectedFile>
-	<effectedFile id="PLG2"></effectedFile>
-	<effectedFile id="PLG2SDK"></effectedFile>
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SLG2"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.ui.tests_linux.gtk.x86.xml">
-	<effectedFile id="RCPLG2"></effectedFile>
-	<effectedFile id="RCPLG2SDK"></effectedFile>
-	<effectedFile id="PLG2"></effectedFile>
-	<effectedFile id="PLG2SDK"></effectedFile>
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SLG2"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.jface.tests.databinding_linux.gtk.x86.xml">
-	<effectedFile id="RCPLG2"></effectedFile>
-	<effectedFile id="RCPLG2SDK"></effectedFile>
-	<effectedFile id="PLG2"></effectedFile>
-	<effectedFile id="PLG2SDK"></effectedFile>
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SLG2"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.swt.tests_linux.gtk.x86.xml">
-	<effectedFile id="RCPLG2"></effectedFile>
-	<effectedFile id="RCPLG2SDK"></effectedFile>
-	<effectedFile id="PLG2"></effectedFile>
-	<effectedFile id="PLG2SDK"></effectedFile>
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SLG2"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.core.expressions.tests_linux.gtk.x86.xml">
-	<effectedFile id="RCPLG2"></effectedFile>
-	<effectedFile id="RCPLG2SDK"></effectedFile>
-	<effectedFile id="PLG2"></effectedFile>
-	<effectedFile id="PLG2SDK"></effectedFile>
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SLG2"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.osgi.tests_linux.gtk.x86.xml">
-	<effectedFile id="RCPLG2"></effectedFile>
-	<effectedFile id="RCPLG2SDK"></effectedFile>
-	<effectedFile id="PLG2"></effectedFile>
-	<effectedFile id="PLG2SDK"></effectedFile>
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SLG2"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.equinox.security.tests_linux.gtk.x86.xml">
-	<effectedFile id="RCPLG2"></effectedFile>
-	<effectedFile id="RCPLG2SDK"></effectedFile>
-	<effectedFile id="PLG2"></effectedFile>
-	<effectedFile id="PLG2SDK"></effectedFile>	
-	<effectedFile id="SLG2"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.equinox.p2.tests_linux.gtk.x86.xml">
-	<effectedFile id="RCPLG2"></effectedFile>
-	<effectedFile id="RCPLG2SDK"></effectedFile>
-	<effectedFile id="PLG2"></effectedFile>
-	<effectedFile id="PLG2SDK"></effectedFile>
-	<effectedFile id="SLG2"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.equinox.p2.tests.ui_linux.gtk.x86.xml">
-	<effectedFile id="RCPLG2"></effectedFile>
-	<effectedFile id="RCPLG2SDK"></effectedFile>
-	<effectedFile id="PLG2"></effectedFile>
-	<effectedFile id="PLG2SDK"></effectedFile>
-	<effectedFile id="SLG2"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.ui.tests.rcp_linux.gtk.x86.xml">
-	<effectedFile id="RCPLG2"></effectedFile>
-	<effectedFile id="RCPLG2SDK"></effectedFile>
-	<effectedFile id="PLG2"></effectedFile>
-	<effectedFile id="PLG2SDK"></effectedFile>
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SLG2"></effectedFile>
-</logFile>
-
-<logFile name="org.eclipse.ui.tests.forms_linux.gtk.x86.xml">
-	<effectedFile id="RCPLG2"></effectedFile>
-	<effectedFile id="RCPLG2SDK"></effectedFile>
-	<effectedFile id="PLG2"></effectedFile>
-	<effectedFile id="PLG2SDK"></effectedFile>
-	<effectedFile id="JA"></effectedFile>
-	<effectedFile id="JASDK"></effectedFile>
-	<effectedFile id="PDE"></effectedFile>
-	<effectedFile id="PDESDK"></effectedFile>
-	<effectedFile id="SLG2"></effectedFile>
-</logFile>
-
 <logFile name="org.eclipse.core.tests.runtime_macosx.cocoa.x86_5.0.xml">
 	<effectedFile id="RCPMC"></effectedFile>
 	<effectedFile id="RCPMCSDK"></effectedFile>
Index: equinox/buildConfigs/equinox-launchers/build.xml
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml,v
retrieving revision 1.8
diff -u -r1.8 build.xml
--- equinox/buildConfigs/equinox-launchers/build.xml	1 Feb 2010 14:22:37 -0000	1.8
+++ equinox/buildConfigs/equinox-launchers/build.xml	27 Sep 2010 15:45:51 -0000
@@ -17,7 +17,6 @@
 		<buildRepos os="win32" ws="win32" arch="x86_64" archiveName="${archiveRoot}-win32.win32.x86_64.${buildId}.zip" />		
 		<buildRepos os="linux" ws="gtk" arch="x86" archiveName="${archiveRoot}-linux.gtk.x86.${buildId}.tar.gz" />
 		<buildRepos os="linux" ws="gtk" arch="x86_64" archiveName="${archiveRoot}-linux.gtk.x86_64.${buildId}.tar.gz" />
-		<buildRepos os="linux" ws="gtk" arch="ppc" archiveName="${archiveRoot}-linux.gtk.ppc.${buildId}.tar.gz" />
 		<buildRepos os="linux" ws="gtk" arch="ppc64" archiveName="${archiveRoot}-linux.gtk.ppc64.${buildId}.tar.gz" />
 		<buildRepos os="solaris" ws="gtk" arch="sparc" archiveName="${archiveRoot}-solaris.gtk.sparc.${buildId}.zip" />
 		<buildRepos os="solaris" ws="gtk" arch="x86" archiveName="${archiveRoot}-solaris.gtk.x86.${buildId}.zip" />
Index: equinox/buildConfigs/equinox.p2.installer/build.properties
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/equinox/buildConfigs/equinox.p2.installer/build.properties,v
retrieving revision 1.10
diff -u -r1.10 build.properties
--- equinox/buildConfigs/equinox.p2.installer/build.properties	20 Nov 2009 21:03:36 -0000	1.10
+++ equinox/buildConfigs/equinox.p2.installer/build.properties	27 Sep 2010 15:45:51 -0000
@@ -130,7 +130,7 @@
 skipMaps=false
 mapsRepo=${mapsRepo}
 mapsRoot=org.eclipse.releng
-mapsCheckoutTag=HEAD
+mapsCheckoutTag=${mapVersionTag}
 
 #tagMaps=true
 mapsTagTag=v${buildId}
Index: equinox/buildConfigs/equinox.prov/run.xml
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/equinox/buildConfigs/equinox.prov/run.xml,v
retrieving revision 1.177.2.2
diff -u -r1.177.2.2 run.xml
--- equinox/buildConfigs/equinox.prov/run.xml	9 Jun 2010 19:15:46 -0000	1.177.2.2
+++ equinox/buildConfigs/equinox.prov/run.xml	27 Sep 2010 15:45:51 -0000
@@ -7,7 +7,7 @@
 		<mkdir dir="${p2.output.base}" />
 		<property name="directorlog" value="${buildlogs}/director.txt" />
 
-		<condition property="sdk.archive" value="${postingDirectory}/${buildLabel}/eclipse-SDK-${buildId}-linux-gtk-ppc.tar.gz">
+		<condition property="sdk.archive" value="${postingDirectory}/${buildLabel}/eclipse-SDK-${buildId}-linux-gtk-ppc64.tar.gz">
 			<equals arg1="${os.arch}" arg2="ppc64" />
 		</condition>
 		<condition property="sdk.archive" value="${postingDirectory}/${buildLabel}/eclipse-SDK-${buildId}-linux-gtk.tar.gz">
@@ -15,7 +15,7 @@
 		</condition>
 		<property name="sdk.archive" value="" />
 		<property name="rcp.delta.archive" value="${postingDirectory}/${buildLabel}/eclipse-${buildId}-delta-pack.zip" />
-		<condition property="rcp.archive" value="${postingDirectory}/${buildLabel}/eclipse-RCP-${buildId}-linux-gtk-ppc.tar.gz">
+		<condition property="rcp.archive" value="${postingDirectory}/${buildLabel}/eclipse-RCP-${buildId}-linux-gtk-ppc64.tar.gz">
 			<equals arg1="${os.arch}" arg2="ppc64" />
 		</condition>
 		<condition property="rcp.archive" value="${postingDirectory}/${buildLabel}/eclipse-RCP-${buildId}-linux-gtk.tar.gz">
@@ -30,6 +30,14 @@
 		<property name="p2.agent.install.macosx" value="${p2.output.base}/agent.install.macosx" />
 		<mkdir dir="${p2.agent.install.macosx}" />
 
+		<property name="p2.agent.install.win32.director" value="${p2.output.base}/agent.install.win32/eclipse" />
+		<mkdir dir="${p2.agent.install.win32.director}" />
+		<property name="p2.agent.install.linux.director" value="${p2.output.base}/agent.install.linux/eclipse" />
+		<mkdir dir="${p2.agent.install.linux.director}" />
+		<property name="p2.agent.install.macosx.director" value="${p2.output.base}/agent.install.macosx/eclipse" />
+		<mkdir dir="${p2.agent.install.macosx.director}" />
+
+
 		<property name="p2.sdk.install.win32.win32.x86" value="${p2.output.base}/sdk.install.win32.win32.x86" />
 		<mkdir dir="${p2.sdk.install.win32.win32.x86}" />
 		<property name="p2.sdk.install.win32.win32.x86_64" value="${p2.output.base}/sdk.install.win32.win32.x86_64" />
@@ -125,6 +133,7 @@
 		<property file="build.properties" />
 		<property name="p2.flavor" value="tooling" />
 		<property name="p2.agent.version" value="1.1.0.${buildId}" />
+		<property name="sdk.version" value="4.0.0.${buildId}"/>
 	</target>
 
 	<target name="build" depends="init">
@@ -179,7 +188,7 @@
 			<param name="p2.director.installIU" value="org.eclipse.equinox.p2.ui.admin.rcp.product" />
 			<param name="p2.director.version" value="${p2.agent.version}" />
 			<param name="p2.director.profile" value="EquinoxProvisioningUI" />
-			<param name="p2.director.install.path" value="${p2.agent.install.win32}" />
+			<param name="p2.director.install.path" value="${p2.agent.install.win32.director}" />
 			<param name="p2.director.extraArgs" value="" />
 			<param name="p2.os" value="win32" />
 			<param name="p2.ws" value="win32" />
@@ -191,7 +200,7 @@
 			<param name="p2.director.installIU" value="org.eclipse.equinox.p2.ui.admin.rcp.product" />
 			<param name="p2.director.version" value="${p2.agent.version}" />
 			<param name="p2.director.profile" value="EquinoxProvisioningUI" />
-			<param name="p2.director.install.path" value="${p2.agent.install.linux}" />
+			<param name="p2.director.install.path" value="${p2.agent.install.linux.director}" />
 			<param name="p2.director.extraArgs" value="" />
 			<param name="p2.os" value="linux" />
 			<param name="p2.ws" value="gtk" />
@@ -203,7 +212,7 @@
 			<param name="p2.director.installIU" value="org.eclipse.equinox.p2.ui.admin.rcp.product" />
 			<param name="p2.director.version" value="${p2.agent.version}" />
 			<param name="p2.director.profile" value="EquinoxProvisioningUI" />
-			<param name="p2.director.install.path" value="${p2.agent.install.macosx}" />
+			<param name="p2.director.install.path" value="${p2.agent.install.macosx.director}" />
 			<param name="p2.director.extraArgs" value="" />
 			<param name="p2.os" value="macosx" />
 			<param name="p2.ws" value="cocoa" />
@@ -215,7 +224,7 @@
 	<target name="provision.sdk">
 		<antcall target="run.director">
 			<param name="p2.director.installIU" value="org.eclipse.sdk.ide" />
-			<param name="p2.director.version" value="4.0.0.${buildId}" />
+			<param name="p2.director.version" value="${sdk.version}" />
 			<param name="p2.director.profile" value="SDKProfile" />
 			<param name="p2.director.install.path" value="${p2.sdk.install.win32.win32.x86}/eclipse" />
 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
@@ -227,7 +236,7 @@
 
 		<antcall target="run.director">
 			<param name="p2.director.installIU" value="org.eclipse.sdk.ide" />
-			<param name="p2.director.version" value="4.0.0.${buildId}" />
+			<param name="p2.director.version" value="${sdk.version}" />
 			<param name="p2.director.profile" value="SDKProfile" />
 			<param name="p2.director.install.path" value="${p2.sdk.install.win32.win32.x86_64}/eclipse" />
 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
@@ -239,7 +248,7 @@
 
 		<antcall target="run.director">
 			<param name="p2.director.installIU" value="org.eclipse.sdk.ide" />
-			<param name="p2.director.version" value="4.0.0.${buildId}" />
+			<param name="p2.director.version" value="${sdk.version}" />
 			<param name="p2.director.profile" value="SDKProfile" />
 			<param name="p2.director.install.path" value="${p2.sdk.install.linux.gtk.x86}/eclipse" />
 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
@@ -249,21 +258,9 @@
 			<param name="p2.repo" value="${buildRepo}" />
 		</antcall>
 
-	<!--	<antcall target="run.director">
-			<param name="p2.director.installIU" value="org.eclipse.sdk.ide" />
-			<param name="p2.director.version" value="4.0.0.${buildId}" />
-			<param name="p2.director.profile" value="SDKProfile" />
-			<param name="p2.director.install.path" value="${p2.sdk.install.linux.gtk.ppc}/eclipse" />
-			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
-			<param name="p2.os" value="linux" />
-			<param name="p2.ws" value="gtk" />
-			<param name="p2.arch" value="ppc" />
-			<param name="p2.repo" value="${buildRepo}" />
-		</antcall> -->
-
 		<antcall target="run.director">
 			<param name="p2.director.installIU" value="org.eclipse.sdk.ide" />
-			<param name="p2.director.version" value="4.0.0.${buildId}" />
+			<param name="p2.director.version" value="${sdk.version}" />
 			<param name="p2.director.profile" value="SDKProfile" />
 			<param name="p2.director.install.path" value="${p2.sdk.install.linux.gtk.ppc64}/eclipse" />
 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
@@ -273,9 +270,9 @@
 			<param name="p2.repo" value="${buildRepo}" />
 		</antcall>
 
-		<!-- <antcall target="run.director">
+		<antcall target="run.director">
 			<param name="p2.director.installIU" value="org.eclipse.sdk.ide" />
-			<param name="p2.director.version" value="4.0.0.${buildId}" />
+			<param name="p2.director.version" value="${sdk.version}" />
 			<param name="p2.director.profile" value="SDKProfile" />
 			<param name="p2.director.install.path" value="${p2.sdk.install.linux.gtk.s390x}/eclipse" />
 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
@@ -283,11 +280,11 @@
 			<param name="p2.ws" value="gtk" />
 			<param name="p2.arch" value="s390x" />
 			<param name="p2.repo" value="${buildRepo}" />
-		</antcall> -->
+		</antcall>
 
-		<!-- <antcall target="run.director">
+		<antcall target="run.director">
 			<param name="p2.director.installIU" value="org.eclipse.sdk.ide" />
-			<param name="p2.director.version" value="4.0.0.${buildId}" />
+			<param name="p2.director.version" value="${sdk.version}" />
 			<param name="p2.director.profile" value="SDKProfile" />
 			<param name="p2.director.install.path" value="${p2.sdk.install.linux.gtk.s390}/eclipse" />
 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
@@ -295,11 +292,11 @@
 			<param name="p2.ws" value="gtk" />
 			<param name="p2.arch" value="s390" />
 			<param name="p2.repo" value="${buildRepo}" />
-		</antcall> -->
+		</antcall>
 
 		<antcall target="run.director">
 			<param name="p2.director.installIU" value="org.eclipse.sdk.ide" />
-			<param name="p2.director.version" value="4.0.0.${buildId}" />
+			<param name="p2.director.version" value="${sdk.version}" />
 			<param name="p2.director.profile" value="SDKProfile" />
 			<param name="p2.director.install.path" value="${p2.sdk.install.linux.motif.x86}/eclipse" />
 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
@@ -311,7 +308,7 @@
 
 		<antcall target="run.director">
 			<param name="p2.director.installIU" value="org.eclipse.sdk.ide" />
-			<param name="p2.director.version" value="4.0.0.${buildId}" />
+			<param name="p2.director.version" value="${sdk.version}" />
 			<param name="p2.director.profile" value="SDKProfile" />
 			<param name="p2.director.install.path" value="${p2.sdk.install.linux.gtk.x86_64}/eclipse" />
 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
@@ -323,7 +320,7 @@
 
 		<antcall target="run.director">
 			<param name="p2.director.installIU" value="org.eclipse.sdk.ide" />
-			<param name="p2.director.version" value="4.0.0.${buildId}" />
+			<param name="p2.director.version" value="${sdk.version}" />
 			<param name="p2.director.profile" value="SDKProfile" />
 			<param name="p2.director.install.path" value="${p2.sdk.install.macosx.carbon.x86}/eclipse" />
 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
@@ -335,7 +332,7 @@
 
 		<antcall target="run.director">
 			<param name="p2.director.installIU" value="org.eclipse.sdk.ide" />
-			<param name="p2.director.version" value="4.0.0.${buildId}" />
+			<param name="p2.director.version" value="${sdk.version}" />
 			<param name="p2.director.profile" value="SDKProfile" />
 			<param name="p2.director.install.path" value="${p2.sdk.install.macosx.cocoa.x86}/eclipse" />
 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
@@ -347,7 +344,7 @@
 
 		<antcall target="run.director">
 			<param name="p2.director.installIU" value="org.eclipse.sdk.ide" />
-			<param name="p2.director.version" value="4.0.0.${buildId}" />
+			<param name="p2.director.version" value="${sdk.version}" />
 			<param name="p2.director.profile" value="SDKProfile" />
 			<param name="p2.director.install.path" value="${p2.sdk.install.macosx.cocoa.x86_64}/eclipse" />
 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
@@ -359,7 +356,7 @@
 
 		<antcall target="run.director">
 			<param name="p2.director.installIU" value="org.eclipse.sdk.ide" />
-			<param name="p2.director.version" value="4.0.0.${buildId}" />
+			<param name="p2.director.version" value="${sdk.version}" />
 			<param name="p2.director.profile" value="SDKProfile" />
 			<param name="p2.director.install.path" value="${p2.sdk.install.hpux.motif.ia64_32}/eclipse" />
 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
@@ -371,7 +368,7 @@
 
 		<antcall target="run.director">
 			<param name="p2.director.installIU" value="org.eclipse.sdk.ide" />
-			<param name="p2.director.version" value="4.0.0.${buildId}" />
+			<param name="p2.director.version" value="${sdk.version}" />
 			<param name="p2.director.profile" value="SDKProfile" />
 			<param name="p2.director.install.path" value="${p2.sdk.install.solaris.gtk.sparc}/eclipse" />
 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
@@ -383,7 +380,7 @@
 
 		<antcall target="run.director">
 			<param name="p2.director.installIU" value="org.eclipse.sdk.ide" />
-			<param name="p2.director.version" value="4.0.0.${buildId}" />
+			<param name="p2.director.version" value="${sdk.version}" />
 			<param name="p2.director.profile" value="SDKProfile" />
 			<param name="p2.director.install.path" value="${p2.sdk.install.solaris.gtk.x86}/eclipse" />
 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
@@ -395,7 +392,7 @@
 
 		<antcall target="run.director">
 			<param name="p2.director.installIU" value="org.eclipse.sdk.ide" />
-			<param name="p2.director.version" value="4.0.0.${buildId}" />
+			<param name="p2.director.version" value="${sdk.version}" />
 			<param name="p2.director.profile" value="SDKProfile" />
 			<param name="p2.director.install.path" value="${p2.sdk.install.aix.motif.ppc}/eclipse" />
 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
@@ -410,7 +407,7 @@
 	<target name="provision.platform">
 		<antcall target="run.director">
 			<param name="p2.director.installIU" value="org.eclipse.platform.ide" />
-			<param name="p2.director.version" value="4.0.0.${buildId}" />
+			<param name="p2.director.version" value="${sdk.version}" />
 			<param name="p2.director.profile" value="PlatformProfile" />
 			<param name="p2.director.install.path" value="${p2.platform.install.win32.win32.x86}/eclipse" />
 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
@@ -422,7 +419,7 @@
 
 		<antcall target="run.director">
 			<param name="p2.director.installIU" value="org.eclipse.platform.ide" />
-			<param name="p2.director.version" value="4.0.0.${buildId}" />
+			<param name="p2.director.version" value="${sdk.version}" />
 			<param name="p2.director.profile" value="PlatformProfile" />
 			<param name="p2.director.install.path" value="${p2.platform.install.win32.win32.x86_64}/eclipse" />
 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
@@ -434,7 +431,7 @@
 
 		<antcall target="run.director">
 			<param name="p2.director.installIU" value="org.eclipse.platform.ide" />
-			<param name="p2.director.version" value="4.0.0.${buildId}" />
+			<param name="p2.director.version" value="${sdk.version}" />
 			<param name="p2.director.profile" value="PlatformProfile" />
 			<param name="p2.director.install.path" value="${p2.platform.install.linux.gtk.x86}/eclipse" />
 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
@@ -458,7 +455,7 @@
 
 		<antcall target="run.director">
 			<param name="p2.director.installIU" value="org.eclipse.platform.ide" />
-			<param name="p2.director.version" value="4.0.0.${buildId}" />
+			<param name="p2.director.version" value="${sdk.version}" />
 			<param name="p2.director.profile" value="PlatformProfile" />
 			<param name="p2.director.install.path" value="${p2.platform.install.linux.gtk.ppc64}/eclipse" />
 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
@@ -470,7 +467,7 @@
 
 		<antcall target="run.director">
 			<param name="p2.director.installIU" value="org.eclipse.platform.ide" />
-			<param name="p2.director.version" value="4.0.0.${buildId}" />
+			<param name="p2.director.version" value="${sdk.version}" />
 			<param name="p2.director.profile" value="PlatformProfile" />
 			<param name="p2.director.install.path" value="${p2.platform.install.linux.gtk.x86_64}/eclipse" />
 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
@@ -482,7 +479,7 @@
 
 		<antcall target="run.director">
 			<param name="p2.director.installIU" value="org.eclipse.platform.ide" />
-			<param name="p2.director.version" value="4.0.0.${buildId}" />
+			<param name="p2.director.version" value="${sdk.version}" />
 			<param name="p2.director.profile" value="PlatformProfile" />
 			<param name="p2.director.install.path" value="${p2.platform.install.macosx.carbon.x86}/eclipse" />
 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
@@ -494,7 +491,7 @@
 
 		<antcall target="run.director">
 			<param name="p2.director.installIU" value="org.eclipse.platform.ide" />
-			<param name="p2.director.version" value="4.0.0.${buildId}" />
+			<param name="p2.director.version" value="${sdk.version}" />
 			<param name="p2.director.profile" value="PlatformProfile" />
 			<param name="p2.director.install.path" value="${p2.platform.install.macosx.cocoa.x86}/eclipse" />
 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
@@ -506,7 +503,7 @@
 
 		<antcall target="run.director">
 			<param name="p2.director.installIU" value="org.eclipse.platform.ide" />
-			<param name="p2.director.version" value="4.0.0.${buildId}" />
+			<param name="p2.director.version" value="${sdk.version}" />
 			<param name="p2.director.profile" value="PlatformProfile" />
 			<param name="p2.director.install.path" value="${p2.platform.install.macosx.cocoa.x86_64}/eclipse" />
 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
@@ -518,7 +515,7 @@
 
 		<antcall target="run.director">
 			<param name="p2.director.installIU" value="org.eclipse.platform.ide" />
-			<param name="p2.director.version" value="4.0.0.${buildId}" />
+			<param name="p2.director.version" value="${sdk.version}" />
 			<param name="p2.director.profile" value="PlatformProfile" />
 			<param name="p2.director.install.path" value="${p2.platform.install.hpux.motif.ia64_32}/eclipse" />
 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
@@ -530,7 +527,7 @@
 
 		<antcall target="run.director">
 			<param name="p2.director.installIU" value="org.eclipse.platform.ide" />
-			<param name="p2.director.version" value="4.0.0.${buildId}" />
+			<param name="p2.director.version" value="${sdk.version}" />
 			<param name="p2.director.profile" value="PlatformProfile" />
 			<param name="p2.director.install.path" value="${p2.platform.install.solaris.gtk.sparc}/eclipse" />
 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
@@ -542,7 +539,7 @@
 
 		<antcall target="run.director">
 			<param name="p2.director.installIU" value="org.eclipse.platform.ide" />
-			<param name="p2.director.version" value="4.0.0.${buildId}" />
+			<param name="p2.director.version" value="${sdk.version}" />
 			<param name="p2.director.profile" value="PlatformProfile" />
 			<param name="p2.director.install.path" value="${p2.platform.install.solaris.gtk.x86}/eclipse" />
 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
@@ -554,7 +551,7 @@
 
 		<antcall target="run.director">
 			<param name="p2.director.installIU" value="org.eclipse.platform.ide" />
-			<param name="p2.director.version" value="4.0.0.${buildId}" />
+			<param name="p2.director.version" value="${sdk.version}" />
 			<param name="p2.director.profile" value="PlatformProfile" />
 			<param name="p2.director.install.path" value="${p2.platform.install.aix.motif.ppc}/eclipse" />
 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
@@ -569,7 +566,7 @@
 	<target name="provision.platformsdk">
 		<antcall target="run.director">
 			<param name="p2.director.installIU" value="org.eclipse.platform.sdk" />
-			<param name="p2.director.version" value="4.0.0.${buildId}" />
+			<param name="p2.director.version" value="${sdk.version}" />
 			<param name="p2.director.profile" value="PlatformSDKProfile" />
 			<param name="p2.director.install.path" value="${p2.platformsdk.install.win32.win32.x86}/eclipse" />
 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
@@ -581,7 +578,7 @@
 
 		<antcall target="run.director">
 			<param name="p2.director.installIU" value="org.eclipse.platform.sdk" />
-			<param name="p2.director.version" value="4.0.0.${buildId}" />
+			<param name="p2.director.version" value="${sdk.version}" />
 			<param name="p2.director.profile" value="PlatformSDKProfile" />
 			<param name="p2.director.install.path" value="${p2.platformsdk.install.win32.win32.x86_64}/eclipse" />
 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
@@ -593,7 +590,7 @@
 
 		<antcall target="run.director">
 			<param name="p2.director.installIU" value="org.eclipse.platform.sdk" />
-			<param name="p2.director.version" value="4.0.0.${buildId}" />
+			<param name="p2.director.version" value="${sdk.version}" />
 			<param name="p2.director.profile" value="PlatformSDKProfile" />
 			<param name="p2.director.install.path" value="${p2.platformsdk.install.linux.gtk.x86}/eclipse" />
 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
@@ -617,7 +614,7 @@
 
 		<antcall target="run.director">
 			<param name="p2.director.installIU" value="org.eclipse.platform.sdk" />
-			<param name="p2.director.version" value="4.0.0.${buildId}" />
+			<param name="p2.director.version" value="${sdk.version}" />
 			<param name="p2.director.profile" value="PlatformSDKProfile" />
 			<param name="p2.director.install.path" value="${p2.platformsdk.install.linux.gtk.ppc64}/eclipse" />
 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
@@ -629,7 +626,7 @@
 
 		<antcall target="run.director">
 			<param name="p2.director.installIU" value="org.eclipse.platform.sdk" />
-			<param name="p2.director.version" value="4.0.0.${buildId}" />
+			<param name="p2.director.version" value="${sdk.version}" />
 			<param name="p2.director.profile" value="PlatformSDKProfile" />
 			<param name="p2.director.install.path" value="${p2.platformsdk.install.linux.gtk.x86_64}/eclipse" />
 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
@@ -641,7 +638,7 @@
 
 		<antcall target="run.director">
 			<param name="p2.director.installIU" value="org.eclipse.platform.sdk" />
-			<param name="p2.director.version" value="4.0.0.${buildId}" />
+			<param name="p2.director.version" value="${sdk.version}" />
 			<param name="p2.director.profile" value="PlatformSDKProfile" />
 			<param name="p2.director.install.path" value="${p2.platformsdk.install.macosx.carbon.x86}/eclipse" />
 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
@@ -653,7 +650,7 @@
 
 		<antcall target="run.director">
 			<param name="p2.director.installIU" value="org.eclipse.platform.sdk" />
-			<param name="p2.director.version" value="4.0.0.${buildId}" />
+			<param name="p2.director.version" value="${sdk.version}" />
 			<param name="p2.director.profile" value="PlatformSDKProfile" />
 			<param name="p2.director.install.path" value="${p2.platformsdk.install.macosx.cocoa.x86}/eclipse" />
 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
@@ -665,7 +662,7 @@
 
 		<antcall target="run.director">
 			<param name="p2.director.installIU" value="org.eclipse.platform.sdk" />
-			<param name="p2.director.version" value="4.0.0.${buildId}" />
+			<param name="p2.director.version" value="${sdk.version}" />
 			<param name="p2.director.profile" value="PlatformSDKProfile" />
 			<param name="p2.director.install.path" value="${p2.platformsdk.install.macosx.cocoa.x86_64}/eclipse" />
 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
@@ -677,7 +674,7 @@
 
 		<antcall target="run.director">
 			<param name="p2.director.installIU" value="org.eclipse.platform.sdk" />
-			<param name="p2.director.version" value="4.0.0.${buildId}" />
+			<param name="p2.director.version" value="${sdk.version}" />
 			<param name="p2.director.profile" value="PlatformSDKProfile" />
 			<param name="p2.director.install.path" value="${p2.platformsdk.install.hpux.motif.ia64_32}/eclipse" />
 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
@@ -689,7 +686,7 @@
 
 		<antcall target="run.director">
 			<param name="p2.director.installIU" value="org.eclipse.platform.sdk" />
-			<param name="p2.director.version" value="4.0.0.${buildId}" />
+			<param name="p2.director.version" value="${sdk.version}" />
 			<param name="p2.director.profile" value="PlatformSDKProfile" />
 			<param name="p2.director.install.path" value="${p2.platformsdk.install.solaris.gtk.sparc}/eclipse" />
 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
@@ -701,7 +698,7 @@
 
 		<antcall target="run.director">
 			<param name="p2.director.installIU" value="org.eclipse.platform.sdk" />
-			<param name="p2.director.version" value="4.0.0.${buildId}" />
+			<param name="p2.director.version" value="${sdk.version}" />
 			<param name="p2.director.profile" value="PlatformSDKProfile" />
 			<param name="p2.director.install.path" value="${p2.platformsdk.install.solaris.gtk.x86}/eclipse" />
 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
@@ -713,7 +710,7 @@
 
 		<antcall target="run.director">
 			<param name="p2.director.installIU" value="org.eclipse.platform.sdk" />
-			<param name="p2.director.version" value="4.0.0.${buildId}" />
+			<param name="p2.director.version" value="${sdk.version}" />
 			<param name="p2.director.profile" value="PlatformSDKProfile" />
 			<param name="p2.director.install.path" value="${p2.platformsdk.install.aix.motif.ppc}/eclipse" />
 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
@@ -813,7 +810,7 @@
 			<sequential>
 				<!-- win32 win32 x86 agent -->
 				<exec dir="${p2.agent.install.win32}" executable="zip">
-					<arg line="-q ${output.dir}/equinox-p2-agent-${buildId}-win32.zip -r ." />
+					<arg line="-q ${output.dir}/equinox-p2-adminui-${buildId}-win32.zip -r ." />
 				</exec>
 				<!-- win32 win32 x86_64 -->
 				<delete file="${postingDirectory}/${buildLabel}/eclipse-SDK-${buildId}-win32-x86_64.zip" failonerror="false" />
@@ -829,17 +826,8 @@
 				<!-- linux gtk x86 agent -->
 				<antcall target="p2.tar">
 					<param name="tar.base.dir" value="${p2.agent.install.linux}" />
-					<param name="tar.base.filename" value="${output.dir}/equinox-p2-agent-${buildId}-linux.tar" />
-				</antcall>
-
-				<!-- linux gtk ppc-->
-			<!--	<antcall target="p2.tar">
-					<param name="tar.base.dir" value="${p2.sdk.install.linux.gtk.ppc}" />
-					<param name="tar.base.filename" value="${postingDirectory}/${buildLabel}/eclipse-SDK-${buildId}-linux-gtk-ppc.tar" />
+					<param name="tar.base.filename" value="${output.dir}/equinox-p2-adminui-${buildId}-linux-gtk-x86.tar" />
 				</antcall>
-				<antcall target="generateChecksums">
-					<param name="archiveName" value="eclipse-SDK-${buildId}-linux-gtk-ppc.tar.gz" />
-				</antcall> -->
 
 				<!-- linux gtk ppc64-->
 				<antcall target="p2.tar">
Index: equinox/publishingFiles/templateFiles/index.php.template
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/equinox/publishingFiles/templateFiles/index.php.template,v
retrieving revision 1.22
diff -u -r1.22 index.php.template
--- equinox/publishingFiles/templateFiles/index.php.template	9 Apr 2010 14:44:34 -0000	1.22
+++ equinox/publishingFiles/templateFiles/index.php.template	27 Sep 2010 15:45:51 -0000
@@ -86,8 +86,9 @@
 			</td>
 		</tr>
 		<tr></tr>
-                <tr><td><a href="apitools/index.html"><b>API Tools Version Verification Report</b></a> This tool verifies the versions of the plugins against Eclipse 3.5.2.  Exclusions are listed in org.eclipse.releng/apiexclude/exclude_list_external.txt.</td></tr>
-               <tr><td><a href="apitools/report.html"><b>API Tools Post-API Freeze Report</b></a>  This report describes API changes since 3.6M6.  Exclusions are listed in org.eclipse.releng/apiexclude/exclude_list.txt.</td></tr>		
+                <tr><td><a href="apitools/index.html"><b>API Tools Version Verification Report</b></a> This tool verifies the versions of the plugins against Eclipse 3.6.  Exclusions are listed in org.eclipse.releng/apiexclude/exclude_list_external.txt.</td></tr>               
+				 <tr><td><li><a href=\"apitools/apitoolsdeprecations/apideprecation.html\"><b>API Tools Deprecation Report</b></a> This tool generates a report for API deprecated since 3.6. </td></tr>                
+               <!-- <tr><td><a href="apitools/report.html"><b>API Tools Post-API Freeze Report</b></a>  This report describes API changes since 3.6M6.  Exclusions are listed in org.eclipse.releng/apiexclude/exclude_list.txt.</td></tr> -->		
 		</table>
 </div>
 
Index: equinox/publishingFiles/testManifest.xml
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/equinox/publishingFiles/testManifest.xml,v
retrieving revision 1.81.2.1
diff -u -r1.81.2.1 testManifest.xml
--- equinox/publishingFiles/testManifest.xml	7 Jun 2010 20:48:36 -0000	1.81.2.1
+++ equinox/publishingFiles/testManifest.xml	27 Sep 2010 15:45:51 -0000
@@ -110,11 +110,11 @@
     	</zipType> 	
     	   	    	    	
     	<zipType name="Provisioning">
-			<platform id="provagentrcpwin32" name="Windows **early access**" fileName="equinox-p2-agent-@buildid@-win32.zip">			
+			<platform id="provagentrcpwin32" name="Windows **early access**" fileName="equinox-p2-adminui-@buildid@-win32.zip">			
  			</platform>
-			<platform id="provagentrcplinux" name="Linux **early access**" fileName="equinox-p2-agent-@buildid@-linux.tar.gz">			
+			<platform id="provagentrcplinux" name="Linux **early access**" fileName="equinox-p2-adminui-@buildid@-linux.tar.gz">			
  			</platform>	
- 			<platform id="provagentrcpmac" name="MacOSX **early access**" fileName="equinox-p2-agent-@buildid@-macosx.tar.gz">			
+ 			<platform id="provagentrcpmac" name="MacOSX **early access**" fileName="equinox-p2-adminui-@buildid@-macosx.tar.gz">			
  			</platform>		
  			<platform id="provinstallerwin" name="Windows **early access**" fileName="equinox.p2.installer-@buildid@-win32.win32.x86.zip">			
  			</platform>	
@@ -133,8 +133,6 @@
 			<platform id="SLG2" name="Linux (x86/GTK 2) (&lt;a href=&quot;http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments&quot;>Supported Versions&lt;/a>)" fileName="launchers-linux.gtk.x86.@buildid@.tar.gz">
 			</platform>
 			<platform id="SLG264" name="Linux (x86_64/GTK 2) (&lt;a href=&quot;http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments&quot;>Supported Versions&lt;/a>)" fileName="launchers-linux.gtk.x86_64.@buildid@.tar.gz">
-			</platform>
-			<platform id="SLG2PPC" name="Linux (PPC/GTK 2) (&lt;a href=&quot;http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments&quot;>Supported Versions&lt;/a>)" fileName="launchers-linux.gtk.ppc.@buildid@.tar.gz">
 			</platform>		
 			<platform id="SLG2PPC64" name="Linux (PPC64/GTK 2) (&lt;a href=&quot;http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments&quot;>Supported Versions&lt;/a>)" fileName="launchers-linux.gtk.ppc64.@buildid@.tar.gz">
 			</platform>