### Eclipse Workspace Patch 1.0
#P devstudio-trunk
Index: releng/org.jboss.ide.eclipse.releng/builders/richfaces/build.properties
===================================================================
--- releng/org.jboss.ide.eclipse.releng/builders/richfaces/build.properties	(revision 6564)
+++ releng/org.jboss.ide.eclipse.releng/builders/richfaces/build.properties	(working copy)
@@ -6,7 +6,8 @@
 timestamp=007
 collPlace=
 collBase=.
-configs=win32,win32,x86 & linux,gtk,x86 & linux,gtk,x86_64 & macosx,carbon,ppc & macosx,cocoa,ppc
+# & macosx,carbon,x86
+configs=win32,win32,x86 & linux,gtk,x86 & linux,gtk,x86_64 & macosx,cocoa,x86
 archivesFormat=*,*,* - zip
 bootclasspath=${java.home}/lib/rt.jar
 javacFailOnError=true
@@ -38,15 +39,15 @@
 # fix for https://jira.jboss.org/jira/browse/JBIDE-3691 - to avoid including x86_64 plugins to x86 feature
 xulrunner-plugins-linux=org.mozilla.xpcom,org.mozilla.xulrunner.gtk.linux.x86_1
 xulrunner-plugins-linux_64=org.mozilla.xpcom,org.mozilla.xulrunner.gtk.linux.x86_64
-xulrunner-plugins-macosx=org.mozilla.xpcom,org.mozilla.xulrunner.carbon.macosx
+xulrunner-plugins-macosx=org.mozilla.xpcom,org.mozilla.xulrunner.cocoa.macosx.x86
 
-win32-zipFile=RichFaces-VPE-win32-${versionTag}.zip
-win32-nodeps-zipFile=RichFaces-VPE-win32-nodeps-${versionTag}.zip
-linux-zipFile=RichFaces-VPE-linux-gtk-${versionTag}.zip
-linux-nodeps-zipFile=RichFaces-VPE-linux-gtk-nodeps-${versionTag}.zip
+win32-zipFile=RichFaces-VPE-win32-x86-${versionTag}.zip
+win32-nodeps-zipFile=RichFaces-VPE-win32-x86-nodeps-${versionTag}.zip
+linux-zipFile=RichFaces-VPE-linux-gtk-x86-${versionTag}.zip
+linux-nodeps-zipFile=RichFaces-VPE-linux-gtk-x86-nodeps-${versionTag}.zip
 linux_64-zipFile=RichFaces-VPE-linux-gtk-x86_64-${versionTag}.zip
 linux_64-nodeps-zipFile=RichFaces-VPE-linux-gtk-x86_64-nodeps-${versionTag}.zip
-macosx-carbon-zipFile=RichFaces-VPE-macosx-carbon-${versionTag}.zip
-macosx-carbon-nodeps-zipFile=RichFaces-VPE-macosx-carbon-nodeps-${versionTag}.zip
-macosx-cocoa-zipFile=RichFaces-VPE-macosx-cocoa-${versionTag}.zip
-macosx-cocoa-nodeps-zipFile=RichFaces-VPE-macosx-cocoa-nodeps-${versionTag}.zip
\ No newline at end of file
+#macosx-carbon-zipFile=RichFaces-VPE-macosx-carbon-x86-${versionTag}.zip
+#macosx-carbon-nodeps-zipFile=RichFaces-VPE-macosx-carbon-x86-nodeps-${versionTag}.zip
+macosx-cocoa-zipFile=RichFaces-VPE-macosx-cocoa-x86-${versionTag}.zip
+macosx-cocoa-nodeps-zipFile=RichFaces-VPE-macosx-cocoa-x86-nodeps-${versionTag}.zip
\ No newline at end of file
Index: releng/org.jboss.ide.eclipse.releng/builders/common/aggregateRepos.xml
===================================================================
--- releng/org.jboss.ide.eclipse.releng/builders/common/aggregateRepos.xml	(revision 6564)
+++ releng/org.jboss.ide.eclipse.releng/builders/common/aggregateRepos.xml	(working copy)
@@ -169,7 +169,8 @@
 
 	<target name="generate.build.file">
 		<property name="repoName" value="JBoss Tools Aggregate Update Site" />
-		<property name="platform.names" value="linux-gtk,linux-gtk-x86_64,win32,macosx-carbon,macosx-cocoa" />
+		<!-- remove macosx-carbon -->
+		<property name="platform.names" value="linux-gtk-x86,linux-gtk-x86_64,win32-x86,macosx-cocoa-x86" />
 		<!-- packedStrategy = {SKIP, UNPACK, UNPACK_AS_SIBLING, COPY, VERIFY} -->
 		<!-- mavenResult="{true,false}" -->
 		<echo file="${working.dir}/repo.b3aggr">&lt;?xml version="1.0" encoding="UTF-8"?>
@@ -183,14 +184,14 @@
 		<for param="platform" list="${platform.names}" delimiter=",">
 			<sequential>
 				<if>
-					<equals arg1="@{platform}" arg2="linux-gtk" />
+					<equals arg1="@{platform}" arg2="linux-gtk-x86" />
 					<then>
 						<echo file="${working.dir}/repo.b3aggr" append="true">  &lt;configurations operatingSystem="linux" windowSystem="gtk"/>
 </echo>
 					</then>
 				</if>
 				<if>
-					<equals arg1="@{platform}" arg2="win32" />
+					<equals arg1="@{platform}" arg2="win32-x86" />
 					<then>
 						<echo file="${working.dir}/repo.b3aggr" append="true">  &lt;configurations operatingSystem="win32" windowSystem="win32"/>
 </echo>
@@ -203,15 +204,15 @@
 </echo>
 					</then>
 				</if>
-				<if>
+				<!-- <if>
 					<equals arg1="@{platform}" arg2="macosx-carbon" />
 					<then>
 						<echo file="${working.dir}/repo.b3aggr" append="true">  &lt;configurations operatingSystem="macosx" windowSystem="carbon" architecture="x86"/>
 </echo>
 					</then>
-				</if>
+				</if> -->
 				<if>
-					<equals arg1="@{platform}" arg2="macosx-cocoa" />
+					<equals arg1="@{platform}" arg2="macosx-cocoa-x86" />
 					<then>
 						<echo file="${working.dir}/repo.b3aggr" append="true">  &lt;configurations operatingSystem="macosx" windowSystem="cocoa"  architecture="x86"/>
 </echo>
Index: releng/org.jboss.ide.eclipse.releng/builders/product/buildResults/buildResults.html
===================================================================
--- releng/org.jboss.ide.eclipse.releng/builders/product/buildResults/buildResults.html	(revision 6564)
+++ releng/org.jboss.ide.eclipse.releng/builders/product/buildResults/buildResults.html	(working copy)
@@ -96,22 +96,22 @@
 	</tr>
 	<tr>
 		<!-- RichFaces win32 -->
-		<td><img src="images/${jbds-richfaces-win32-status}-small.png" /></td>
+		<td><img src="images/${jbds-richfaces-win32-x86-status}-small.png" /></td>
 		<td class="downloadInfo"><a class="allLink-blue"
-			href="richfaces/${jbds-richfaces-win32-filename}">${jbds-richfaces-win32-filename}</a><br />
+			href="richfaces/${jbds-richfaces-win32-x86-filename}">${jbds-richfaces-win32-x86-filename}</a><br />
 		&nbsp;&nbsp;&nbsp;&nbsp;<a class="md5"
-			href="richfaces/${jbds-richfaces-win32-filename}.MD5">md5</a> |
-		filesize: ${richfaces-win32-file-size} MB</td>
+			href="richfaces/${jbds-richfaces-win32-x86-filename}.MD5">md5</a> |
+		filesize: ${richfaces-win32-x86-file-size} MB</td>
 	</tr>
 	<tr>
 		<!-- RichFaces linux/gtk -->
 		<td><img
-			src="images/${jbds-richfaces-linux-gtk-status}-small.png" /></td>
+			src="images/${jbds-richfaces-linux-gtk-x86-status}-small.png" /></td>
 		<td class="downloadInfo"><a class="allLink-blue"
-			href="richfaces/${jbds-richfaces-linux-gtk-filename}">${jbds-richfaces-linux-gtk-filename}</a><br />
+			href="richfaces/${jbds-richfaces-linux-gtk-x86-filename}">${jbds-richfaces-linux-gtk-x86-filename}</a><br />
 		&nbsp;&nbsp;&nbsp;&nbsp;<a class="md5"
-			href="richfaces/${jbds-richfaces-linux-gtk-filename}.MD5">md5</a>
-		| filesize: ${richfaces-linux-gtk-file-size} MB</td>
+			href="richfaces/${jbds-richfaces-linux-gtk-x86-filename}.MD5">md5</a>
+		| filesize: ${richfaces-linux-gtk-x86-file-size} MB</td>
 	</tr>
 	<tr>
 		<!-- RichFaces linux/gtk 64 -->
@@ -126,22 +126,22 @@
 	<tr>
 		<!-- RichFaces macosx/carbon -->
 		<td><img
-			src="images/${jbds-richfaces-macosx-carbon-status}-small.png" /></td>
+			src="images/${jbds-richfaces-macosx-carbon-x86-status}-small.png" /></td>
 		<td class="downloadInfo"><a class="allLink-blue"
-			href="richfaces/${jbds-richfaces-macosx-carbon-filename}">${jbds-richfaces-macosx-carbon-filename}</a><br />
+			href="richfaces/${jbds-richfaces-macosx-carbon-x86-filename}">${jbds-richfaces-macosx-carbon-x86-filename}</a><br />
 		&nbsp;&nbsp;&nbsp;&nbsp;<a class="md5"
-			href="richfaces/${jbds-richfaces-macosx-carbon-filename}.MD5">md5</a>
-		| filesize: ${richfaces-macosx-carbon-file-size} MB</td>
+			href="richfaces/${jbds-richfaces-macosx-carbon-x86-filename}.MD5">md5</a>
+		| filesize: ${richfaces-macosx-carbon-x86-file-size} MB</td>
 	</tr>
 		<tr>
 		<!-- RichFaces macosx/cocoa -->
 		<td><img
-			src="images/${jbds-richfaces-macosx-cocoa-status}-small.png" /></td>
+			src="images/${jbds-richfaces-macosx-cocoa-x86-status}-small.png" /></td>
 		<td class="downloadInfo"><a class="allLink-blue"
-			href="richfaces/${jbds-richfaces-macosx-cocoa-filename}">${jbds-richfaces-macosx-cocoa-filename}</a><br />
+			href="richfaces/${jbds-richfaces-macosx-cocoa-x86-filename}">${jbds-richfaces-macosx-cocoa-x86-filename}</a><br />
 		&nbsp;&nbsp;&nbsp;&nbsp;<a class="md5"
-			href="richfaces/${jbds-richfaces-macosx-cocoa-filename}.MD5">md5</a>
-		| filesize: ${richfaces-macosx-cocoa-file-size} MB</td>
+			href="richfaces/${jbds-richfaces-macosx-cocoa-x86-filename}.MD5">md5</a>
+		| filesize: ${richfaces-macosx-cocoa-x86-file-size} MB</td>
 	</tr>
 	<tr>
 		<!-- JBossAS Tools -->
@@ -345,22 +345,22 @@
 	</tr>
 	<tr>
 		<!-- XulRunner win32 -->
-		<td><img src="images/${jbds-xulrunner-win32-status}-small.png" /></td>
+		<td><img src="images/${jbds-xulrunner-win32-x86-status}-small.png" /></td>
 		<td class="downloadInfo"><a class="allLink-blue"
-			href="xulrunner/${jbds-xulrunner-win32-filename}">${jbds-xulrunner-win32-filename}</a><br />
+			href="xulrunner/${jbds-xulrunner-win32-x86-filename}">${jbds-xulrunner-win32-x86-filename}</a><br />
 		&nbsp;&nbsp;&nbsp;&nbsp;<a class="md5"
-			href="xulrunner/${jbds-xulrunner-win32-filename}.MD5">md5</a> |
-		filesize: ${xulrunner-win32-file-size} MB</td>
+			href="xulrunner/${jbds-xulrunner-win32-x86-filename}.MD5">md5</a> |
+		filesize: ${xulrunner-win32-x86-file-size} MB</td>
 	</tr>
 	<tr>
 		<!-- XulRunner linux/gtk -->
 		<td><img
-			src="images/${jbds-xulrunner-linux-gtk-status}-small.png" /></td>
+			src="images/${jbds-xulrunner-linux-gtk-x86-status}-small.png" /></td>
 		<td class="downloadInfo"><a class="allLink-blue"
-			href="xulrunner/${jbds-xulrunner-linux-gtk-filename}">${jbds-xulrunner-linux-gtk-filename}</a><br />
+			href="xulrunner/${jbds-xulrunner-linux-gtk-x86-filename}">${jbds-xulrunner-linux-gtk-x86-filename}</a><br />
 		&nbsp;&nbsp;&nbsp;&nbsp;<a class="md5"
-			href="xulrunner/${jbds-xulrunner-linux-gtk-filename}.MD5">md5</a> |
-		filesize: ${xulrunner-linux-gtk-file-size} MB</td>
+			href="xulrunner/${jbds-xulrunner-linux-gtk-x86-filename}.MD5">md5</a> |
+		filesize: ${xulrunner-linux-gtk-x86-file-size} MB</td>
 	</tr>
 	<tr>
 		<!-- XulRunner linux/gtk 64 -->
@@ -375,22 +375,22 @@
 	<tr>
 		<!-- XulRunner macosx/carbon -->
 		<td><img
-			src="images/${jbds-xulrunner-macosx-carbon-status}-small.png" /></td>
+			src="images/${jbds-xulrunner-macosx-carbon-x86-status}-small.png" /></td>
 		<td class="downloadInfo"><a class="allLink-blue"
-			href="xulrunner/${jbds-xulrunner-macosx-carbon-filename}">${jbds-xulrunner-macosx-carbon-filename}</a><br />
+			href="xulrunner/${jbds-xulrunner-macosx-carbon-x86-filename}">${jbds-xulrunner-macosx-carbon-x86-filename}</a><br />
 		&nbsp;&nbsp;&nbsp;&nbsp;<a class="md5"
-			href="xulrunner/${jbds-xulrunner-macosx-carbon-filename}.MD5">md5</a>
-		| filesize: ${xulrunner-macosx-carbon-file-size} MB</td>
+			href="xulrunner/${jbds-xulrunner-macosx-carbon-x86-filename}.MD5">md5</a>
+		| filesize: ${xulrunner-macosx-carbon-x86-file-size} MB</td>
 	</tr>
 	<tr>
 		<!-- XulRunner macosx/cocoa -->
 		<td><img
-			src="images/${jbds-xulrunner-macosx-cocoa-status}-small.png" /></td>
+			src="images/${jbds-xulrunner-macosx-cocoa-x86-status}-small.png" /></td>
 		<td class="downloadInfo"><a class="allLink-blue"
-			href="xulrunner/${jbds-xulrunner-macosx-cocoa-filename}">${jbds-xulrunner-macosx-cocoa-filename}</a><br />
+			href="xulrunner/${jbds-xulrunner-macosx-cocoa-x86-filename}">${jbds-xulrunner-macosx-cocoa-x86-filename}</a><br />
 		&nbsp;&nbsp;&nbsp;&nbsp;<a class="md5"
-			href="xulrunner/${jbds-xulrunner-macosx-cocoa-filename}.MD5">md5</a>
-		| filesize: ${xulrunner-macosx-cocoa-file-size} MB</td>
+			href="xulrunner/${jbds-xulrunner-macosx-cocoa-x86-filename}.MD5">md5</a>
+		| filesize: ${xulrunner-macosx-cocoa-x86-file-size} MB</td>
 	</tr>
 </table>
 
Index: releng/org.jboss.ide.eclipse.releng/builders/product/buildResults/buildResults.xml
===================================================================
--- releng/org.jboss.ide.eclipse.releng/builders/product/buildResults/buildResults.xml	(revision 6564)
+++ releng/org.jboss.ide.eclipse.releng/builders/product/buildResults/buildResults.xml	(working copy)
@@ -7,7 +7,8 @@
 	<property file="../build.properties" />
 	<property file="${build.output.directory}/buildData.properties" />
 
-	<property name="jbds.download.root" value="${jbds.download.url}/${product.buildDesc}/${product.releaseNumber}/${product.buildTimestamp}" />
+	<property name="jbds.download.root"
+	          value="${jbds.download.url}/${product.buildDesc}/${product.releaseNumber}/${product.buildTimestamp}" />
 
 	<target name="get.build.properties">
 		<load.property file="../../../requirements/eclipse/build.properties" property="eclipseBuildID" />
@@ -15,31 +16,46 @@
 		<property name="eclipse.download.url" value="${eclipse.build.uri}/eclipse-SDK-${eclipseBuildID}-win32.zip" />
 
 		<load.property file="../../../requirements/emf/build.properties" property="build.uri" dest="emf.build.uri" />
-		<load.property file="../../../requirements/emf/build.properties" property="build.archive" dest="emf.build.archive" />
+		<load.property file="../../../requirements/emf/build.properties"
+		               property="build.archive"
+		               dest="emf.build.archive" />
 		<load.property file="../../../requirements/xsd/build.properties" property="build.uri" dest="xsd.build.uri" />
-		<load.property file="../../../requirements/xsd/build.properties" property="build.archive" dest="xsd.build.archive" />
+		<load.property file="../../../requirements/xsd/build.properties"
+		               property="build.archive"
+		               dest="xsd.build.archive" />
 
 		<load.property file="../../../requirements/gef/build.properties" property="build.uri" dest="gef.build.uri" />
-		<load.property file="../../../requirements/gef/build.properties" property="build.archive" dest="gef.build.archive" />
+		<load.property file="../../../requirements/gef/build.properties"
+		               property="build.archive"
+		               dest="gef.build.archive" />
 		<load.property file="../../../requirements/dtp/build.properties" property="build.uri" dest="dtp.build.uri" />
-		<load.property file="../../../requirements/dtp/build.properties" property="build.archive" dest="dtp.build.archive" />
-		<load.property file="../../../requirements/webtools/build.properties" property="build.uri" dest="webtools.build.uri" />
-		<load.property file="../../../requirements/webtools/build.properties" property="build.archive" dest="webtools.build.runtime.archive"
-		/>
+		<load.property file="../../../requirements/dtp/build.properties"
+		               property="build.archive"
+		               dest="dtp.build.archive" />
+		<load.property file="../../../requirements/webtools/build.properties"
+		               property="build.uri"
+		               dest="webtools.build.uri" />
+		<load.property file="../../../requirements/webtools/build.properties"
+		               property="build.archive"
+		               dest="webtools.build.runtime.archive" />
 		<load.property file="../../../requirements/tptp/build.properties" property="build.uri" dest="tptp.build.uri" />
-		<load.property file="../../../requirements/tptp/build.properties" property="build.archive" dest="tptp.build.archive" />
+		<load.property file="../../../requirements/tptp/build.properties"
+		               property="build.archive"
+		               dest="tptp.build.archive" />
 		<load.property file="../../../requirements/birt/build.properties" property="build.uri" dest="birt.build.uri" />
 		<load.property file="../../../requirements/birt/build.properties" property="birt-version" dest="birt-version" />
 		<load.property file="../../../requirements/birt/build.properties"
 		               property="birt-wtp-integration-archive"
-		               dest="birt.build.integration.archive"
-		/>
+		               dest="birt.build.integration.archive" />
 		<load.property file="../../../requirements/birt/build.properties"
 		               property="birt-report-framework-archive"
-		               dest="birt.build.framework.archive"
-		/>
+		               dest="birt.build.framework.archive" />
 
-		<propertyregex property="webtoolsBuildID" input="${webtools.build.runtime.archive}" regexp="wtp-(.+).zip" select="\1" casesensitive="false" />
+		<propertyregex property="webtoolsBuildID"
+		               input="${webtools.build.runtime.archive}"
+		               regexp="wtp-(.+).zip"
+		               select="\1"
+		               casesensitive="false" />
 
 		<load.property file="../build.properties" property="builders" />
 
@@ -51,60 +67,52 @@
 					<equals arg1="@{current-builder}" arg2="richfaces" />
 					<then>
 						<get.properties.for.builder builder="richfaces"
-						                            zipFileProperty="win32-zipFile"
-						                            nodeps-zipFileProperty="win32-nodeps-zipFile"
-						                            property-suffix="-win32-"
-						/>
+						                            zipFileProperty="win32-x86-zipFile"
+						                            nodeps-zipFileProperty="win32-x86-nodeps-zipFile"
+						                            property-suffix="-win32-x86-" />
 						<get.properties.for.builder builder="richfaces"
-						                            zipFileProperty="linux-zipFile"
-						                            nodeps-zipFileProperty="linux-nodeps-zipFile"
-						                            property-suffix="-linux-gtk-"
-						/>
+						                            zipFileProperty="linux-x86-zipFile"
+						                            nodeps-zipFileProperty="linux-x86-nodeps-zipFile"
+						                            property-suffix="-linux-gtk-x86-" />
 						<get.properties.for.builder builder="richfaces"
 						                            zipFileProperty="linux_64-zipFile"
 						                            nodeps-zipFileProperty="linux_64-nodeps-zipFile"
-						                            property-suffix="-linux-gtk-x86_64-"
-						/>
-						<get.properties.for.builder builder="richfaces"
+						                            property-suffix="-linux-gtk-x86_64-" />
+						<!-- <get.properties.for.builder builder="richfaces"
 						                            zipFileProperty="macosx-carbon-zipFile"
 						                            nodeps-zipFileProperty="macosx-carbon-nodeps-zipFile"
-						                            property-suffix="-macosx-carbon-"
-						/>
+						                            property-suffix="-macosx-carbon-x86-"
+						/> -->
 						<get.properties.for.builder builder="richfaces"
-						                            zipFileProperty="macosx-cocoa-zipFile"
-						                            nodeps-zipFileProperty="macosx-cocoa-nodeps-zipFile"
-						                            property-suffix="-macosx-cocoa-"
-												/>
+						                            zipFileProperty="macosx-cocoa-x86-zipFile"
+						                            nodeps-zipFileProperty="macosx-cocoa-x86-nodeps-zipFile"
+						                            property-suffix="-macosx-cocoa-x86-" />
 					</then>
 					<else>
 						<if>
 							<equals arg1="@{current-builder}" arg2="xulrunner" />
 							<then>
 								<get.properties.for.builder builder="xulrunner"
-								                            zipFileProperty="win32-zipFile"
-								                            nodeps-zipFileProperty="win32-nodeps-zipFile"
-								                            property-suffix="-win32-"
-								/>
+								                            zipFileProperty="win32-x86-zipFile"
+								                            nodeps-zipFileProperty="win32-x86-nodeps-zipFile"
+								                            property-suffix="-win32-x86-" />
 								<get.properties.for.builder builder="xulrunner"
-								                            zipFileProperty="linux-zipFile"
-								                            nodeps-zipFileProperty="linux-nodeps-zipFile"
-								                            property-suffix="-linux-gtk-"
-								/>
+								                            zipFileProperty="linux-x86-zipFile"
+								                            nodeps-zipFileProperty="linux-x86-nodeps-zipFile"
+								                            property-suffix="-linux-gtk-x86-" />
 								<get.properties.for.builder builder="xulrunner"
 								                            zipFileProperty="linux_64-zipFile"
 								                            nodeps-zipFileProperty="linux_64-nodeps-zipFile"
-								                            property-suffix="-linux-gtk-x86_64-"
-								/>
-								<get.properties.for.builder builder="xulrunner"
+								                            property-suffix="-linux-gtk-x86_64-" />
+								<!-- <get.properties.for.builder builder="xulrunner"
 								                            zipFileProperty="macosx-carbon-zipFile"
 								                            nodeps-zipFileProperty="macosx-carbon-nodeps-zipFile"
 								                            property-suffix="-macosx-carbon-"
-								/>
+								/> -->
 								<get.properties.for.builder builder="xulrunner"
-								                            zipFileProperty="macosx-cocoa-zipFile"
-								                            nodeps-zipFileProperty="macosx-cocoa-nodeps-zipFile"
-								                            property-suffix="-macosx-cocoa-"
-								/>								
+								                            zipFileProperty="macosx-cocoa-x86-zipFile"
+								                            nodeps-zipFileProperty="macosx-cocoa-x86-nodeps-zipFile"
+								                            property-suffix="-macosx-cocoa-x86-" />
 							</then>
 							<else>
 								<if>
@@ -152,149 +160,111 @@
 		<loadfile srcfile="${update-file}.MD5" property="update-file-md5" failonerror="false" />
 
 		<!-- installers -->
-		<property name="jbds-installer-win32-filename" value="jbdevstudio-win32-${product.versionTag}.jar" />
-		<property name="jbds-installer-linux-gtk-filename" value="jbdevstudio-linux-gtk-${product.versionTag}.jar" />
-		<property name="jbds-installer-linux-gtk-x86_64-filename" value="jbdevstudio-linux-gtk-x86_64-${product.versionTag}.jar" />
-		<property name="jbds-installer-macosx-carbon-filename" value="jbdevstudio-macosx-carbon-${product.versionTag}.jar" />
-		<property name="jbds-installer-macosx-cocoa-filename" value="jbdevstudio-macosx-cocoa-${product.versionTag}.jar" />		
+		<property name="jbds-installer-win32-x86-filename" value="jbdevstudio-win32-x86-${product.versionTag}.jar" />
+		<property name="jbds-installer-linux-gtk-x86-filename"
+		          value="jbdevstudio-linux-gtk-x86-${product.versionTag}.jar" />
+		<property name="jbds-installer-linux-gtk-x86_64-filename"
+		          value="jbdevstudio-linux-gtk-x86_64-${product.versionTag}.jar" />
+		<!-- <property name="jbds-installer-macosx-carbon-x86-filename" value="jbdevstudio-macosx-carbon-${product.versionTag}.jar" /> -->
+		<property name="jbds-installer-macosx-cocoa-x86-filename"
+		          value="jbdevstudio-macosx-cocoa-x86-${product.versionTag}.jar" />
+
+		<property name="jbds-installer-eap-win32-x86-filename"
+		          value="jbdevstudio-eap-win32-x86-${product.versionTag}.jar" />
+		<property name="jbds-installer-eap-linux-gtk-x86-filename"
+		          value="jbdevstudio-eap-linux-gtk-x86-${product.versionTag}.jar" />
+		<property name="jbds-installer-eap-linux-gtk-x86_64-filename"
+		          value="jbdevstudio-eap-linux-gtk-x86_64-${product.versionTag}.jar" />
+		<!-- <property name="jbds-installer-eap-macosx-carbon-x86-filename" value="jbdevstudio-eap-macosx-carbon-${product.versionTag}.jar" /> -->
+		<property name="jbds-installer-eap-macosx-cocoa-x86-filename"
+		          value="jbdevstudio-eap-macosx-cocoa-x86-${product.versionTag}.jar" />
 
-		<property name="jbds-installer-eap-win32-filename" value="jbdevstudio-eap-win32-${product.versionTag}.jar" />
-		<property name="jbds-installer-eap-linux-gtk-filename" value="jbdevstudio-eap-linux-gtk-${product.versionTag}.jar" />
-		<property name="jbds-installer-eap-linux-gtk-x86_64-filename" value="jbdevstudio-eap-linux-gtk-x86_64-${product.versionTag}.jar" />
-		<property name="jbds-installer-eap-macosx-carbon-filename" value="jbdevstudio-eap-macosx-carbon-${product.versionTag}.jar" />
-		<property name="jbds-installer-eap-macosx-cocoa-filename" value="jbdevstudio-eap-macosx-cocoa-${product.versionTag}.jar" />
-		
-		<property name="installer-win32-file" value="${product.build.directory}/installer/${jbds-installer-win32-filename}" />
-		<property name="installer-linux-gtk-file" value="${product.build.directory}/installer/${jbds-installer-linux-gtk-filename}" />
+		<property name="installer-win32-x86-file"
+		          value="${product.build.directory}/installer/${jbds-installer-win32-x86-filename}" />
+		<property name="installer-linux-gtk-x86-file"
+		          value="${product.build.directory}/installer/${jbds-installer-linux-gtk-x86-filename}" />
 		<property name="installer-linux-gtk-x86_64-file"
-		          value="${product.build.directory}/installer/${jbds-installer-linux-gtk-x86_64-filename}"
-		/>
-		<property name="installer-macosx-carbon-file" value="${product.build.directory}/installer/${jbds-installer-macosx-carbon-filename}" />
-		<property name="installer-macosx-cocoa-file" value="${product.build.directory}/installer/${jbds-installer-macosx-cocoa-filename}" />
+		          value="${product.build.directory}/installer/${jbds-installer-linux-gtk-x86_64-filename}" />
+		<!-- <property name="installer-macosx-carbon-x86-file" value="${product.build.directory}/installer/${jbds-installer-macosx-carbon-x86-filename}" /> -->
+		<property name="installer-macosx-cocoa-x86-file"
+		          value="${product.build.directory}/installer/${jbds-installer-macosx-cocoa-x86-filename}" />
 
-		<property name="installer-eap-win32-file" value="${product.build.directory}/installer/${jbds-installer-eap-win32-filename}" />
-		<property name="installer-eap-linux-gtk-file" value="${product.build.directory}/installer/${jbds-installer-eap-linux-gtk-filename}" />
+		<property name="installer-eap-win32-x86-file"
+		          value="${product.build.directory}/installer/${jbds-installer-eap-win32-x86-filename}" />
+		<property name="installer-eap-linux-gtk-x86-file"
+		          value="${product.build.directory}/installer/${jbds-installer-eap-linux-gtk-x86-filename}" />
 		<property name="installer-eap-linux-gtk-x86_64-file"
-		          value="${product.build.directory}/installer/${jbds-installer-eap-linux-gtk-x86_64-filename}"
-		/>
-		<property name="installer-eap-macosx-carbon-file"
-		          value="${product.build.directory}/installer/${jbds-installer-eap-macosx-carbon-filename}"
-		/>
-		<property name="installer-eap-macosx-cocoa-file"
-		          value="${product.build.directory}/installer/${jbds-installer-eap-macosx-cocoa-filename}"
-		/>
+		          value="${product.build.directory}/installer/${jbds-installer-eap-linux-gtk-x86_64-filename}" />
+		<!-- <property name="installer-eap-macosx-carbon-x86-file"
+		          value="${product.build.directory}/installer/${jbds-installer-eap-macosx-carbon-x86-filename}"
+		/> -->
+		<property name="installer-eap-macosx-cocoa-x86-file"
+		          value="${product.build.directory}/installer/${jbds-installer-eap-macosx-cocoa-x86-filename}" />
+
+		<get.status.overall file="${installer-win32-x86-file}" property="jbds-installer-win32-x86-status" />
+		<get.status.overall file="${installer-linux-gtk-x86-file}" property="jbds-installer-linux-gtk-x86-status" />
+		<get.status.overall file="${installer-linux-gtk-x86_64-file}"
+		                    property="jbds-installer-linux-gtk-x86_64-status" />
+		<!-- <get.status.overall file="${installer-macosx-carbon-x86-file}" property="jbds-installer-macosx-carbon-x86-status" /> -->
+		<get.status.overall file="${installer-macosx-cocoa-x86-file}"
+		                    property="jbds-installer-macosx-cocoa-x86-status" />
 
-		<get.status.overall file="${installer-win32-file}" property="jbds-installer-win32-status" />
-		<get.status.overall file="${installer-linux-gtk-file}" property="jbds-installer-linux-gtk-status" />
-		<get.status.overall file="${installer-linux-gtk-x86_64-file}" property="jbds-installer-linux-gtk-x86_64-status" />
-		<get.status.overall file="${installer-macosx-carbon-file}" property="jbds-installer-macosx-carbon-status" />
-		<get.status.overall file="${installer-macosx-cocoa-file}" property="jbds-installer-macosx-cocoa-status" />
-			
-		<get.status.overall file="${installer-eap-win32-file}" property="jbds-installer-eap-win32-status" />
-		<get.status.overall file="${installer-eap-linux-gtk-file}" property="jbds-installer-eap-linux-gtk-status" />
-		<get.status.overall file="${installer-eap-linux-gtk-x86_64-file}" property="jbds-installer-eap-linux-gtk-x86_64-status" />
-		<get.status.overall file="${installer-eap-macosx-carbon-file}" property="jbds-installer-eap-macosx-carbon-status" />
-		<get.status.overall file="${installer-eap-macosx-cocoa-file}" property="jbds-installer-eap-macosx-cocoa-status" />
-			
-		<get.size file="${installer-win32-file}" property="installer-win32-file-size" />
-		<get.size file="${installer-linux-gtk-file}" property="installer-linux-gtk-file-size" />
+		<get.status.overall file="${installer-eap-win32-x86-file}" property="jbds-installer-eap-win32-x86-status" />
+		<get.status.overall file="${installer-eap-linux-gtk-x86-file}"
+		                    property="jbds-installer-eap-linux-gtk-x86-status" />
+		<get.status.overall file="${installer-eap-linux-gtk-x86_64-file}"
+		                    property="jbds-installer-eap-linux-gtk-x86_64-status" />
+		<!-- <get.status.overall file="${installer-eap-macosx-carbon-x86-file}" property="jbds-installer-eap-macosx-carbon-x86-status" /> -->
+		<get.status.overall file="${installer-eap-macosx-cocoa-x86-file}"
+		                    property="jbds-installer-eap-macosx-cocoa-x86-status" />
+
+		<get.size file="${installer-win32-x86-file}" property="installer-win32-x86-file-size" />
+		<get.size file="${installer-linux-gtk-x86-file}" property="installer-linux-gtk-x86-file-size" />
 		<get.size file="${installer-linux-gtk-x86_64-file}" property="installer-linux-gtk-x86_64-file-size" />
-		<get.size file="${installer-macosx-carbon-file}" property="installer-macosx-carbon-file-size" />
-		<get.size file="${installer-macosx-cocoa-file}" property="installer-macosx-cocoa-file-size" />
+		<!-- <get.size file="${installer-macosx-carbon-x86-file}" property="installer-macosx-carbon-x86-file-size" /> -->
+		<get.size file="${installer-macosx-cocoa-x86-file}" property="installer-macosx-cocoa-x86-file-size" />
 
-		<get.size file="${installer-eap-win32-file}" property="installer-eap-win32-file-size" />
-		<get.size file="${installer-eap-linux-gtk-file}" property="installer-eap-linux-gtk-file-size" />
+		<get.size file="${installer-eap-win32-x86-file}" property="installer-eap-win32-x86-file-size" />
+		<get.size file="${installer-eap-linux-gtk-x86-file}" property="installer-eap-linux-gtk-x86-file-size" />
 		<get.size file="${installer-eap-linux-gtk-x86_64-file}" property="installer-eap-linux-gtk-x86_64-file-size" />
-		<get.size file="${installer-eap-macosx-carbon-file}" property="installer-eap-macosx-carbon-file-size" />
-		<get.size file="${installer-eap-macosx-cocoa-file}" property="installer-eap-macosx-cocoa-file-size" />
+		<!-- <get.size file="${installer-eap-macosx-carbon-x86-file}" property="installer-eap-macosx-carbon-x86-file-size" /> -->
+		<get.size file="${installer-eap-macosx-cocoa-x86-file}" property="installer-eap-macosx-cocoa-x86-file-size" />
 
 		<!-- all this does is verify that the md5 files exist, by loading the hash as a property; we never use the property later -->
-		<loadfile srcfile="${installer-win32-file}.MD5" property="installer-win32-file-md5" failonerror="false" />
-		<loadfile srcfile="${installer-linux-gtk-file}.MD5" property="installer-linux-gtk-file-md5" failonerror="false" />
-		<loadfile srcfile="${installer-linux-gtk-x86_64-file}.MD5" property="installer-linux-gtk-x86_64-file-md5" failonerror="false" />
-		<loadfile srcfile="${installer-macosx-carbon-file}.MD5" property="installer-macosx-carbon-file-md5" failonerror="false" />
-		<loadfile srcfile="${installer-macosx-cocoa-file}.MD5" property="installer-macosx-cocoa-file-md5" failonerror="false" />
-		
-		<loadfile srcfile="${installer-eap-win32-file}.MD5" property="installer-eap-win32-file-md5" failonerror="false" />
-		<loadfile srcfile="${installer-eap-linux-gtk-file}.MD5" property="installer-eap-linux-gtk-file-md5" failonerror="false" />
-		<loadfile srcfile="${installer-eap-linux-gtk-x86_64-file}.MD5" property="installer-eap-linux-gtk-x86_64-file-md5" failonerror="false" />
-		<loadfile srcfile="${installer-eap-macosx-carbon-file}.MD5" property="installer-eap-macosx-carbon-file-md5" failonerror="false" />
-		<loadfile srcfile="${installer-eap-macosx-cocoa-file}.MD5" property="installer-eap-macosx-cocoa-file-md5" failonerror="false" />
-		
+		<loadfile srcfile="${installer-win32-x86-file}.MD5"
+		          property="installer-win32-x86-file-md5"
+		          failonerror="false" />
+		<loadfile srcfile="${installer-linux-gtk-x86-file}.MD5"
+		          property="installer-linux-gtk-x86-file-md5"
+		          failonerror="false" />
+		<loadfile srcfile="${installer-linux-gtk-x86_64-file}.MD5"
+		          property="installer-linux-gtk-x86_64-file-md5"
+		          failonerror="false" />
+		<!-- <loadfile srcfile="${installer-macosx-carbon-x86-file}.MD5" property="installer-macosx-carbon-x86-file-md5" failonerror="false" /> -->
+		<loadfile srcfile="${installer-macosx-cocoa-x86-file}.MD5"
+		          property="installer-macosx-cocoa-x86-file-md5"
+		          failonerror="false" />
+
+		<loadfile srcfile="${installer-eap-win32-x86-file}.MD5"
+		          property="installer-eap-win32-x86-file-md5"
+		          failonerror="false" />
+		<loadfile srcfile="${installer-eap-linux-gtk-x86-file}.MD5"
+		          property="installer-eap-linux-gtk-x86-file-md5"
+		          failonerror="false" />
+		<loadfile srcfile="${installer-eap-linux-gtk-x86_64-file}.MD5"
+		          property="installer-eap-linux-gtk-x86_64-file-md5"
+		          failonerror="false" />
+		<!-- <loadfile srcfile="${installer-eap-macosx-carbon-x86-file}.MD5" property="installer-eap-macosx-carbon-x86-file-md5" failonerror="false" /> -->
+		<loadfile srcfile="${installer-eap-macosx-cocoa-x86-file}.MD5"
+		          property="installer-eap-macosx-cocoa-x86-file-md5"
+		          failonerror="false" />
+
 		<!-- https://jira.jboss.org/jira/browse/JBIDE-4590 delete these zips for M3 -->
 		<!-- TODO: make installer depend on Update zip, not ALL zips, so we don't have to build these then delete them. -->
 		<delete>
 			<fileset dir="${product.build.directory}/all" includes="*-ALL-*.zip" excludes="*-ALL-sources-*.zip" />
 		</delete>
-		
-		<!-- obsolete all-in-one & bundle zips -->
-		<!--<property name="jbds-all-win32-filename" value="${product.name}-ALL-win32-${product.versionTag}.zip" />
-		<property name="jbds-all-linux-gtk-filename" value="${product.name}-ALL-linux-gtk-${product.versionTag}.zip" />
-		<property name="jbds-all-linux-gtk-x86_64-filename" value="${product.name}-ALL-linux-gtk-x86_64-${product.versionTag}.zip" />
-		<property name="jbds-all-macosx-carbon-filename" value="${product.name}-ALL-macosx-carbon-${product.versionTag}.zip" />
-		<property name="all-win32-file" value="${product.build.directory}/all/${jbds-all-win32-filename}" />
-		<property name="all-linux-gtk-file" value="${product.build.directory}/all/${jbds-all-linux-gtk-filename}" />
-		<property name="all-linux-gtk-x86_64-file" value="${product.build.directory}/all/${jbds-all-linux-gtk-x86_64-filename}" />
-		<property name="all-macosx-carbon-file" value="${product.build.directory}/all/${jbds-all-macosx-carbon-filename}" />
-
-		https://jira.jboss.org/jira/browse/JBIDE-4590 remove these for M3
-		<get.status.overall file="${all-win32-file}" property="jbds-all-win32-status" />
-		<get.status.overall file="${all-linux-gtk-file}" property="jbds-all-linux-gtk-status" />
-		<get.status.overall file="${all-linux-gtk-x86_64-file}" property="jbds-all-linux-gtk-x86_64-status" />
-		<get.status.overall file="${all-macosx-carbon-file}" property="jbds-all-macosx-carbon-status" />
-				
-		<get.size file="${all-win32-file}" property="all-win32-file-size" />
-		<get.size file="${all-linux-gtk-file}" property="all-linux-gtk-file-size" />
-		<get.size file="${all-linux-gtk-x86_64-file}" property="all-linux-gtk-x86_64-file-size" />
-		<get.size file="${all-macosx-carbon-file}" property="all-macosx-carbon-file-size" />
-		
-		<loadfile srcfile="${all-win32-file}.MD5" property="all-win32-file-md5" failonerror="false" />
-		<loadfile srcfile="${all-linux-gtk-file}.MD5" property="all-linux-gtk-file-md5" failonerror="false" />
-		<loadfile srcfile="${all-linux-gtk-x86_64-file}.MD5" property="all-linux-gtk-x86_64-file-md5" failonerror="false" />
-		<loadfile srcfile="${all-macosx-carbon-file}.MD5" property="all-macosx-carbon-file-md5" failonerror="false" />
--->
-
-		<!-- obsolete bundle zips -->
-		<!--
-		<property name="jbds-win32-bundle-filename" value="${product.name}-Bundle-win32-${product.versionTag}.zip" />
-		<property name="jbds-linux-gtk2-bundle-filename" value="${product.name}-Bundle-linux-gtk-${product.versionTag}.tar.gz" />
-		<property name="jbds-macosx-carbon-bundle-filename" value="${product.name}-Bundle-macosx-carbon-${product.versionTag}.tar.gz" />
-		<property name="win32-bundle-file" value="${product.build.directory}/bundle/${jbds-win32-bundle-filename}" />
-		<property name="linux-gtk2-bundle-file" value="${product.build.directory}/bundle/${jbds-linux-gtk2-bundle-filename}" />
-		<property name="macosx-carbon-bundle-file" value="${product.build.directory}/bundle/${jbds-macosx-carbon-bundle-filename}" />
 
-		<get.status.overall file="${win32-bundle-file}" property="jbds-win32-bundle-status" />
-		<get.status.overall file="${linux-gtk2-bundle-file}" property="jbds-linux-gtk2-bundle-status" />
-		<get.status.overall file="${macosx-carbon-bundle-file}" property="jbds-macosx-carbon-bundle-status" />
-		<if>
-			<contains string="${build.steps}" substring="bundle.eclipse" />
-			<then>
-				<get.size file="${win32-bundle-file}" property="win32-bundle-file-size" />
-				<get.size file="${linux-gtk2-bundle-file}" property="linux-gtk2-bundle-file-size" />
-				<get.size file="${macosx-carbon-bundle-file}" property="macosx-carbon-bundle-file-size" />
-			</then>
-		</if>
-
-		 load bundle md5sums (if necessary)
-		<loadfile srcfile="${win32-bundle-file}.MD5" property="win32-bundle-file-md5" failonerror="false" />
-		<loadfile srcfile="${linux-gtk2-bundle-file}.MD5" property="linux-gtk2-bundle-file-md5" failonerror="false" />
-		<loadfile srcfile="${macosx-carbon-bundle-file}.MD5" property="macosx-carbon-bundle-file-md5" failonerror="false" />
-
-		load bundle html (if necessary)
-		<if>
-			<contains string="${build.steps}" substring="bundle.eclipse"/>
-			<then>
-				<loadfile property="bundle.information" srcfile="../buildInfo/bundles.html">
-					<filterchain><expandproperties/></filterchain>
-				</loadfile>
-			</then>
-			<else>
-				<property name="bundle.information" value=""/>
-			</else>
-		</if>
-		<property name="bundle.information" value="" /> 
--->
-		
 		<tstamp>
 			<format pattern="MM/dd/yyyy HH:mm" property="build-date" />
 		</tstamp>
@@ -331,7 +301,11 @@
 					</filterchain>
 				</loadfile>
 
-				<propertyregex property="new-builds-xml" input="${builds-xml}" regexp="(${token})" replace="${build-xml}" casesensitive="false" />
+				<propertyregex property="new-builds-xml"
+				               input="${builds-xml}"
+				               regexp="(${token})"
+				               replace="${build-xml}"
+				               casesensitive="false" />
 
 				<echo file="builds.xml" message="${new-builds-xml}" />
 
@@ -354,7 +328,8 @@
 		<property name="jbds-download-root" value="${jbds.download.root}" />
 		<property name="eclipse-download-url" value="${eclipse.download.url}" />
 		<property name="eclipse-target" value="eclipse-SDK-${eclipseBuildID}-win32.zip" />
-		<property name="webtools-runtime-download-url" value="${webtools.build.uri}/${webtools.build.runtime.archive}" />
+		<property name="webtools-runtime-download-url"
+		          value="${webtools.build.uri}/${webtools.build.runtime.archive}" />
 		<property name="webtools-runtime-target" value="${webtools.build.runtime.archive}" />
 
 		<property name="birt-integration-download-url" value="${birt.build.uri}/${birt.build.integration.archive}" />
@@ -406,7 +381,9 @@
 		<if>
 			<available file="${product.build.directory}/builderFailures.html" type="file" />
 			<then>
-				<loadfile property="compile-failure-html" srcfile="${product.build.directory}/builderFailures.html" failonerror="false">
+				<loadfile property="compile-failure-html"
+				          srcfile="${product.build.directory}/builderFailures.html"
+				          failonerror="false">
 					<filterchain>
 						<expandproperties />
 					</filterchain>
@@ -414,8 +391,7 @@
 				<copy file="${product.build.directory}/builderFailures.html"
 				      tofile="${product.build.root}/latestBuildFailures.html"
 				      overwrite="true"
-				      failonerror="false"
-				/>
+				      failonerror="false" />
 			</then>
 			<else>
 				<!-- if there is no file with compilations errors -->
@@ -460,7 +436,9 @@
 				<expandproperties />
 			</filterchain>
 		</copy>
-		<xslt in="${product.build.directory}/download.xml" out="${product.build.directory}/download-snippet.txt" style="download.xsl" />
+		<xslt in="${product.build.directory}/download.xml"
+		      out="${product.build.directory}/download-snippet.txt"
+		      style="download.xsl" />
 
 	</target>
 
Index: releng/org.jboss.ide.eclipse.releng/builders/product/buildResults/buildResults-internal.html
===================================================================
--- releng/org.jboss.ide.eclipse.releng/builders/product/buildResults/buildResults-internal.html	(revision 6564)
+++ releng/org.jboss.ide.eclipse.releng/builders/product/buildResults/buildResults-internal.html	(working copy)
@@ -52,21 +52,21 @@
 	</tr>
 	<tr>
 		<!-- win32 installer -->
-		<td><img src="images/${jbds-installer-win32-status}.png" /></td>
+		<td><img src="images/${jbds-installer-win32-x86-status}.png" /></td>
 		<td class="downloadInfo"><a class="allLink"
-			href="installer/${jbds-installer-win32-filename}">${jbds-installer-win32-filename}</a><br />
+			href="installer/${jbds-installer-win32-x86-filename}">${jbds-installer-win32-x86-filename}</a><br />
 		&nbsp;&nbsp;&nbsp;&nbsp;<a class="md5"
-			href="installer/${jbds-installer-win32-filename}.MD5">md5</a> |
-		filesize: ${installer-win32-file-size} MB</td>
+			href="installer/${jbds-installer-win32-x86-filename}.MD5">md5</a> |
+		filesize: ${installer-win32-x86-file-size} MB</td>
 	</tr>
 	<tr>
 		<!-- linux-gtk installer -->
-		<td><img src="images/${jbds-installer-linux-gtk-status}.png" /></td>
+		<td><img src="images/${jbds-installer-linux-gtk-x86-status}.png" /></td>
 		<td class="downloadInfo"><a class="allLink"
-			href="installer/${jbds-installer-linux-gtk-filename}">${jbds-installer-linux-gtk-filename}</a><br />
+			href="installer/${jbds-installer-linux-gtk-x86-filename}">${jbds-installer-linux-gtk-x86-filename}</a><br />
 		&nbsp;&nbsp;&nbsp;&nbsp;<a class="md5"
-			href="installer/${jbds-installer-linux-gtk-filename}.MD5">md5</a>
-		| filesize: ${installer-linux-gtk-file-size} MB</td>
+			href="installer/${jbds-installer-linux-gtk-x86-filename}.MD5">md5</a>
+		| filesize: ${installer-linux-gtk-x86-file-size} MB</td>
 	</tr>
 	<tr>
 		<!-- linux-gtk-x86_64 installer -->
@@ -78,23 +78,23 @@
 			href="installer/${jbds-installer-linux-gtk-x86_64-filename}.MD5">md5</a>
 		| filesize: ${installer-linux-gtk-x86_64-file-size} MB</td>
 	</tr>
-	<tr>
-		<!-- os x carbon installer -->
-		<td><img src="images/${jbds-installer-macosx-carbon-status}.png" /></td>
+	<!-- os x carbon installer -->
+	<!-- <tr>
+		<td><img src="images/${jbds-installer-macosx-carbon-x86-status}.png" /></td>
 		<td class="downloadInfo"><a class="allLink"
-			href="installer/${jbds-installer-macosx-carbon-filename}">${jbds-installer-macosx-carbon-filename}</a><br />
+			href="installer/${jbds-installer-macosx-carbon-x86-filename}">${jbds-installer-macosx-carbon-x86-filename}</a><br />
 		&nbsp;&nbsp;&nbsp;&nbsp;<a class="md5"
-			href="installer/${jbds-installer-macosx-carbon-filename}.MD5">md5</a>
-		| filesize: ${installer-macosx-carbon-file-size} MB</td>
-	</tr>
+			href="installer/${jbds-installer-macosx-carbon-x86-filename}.MD5">md5</a>
+		| filesize: ${installer-macosx-carbon-x86-file-size} MB</td>
+	</tr> -->
 	<tr>
 		<!-- os x cocoa installer -->
-		<td><img src="images/${jbds-installer-macosx-cocoa-status}.png" /></td>
+		<td><img src="images/${jbds-installer-macosx-cocoa-x86-status}.png" /></td>
 		<td class="downloadInfo"><a class="allLink"
-			href="installer/${jbds-installer-macosx-cocoa-filename}">${jbds-installer-macosx-cocoa-filename}</a><br />
+			href="installer/${jbds-installer-macosx-cocoa-x86-filename}">${jbds-installer-macosx-cocoa-x86-filename}</a><br />
 		&nbsp;&nbsp;&nbsp;&nbsp;<a class="md5"
-			href="installer/${jbds-installer-macosx-cocoa-filename}.MD5">md5</a>
-		| filesize: ${installer-macosx-cocoa-file-size} MB</td>
+			href="installer/${jbds-installer-macosx-cocoa-x86-filename}.MD5">md5</a>
+		| filesize: ${installer-macosx-cocoa-x86-file-size} MB</td>
 	</tr>
 	<tr>
 		<td colspan="2">
@@ -103,21 +103,21 @@
 	</tr>
 	<tr>
 		<!-- win32 installer -->
-		<td><img src="images/${jbds-installer-eap-win32-status}.png" /></td>
+		<td><img src="images/${jbds-installer-eap-win32-x86-status}.png" /></td>
 		<td class="downloadInfo"><a class="allLink"
-			href="installer/${jbds-installer-eap-win32-filename}">${jbds-installer-eap-win32-filename}</a><br />
+			href="installer/${jbds-installer-eap-win32-x86-filename}">${jbds-installer-eap-win32-x86-filename}</a><br />
 		&nbsp;&nbsp;&nbsp;&nbsp;<a class="md5"
-			href="installer/${jbds-installer-eap-eap-win32-filename}.MD5">md5</a>
-		| filesize: ${installer-eap-win32-file-size} MB</td>
+			href="installer/${jbds-installer-eap-eap-win32-x86-filename}.MD5">md5</a>
+		| filesize: ${installer-eap-win32-x86-file-size} MB</td>
 	</tr>
 	<tr>
 		<!-- linux-gtk installer -->
-		<td><img src="images/${jbds-installer-eap-linux-gtk-status}.png" /></td>
+		<td><img src="images/${jbds-installer-eap-linux-gtk-x86-status}.png" /></td>
 		<td class="downloadInfo"><a class="allLink"
-			href="installer/${jbds-installer-eap-linux-gtk-filename}">${jbds-installer-eap-linux-gtk-filename}</a><br />
+			href="installer/${jbds-installer-eap-linux-gtk-x86-filename}">${jbds-installer-eap-linux-gtk-x86-filename}</a><br />
 		&nbsp;&nbsp;&nbsp;&nbsp;<a class="md5"
-			href="installer/${jbds-installer-eap-linux-gtk-filename}.MD5">md5</a>
-		| filesize: ${installer-eap-linux-gtk-file-size} MB</td>
+			href="installer/${jbds-installer-eap-linux-gtk-x86-filename}.MD5">md5</a>
+		| filesize: ${installer-eap-linux-gtk-x86-file-size} MB</td>
 	</tr>
 	<tr>
 		<!-- linux-gtk-x86_64 installer -->
@@ -129,25 +129,25 @@
 			href="installer/${jbds-installer-eap-linux-gtk-x86_64-filename}.MD5">md5</a>
 		| filesize: ${installer-eap-linux-gtk-x86_64-file-size} MB</td>
 	</tr>
-	<tr>
-		<!-- os x carbon installer -->
+	<!-- os x carbon installer -->
+	<!-- <tr>
 		<td><img
-			src="images/${jbds-installer-eap-macosx-carbon-status}.png" /></td>
+			src="images/${jbds-installer-eap-macosx-carbon-x86-status}.png" /></td>
 		<td class="downloadInfo"><a class="allLink"
-			href="installer/${jbds-installer-eap-macosx-carbon-filename}">${jbds-installer-eap-macosx-carbon-filename}</a><br />
+			href="installer/${jbds-installer-eap-macosx-carbon-x86-filename}">${jbds-installer-eap-macosx-carbon-x86-filename}</a><br />
 		&nbsp;&nbsp;&nbsp;&nbsp;<a class="md5"
-			href="installer/${jbds-installer-eap-macosx-carbon-filename}.MD5">md5</a>
-		| filesize: ${installer-eap-macosx-carbon-file-size} MB</td>
-	</tr>
+			href="installer/${jbds-installer-eap-macosx-carbon-x86-filename}.MD5">md5</a>
+		| filesize: ${installer-eap-macosx-carbon-x86-file-size} MB</td>
+	</tr> -->
 	<tr>
 		<!-- os x cocoa installer -->
 		<td><img
-			src="images/${jbds-installer-eap-macosx-cocoa-status}.png" /></td>
+			src="images/${jbds-installer-eap-macosx-cocoa-x86-status}.png" /></td>
 		<td class="downloadInfo"><a class="allLink"
-			href="installer/${jbds-installer-eap-macosx-cocoa-filename}">${jbds-installer-eap-macosx-cocoa-filename}</a><br />
+			href="installer/${jbds-installer-eap-macosx-cocoa-x86-filename}">${jbds-installer-eap-macosx-cocoa-x86-filename}</a><br />
 		&nbsp;&nbsp;&nbsp;&nbsp;<a class="md5"
-			href="installer/${jbds-installer-eap-macosx-cocoa-filename}.MD5">md5</a>
-		| filesize: ${installer-eap-macosx-cocoa-file-size} MB</td>
+			href="installer/${jbds-installer-eap-macosx-cocoa-x86-filename}.MD5">md5</a>
+		| filesize: ${installer-eap-macosx-cocoa-x86-file-size} MB</td>
 	</tr>
 	<tr>
 		<td colspan="2">
@@ -185,22 +185,22 @@
 	</tr>
 	<tr>
 		<!-- RichFaces win32 -->
-		<td><img src="images/${jbds-richfaces-win32-status}-small.png" /></td>
+		<td><img src="images/${jbds-richfaces-win32-x86-status}-small.png" /></td>
 		<td class="downloadInfo"><a class="pluginLink"
-			href="richfaces/${jbds-richfaces-win32-filename}">${jbds-richfaces-win32-filename}</a><br />
+			href="richfaces/${jbds-richfaces-win32-x86-filename}">${jbds-richfaces-win32-x86-filename}</a><br />
 		&nbsp;&nbsp;&nbsp;&nbsp;<a class="md5"
-			href="richfaces/${jbds-richfaces-win32-filename}.MD5">md5</a> |
-		filesize: ${richfaces-win32-file-size} MB</td>
+			href="richfaces/${jbds-richfaces-win32-x86-filename}.MD5">md5</a> |
+		filesize: ${richfaces-win32-x86-file-size} MB</td>
 	</tr>
 	<tr>
 		<!-- RichFaces linux/gtk -->
 		<td><img
-			src="images/${jbds-richfaces-linux-gtk-status}-small.png" /></td>
+			src="images/${jbds-richfaces-linux-gtk-x86-status}-small.png" /></td>
 		<td class="downloadInfo"><a class="pluginLink"
-			href="richfaces/${jbds-richfaces-linux-gtk-filename}">${jbds-richfaces-linux-gtk-filename}</a><br />
+			href="richfaces/${jbds-richfaces-linux-gtk-x86-filename}">${jbds-richfaces-linux-gtk-x86-filename}</a><br />
 		&nbsp;&nbsp;&nbsp;&nbsp;<a class="md5"
-			href="richfaces/${jbds-richfaces-linux-gtk-filename}.MD5">md5</a>
-		| filesize: ${richfaces-linux-gtk-file-size} MB</td>
+			href="richfaces/${jbds-richfaces-linux-gtk-x86-filename}.MD5">md5</a>
+		| filesize: ${richfaces-linux-gtk-x86-file-size} MB</td>
 	</tr>
 	<tr>
 		<!-- RichFaces linux/gtk 64 -->
@@ -212,25 +212,25 @@
 			href="richfaces/${jbds-richfaces-linux-gtk-x86_64-filename}.MD5">md5</a>
 		| filesize: ${richfaces-linux-gtk-x86_64-file-size} MB</td>
 	</tr>
-	<tr>
-		<!-- RichFaces macosx/carbon -->
+	<!-- RichFaces macosx/carbon -->
+	<!-- <tr>
 		<td><img
-			src="images/${jbds-richfaces-macosx-carbon-status}-small.png" /></td>
+			src="images/${jbds-richfaces-macosx-carbon-x86-status}-small.png" /></td>
 		<td class="downloadInfo"><a class="pluginLink"
-			href="richfaces/${jbds-richfaces-macosx-carbon-filename}">${jbds-richfaces-macosx-carbon-filename}</a><br />
+			href="richfaces/${jbds-richfaces-macosx-carbon-x86-filename}">${jbds-richfaces-macosx-carbon-x86-filename}</a><br />
 		&nbsp;&nbsp;&nbsp;&nbsp;<a class="md5"
-			href="richfaces/${jbds-richfaces-macosx-carbon-filename}.MD5">md5</a>
-		| filesize: ${richfaces-macosx-carbon-file-size} MB</td>
-	</tr>
+			href="richfaces/${jbds-richfaces-macosx-carbon-x86-filename}.MD5">md5</a>
+		| filesize: ${richfaces-macosx-carbon-x86-file-size} MB</td>
+	</tr> -->
 	<tr>
 		<!-- RichFaces macosx/cocoa -->
 		<td><img
-			src="images/${jbds-richfaces-macosx-cocoa-status}-small.png" /></td>
+			src="images/${jbds-richfaces-macosx-cocoa-x86-status}-small.png" /></td>
 		<td class="downloadInfo"><a class="pluginLink"
-			href="richfaces/${jbds-richfaces-macosx-cocoa-filename}">${jbds-richfaces-macosx-cocoa-filename}</a><br />
+			href="richfaces/${jbds-richfaces-macosx-cocoa-x86-filename}">${jbds-richfaces-macosx-cocoa-x86-filename}</a><br />
 		&nbsp;&nbsp;&nbsp;&nbsp;<a class="md5"
-			href="richfaces/${jbds-richfaces-macosx-cocoa-filename}.MD5">md5</a>
-		| filesize: ${richfaces-macosx-carbon-file-size} MB</td>
+			href="richfaces/${jbds-richfaces-macosx-cocoa-x86-filename}.MD5">md5</a>
+		| filesize: ${richfaces-macosx-cocoa-x86-file-size} MB</td>
 	</tr>	
 	<tr>
 		<!-- JBossAS Tools -->
@@ -433,22 +433,22 @@
 	</tr>
 	<tr>
 		<!-- XulRunner win32 -->
-		<td><img src="images/${jbds-xulrunner-win32-status}-small.png" /></td>
+		<td><img src="images/${jbds-xulrunner-win32-x86-status}-small.png" /></td>
 		<td class="downloadInfo"><a class="pluginLink"
-			href="xulrunner/${jbds-xulrunner-win32-filename}">${jbds-xulrunner-win32-filename}</a><br />
+			href="xulrunner/${jbds-xulrunner-win32-x86-filename}">${jbds-xulrunner-win32-x86-filename}</a><br />
 		&nbsp;&nbsp;&nbsp;&nbsp;<a class="md5"
-			href="xulrunner/${jbds-xulrunner-win32-filename}.MD5">md5</a> |
-		filesize: ${xulrunner-win32-file-size} MB</td>
+			href="xulrunner/${jbds-xulrunner-win32-x86-filename}.MD5">md5</a> |
+		filesize: ${xulrunner-win32-x86-file-size} MB</td>
 	</tr>
 	<tr>
 		<!-- XulRunner linux/gtk -->
 		<td><img
-			src="images/${jbds-xulrunner-linux-gtk-status}-small.png" /></td>
+			src="images/${jbds-xulrunner-linux-gtk-x86-status}-small.png" /></td>
 		<td class="downloadInfo"><a class="pluginLink"
-			href="xulrunner/${jbds-xulrunner-linux-gtk-filename}">${jbds-xulrunner-linux-gtk-filename}</a><br />
+			href="xulrunner/${jbds-xulrunner-linux-gtk-x86-filename}">${jbds-xulrunner-linux-gtk-x86-filename}</a><br />
 		&nbsp;&nbsp;&nbsp;&nbsp;<a class="md5"
-			href="xulrunner/${jbds-xulrunner-linux-gtk-filename}.MD5">md5</a> |
-		filesize: ${xulrunner-linux-gtk-file-size} MB</td>
+			href="xulrunner/${jbds-xulrunner-linux-gtk-x86-filename}.MD5">md5</a> |
+		filesize: ${xulrunner-linux-gtk-x86-file-size} MB</td>
 	</tr>
 	<tr>
 		<!-- XulRunner linux/gtk 64 -->
@@ -460,25 +460,25 @@
 			href="xulrunner/${jbds-xulrunner-linux-gtk-x86_64-filename}.MD5">md5</a>
 		| filesize: ${xulrunner-linux-gtk-x86_64-file-size} MB</td>
 	</tr>
-	<tr>
-		<!-- XulRunner macosx/carbon -->
+	<!-- XulRunner macosx/carbon -->
+	<!-- <tr>
 		<td><img
-			src="images/${jbds-xulrunner-macosx-carbon-status}-small.png" /></td>
+			src="images/${jbds-xulrunner-macosx-carbon-x86-status}-small.png" /></td>
 		<td class="downloadInfo"><a class="pluginLink"
-			href="xulrunner/${jbds-xulrunner-macosx-carbon-filename}">${jbds-xulrunner-macosx-carbon-filename}</a><br />
+			href="xulrunner/${jbds-xulrunner-macosx-carbon-x86-filename}">${jbds-xulrunner-macosx-carbon-x86-filename}</a><br />
 		&nbsp;&nbsp;&nbsp;&nbsp;<a class="md5"
-			href="xulrunner/${jbds-xulrunner-macosx-carbon-filename}.MD5">md5</a>
-		| filesize: ${xulrunner-macosx-carbon-file-size} MB</td>
-	</tr>
+			href="xulrunner/${jbds-xulrunner-macosx-carbon-x86-filename}.MD5">md5</a>
+		| filesize: ${xulrunner-macosx-carbon-x86-file-size} MB</td>
+	</tr> -->
 	<tr>
 		<!-- XulRunner macosx/cocoa -->
 		<td><img
-			src="images/${jbds-xulrunner-macosx-cocoa-status}-small.png" /></td>
+			src="images/${jbds-xulrunner-macosx-cocoa-x86-status}-small.png" /></td>
 		<td class="downloadInfo"><a class="pluginLink"
-			href="xulrunner/${jbds-xulrunner-macosx-cocoa-filename}">${jbds-xulrunner-macosx-cocoa-filename}</a><br />
+			href="xulrunner/${jbds-xulrunner-macosx-cocoa-x86-filename}">${jbds-xulrunner-macosx-cocoa-x86-filename}</a><br />
 		&nbsp;&nbsp;&nbsp;&nbsp;<a class="md5"
-			href="xulrunner/${jbds-xulrunner-macosx-cocoa-filename}.MD5">md5</a>
-		| filesize: ${xulrunner-macosx-cocoa-file-size} MB</td>
+			href="xulrunner/${jbds-xulrunner-macosx-cocoa-x86-filename}.MD5">md5</a>
+		| filesize: ${xulrunner-macosx-cocoa-x86-file-size} MB</td>
 	</tr>
 </table>
 
Index: releng/org.jboss.ide.eclipse.releng/builders/product/buildResults/download-template.xml
===================================================================
--- releng/org.jboss.ide.eclipse.releng/builders/product/buildResults/download-template.xml	(revision 6564)
+++ releng/org.jboss.ide.eclipse.releng/builders/product/buildResults/download-template.xml	(working copy)
@@ -7,10 +7,10 @@
 
 <project name="Visual Page Editor" version="${product.versionTag}">
  <description>for Richfaces, JSF and HTML / CSS</description>
- <download os="Windows" url="${jbds-richfaces-win32-filename}" size="${richfaces-win32-file-size} MB"/>
- <download os="Linux 32-bit" url="${jbds-richfaces-linux-gtk-filename}" size="${richfaces-linux-gtk-file-size} MB"/>
+ <download os="Windows 32-bit" url="${jbds-richfaces-win32-x86-filename}" size="${richfaces-win32-x86-file-size} MB"/>
+ <download os="Linux 32-bit" url="${jbds-richfaces-linux-gtk-x86-filename}" size="${richfaces-linux-gtk-x86-file-size} MB"/>
  <download os="Linux 64-bit" url="${jbds-richfaces-linux-gtk-x86_64-filename}" size="${richfaces-linux-gtk-x86_64-file-size} MB"/>
- <download os="Mac OS X" url="${jbds-richfaces-macosx-carbon-filename}" size="${richfaces-macosx-carbon-file-size} MB"/>
+ <download os="OS X Cocoa 32-bit" url="${jbds-richfaces-macosx-cocoa-x86-filename}" size="${richfaces-macosx-cocoa-x86-file-size} MB"/>
 </project>
 
 <project name="Drools IDE" version="${drools-ide.versionTag}">
@@ -105,10 +105,10 @@
 
 <project name="XulRunner" version="${xulrunner.versionTag}">
  <description>provides a common back-end for XUL applications</description>
- <download os="Windows" url="${jbds-xulrunner-win32-filename}" size="${xulrunner-win32-file-size} MB"/>
- <download os="Linux 32-bit" url="${jbds-xulrunner-linux-gtk-filename}" size="${xulrunner-linux-gtk-file-size} MB"/>
+ <download os="Windows 32-bit" url="${jbds-xulrunner-win32-x86-filename}" size="${xulrunner-win32-x86-file-size} MB"/>
+ <download os="Linux 32-bit" url="${jbds-xulrunner-linux-gtk-x86-filename}" size="${xulrunner-linux-gtk-x86-file-size} MB"/>
  <download os="Linux 64-bit" url="${jbds-xulrunner-linux-gtk-x86_64-filename}" size="${xulrunner-linux-gtk-x86_64-file-size} MB"/>
- <download os="Mac OS X" url="${jbds-xulrunner-macosx-carbon-filename}" size="${xulrunner-macosx-carbon-file-size} MB"/>
+ <download os="OS X Cocoa 32-bit" url="${jbds-xulrunner-macosx-cocoa-x86-filename}" size="${xulrunner-macosx-cocoa-x86-file-size} MB"/>
 </project>
 
 <project name="Sources" version="${product.versionTag}">
Index: releng/org.jboss.ide.eclipse.releng/builders/product/buildInstaller.xml
===================================================================
--- releng/org.jboss.ide.eclipse.releng/builders/product/buildInstaller.xml	(revision 6564)
+++ releng/org.jboss.ide.eclipse.releng/builders/product/buildInstaller.xml	(working copy)
@@ -82,7 +82,7 @@
 			<or>
 				<equals arg1="${platform}" arg2="linux-gtk" />
 				<equals arg1="${platform}" arg2="linux-gtk-x86_64" />
-				<equals arg1="${platform}" arg2="macosx-carbon" />
+				<!-- <equals arg1="${platform}" arg2="macosx-carbon" /> -->
 				<equals arg1="${platform}" arg2="macosx-cocoa" />
 			</or>
 		</condition>
Index: releng/org.jboss.ide.eclipse.releng/builders/product/build.properties
===================================================================
--- releng/org.jboss.ide.eclipse.releng/builders/product/build.properties	(revision 6564)
+++ releng/org.jboss.ide.eclipse.releng/builders/product/build.properties	(working copy)
@@ -17,10 +17,9 @@
 build.results.exclude.tests=yes
 
 eclipse.archive.path=${product.build.root}
-platform.names=win32,linux-gtk,linux-gtk-x86_64,macosx-carbon,macosx-cocoa
-#platform.names=win32,linux-gtk
+# ,macosx-carbon
+platform.names=win32-x86,linux-gtk-x86,linux-gtk-x86_64,macosx-cocoa-x86
 buildResults.template=buildResults.html
-
 buildScriptExt=${build.script.ext}
 
 # SSH/SCP properties
Index: releng/org.jboss.ide.eclipse.releng/builders/product/build.requires
===================================================================
--- releng/org.jboss.ide.eclipse.releng/builders/product/build.requires	(revision 6564)
+++ releng/org.jboss.ide.eclipse.releng/builders/product/build.requires	(working copy)
@@ -1,11 +1,11 @@
 # these are requirements/* dirs, not builders/*
+# eclipse-macosx-carbon-x86 removed
 product.requires=eclipse,equinox,gef
 installer.requires=\
-eclipse-linux-gtk,\
+eclipse-linux-gtk-x86,\
 eclipse-linux-gtk-x86_64,\
-eclipse-win32,\
-eclipse-macosx,\
-eclipse-macosx-cocoa,\
+eclipse-win32-x86,\
+eclipse-macosx-cocoa-x86,\
 equinox,\
 webtools,dtp,gef,emf,xsd,\
 seamfp,jbeap-5.0.0,\
Index: releng/org.jboss.ide.eclipse.releng/builders/xulrunner/build.properties
===================================================================
--- releng/org.jboss.ide.eclipse.releng/builders/xulrunner/build.properties	(revision 6564)
+++ releng/org.jboss.ide.eclipse.releng/builders/xulrunner/build.properties	(working copy)
@@ -12,7 +12,8 @@
 collPlace=eclipse
 collBase=.
 flattenDependencies=true
-configs=win32,win32,x86 & linux,gtk,x86 & linux,gtk,x86_64 & macosx,carbon,ppc & macosx,cocoa,ppc
+# & macosx,carbon,x86
+configs=win32,win32,x86 & linux,gtk,x86 & linux,gtk,x86_64 & macosx,cocoa,x86
 archivesFormat=*,*,* - zip
 bootclasspath=${java.home}/lib/rt.jar
 javacFailOnError=true
@@ -30,17 +31,16 @@
 buildTypeDescription.I=integration
 buildTypeDescription.R=release
 
-win32-zipFile=XulRunner-win32-${versionTag}.zip
-win32-nodeps-zipFile=XulRunner-win32-nodeps-${versionTag}.zip
-linux-zipFile=XulRunner-linux-gtk-${versionTag}.zip
-linux-nodeps-zipFile=XulRunner-linux-gtk-nodeps-${versionTag}.zip
+win32-zipFile=XulRunner-win32-x86-${versionTag}.zip
+win32-nodeps-zipFile=XulRunner-win32-x86-nodeps-${versionTag}.zip
+linux-zipFile=XulRunner-linux-gtk-x86-${versionTag}.zip
+linux-nodeps-zipFile=XulRunner-linux-gtk-x86-nodeps-${versionTag}.zip
 linux_64-zipFile=XulRunner-linux-gtk-x86_64-${versionTag}.zip
 linux_64-nodeps-zipFile=XulRunner-linux-gtk-x86_64-nodeps-${versionTag}.zip
-macosx-carbon-zipFile=XulRunner-macosx-carbon-${versionTag}.zip
-macosx-carbon-nodeps-zipFile=XulRunner-macosx-carbon-nodeps-${versionTag}.zip
-macosx-cocoa-zipFile=XulRunner-macosx-cocoa-${versionTag}.zip
-macosx-cocoa-nodeps-zipFile=XulRunner-macosx-cocoa-nodeps-${versionTag}.zip
-
+#macosx-carbon-zipFile=XulRunner-macosx-carbon-x86-${versionTag}.zip
+#macosx-carbon-nodeps-zipFile=XulRunner-macosx-carbon-x86-nodeps-${versionTag}.zip
+macosx-cocoa-zipFile=XulRunner-macosx-cocoa-x86-${versionTag}.zip
+macosx-cocoa-nodeps-zipFile=XulRunner-macosx-cocoa-x86-nodeps-${versionTag}.zip
 
 defaultSvnUrl=http://anonsvn.jboss.org/repos/jbosstools
 defaultTag=trunk
\ No newline at end of file
Index: releng/org.jboss.ide.eclipse.releng/builders/xulrunner/customTargets.xml
===================================================================
--- releng/org.jboss.ide.eclipse.releng/builders/xulrunner/customTargets.xml	(revision 6564)
+++ releng/org.jboss.ide.eclipse.releng/builders/xulrunner/customTargets.xml	(working copy)
@@ -52,7 +52,7 @@
 	</zip>	
 </target>
 	
-<target name="assemble.org.jboss.tools.xulrunner.feature.macosx.carbon.ppc">
+<target name="assemble.org.jboss.tools.xulrunner.feature.macosx.carbon.x86">
 	<property name="archiveName" value="${macosx-carbon-zipFile}"/>
 	<property name="archiveFullPath" value="${product.build.directory}/${builder}/${archiveName}"/>	
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
@@ -66,7 +66,7 @@
 	</zip>	
 </target>
 
-<target name="assemble.org.jboss.tools.xulrunner.feature.macosx.cocoa.ppc">
+<target name="assemble.org.jboss.tools.xulrunner.feature.macosx.cocoa.x86">
 	<property name="archiveName" value="${macosx-cocoa-zipFile}"/>
 	<property name="archiveFullPath" value="${product.build.directory}/${builder}/${archiveName}"/>	
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
Index: releng/org.jboss.ide.eclipse.releng/src/org/jboss/ide/eclipse/releng/RelengUtil.java
===================================================================
--- releng/org.jboss.ide.eclipse.releng/src/org/jboss/ide/eclipse/releng/RelengUtil.java	(revision 6564)
+++ releng/org.jboss.ide.eclipse.releng/src/org/jboss/ide/eclipse/releng/RelengUtil.java	(working copy)
@@ -231,7 +231,7 @@
 		else if (osName.indexOf("Linux") != -1)
 			return "gtk";
 		else if (osName.indexOf("Mac OS X") != -1)
-			return "carbon";
+			return "cocoa";
 		else return "unknown";
 	}
 	
Index: releng/org.jboss.ide.eclipse.releng/requirements/xulrunner/buildRequirement.xml
===================================================================
--- releng/org.jboss.ide.eclipse.releng/requirements/xulrunner/buildRequirement.xml	(revision 6564)
+++ releng/org.jboss.ide.eclipse.releng/requirements/xulrunner/buildRequirement.xml	(working copy)
@@ -2,7 +2,10 @@
 	<property file="build.properties" />
 	<target name="build.requirement">
 
-		<for param="entityname" list="xulrunner.win32,xulrunner.linux,xulrunner.linux_64,xulrunner.carbon.osx,xulrunner.cocoa.osx,xpcom" delimiter=",">
+		<!-- xulrunner.carbon.osx removed; unavailable in 1.9.2 -->
+		<for param="entityname"
+		     list="xulrunner.win32,xulrunner.linux,xulrunner.linux_64,xulrunner.cocoa.osx,xpcom"
+		     delimiter=",">
 			<sequential>
 				<ant antfile="../generic/build.xml" target="build.driver" inheritall="true">
 					<property name="driver.properties" value="${basedir}/build.properties" />
Index: releng/org.jboss.ide.eclipse.releng/requirements/xulrunner/build.properties
===================================================================
--- releng/org.jboss.ide.eclipse.releng/requirements/xulrunner/build.properties	(revision 6564)
+++ releng/org.jboss.ide.eclipse.releng/requirements/xulrunner/build.properties	(working copy)
@@ -17,19 +17,18 @@
 requirement.name=xulrunner
 xulrunner.build.uri=http://repository.jboss.org/xulrunner
 xulrunner.http=${xulrunner.build.uri}
-xulrunner.version=1.9.1.2
+xulrunner.version=1.9.2
 xulrunner.win32=org.mozilla.xulrunner.win32.win32.x86_${xulrunner.version}
 xulrunner.win32.md5=e2a5f569ccf1eca88f811081538e05c7
 xulrunner.linux=org.mozilla.xulrunner.gtk.linux.x86_${xulrunner.version}
 xulrunner.linux.md5=d91ccd69a12987a08e6cfd3cffe2070d
-# https://jira.jboss.org/jira/browse/JBIDE-5033: recompiled on a system with glibc <=2.12 (JBDS and RHEL5 will be compatible) 
-xulrunner.linux_64=org.mozilla.xulrunner.gtk.linux.x86_64_${xulrunner.version}a
+xulrunner.linux_64=org.mozilla.xulrunner.gtk.linux.x86_64_${xulrunner.version}
 xulrunner.linux_64.md5=4ca377b187963bedaaca6a97a46c1456
-xulrunner.carbon.osx=org.mozilla.xulrunner.carbon.macosx_${xulrunner.version}
-xulrunner.carbon.osx.md5=e08e3a0a8392a7fa2e35f02c993c53be
-xulrunner.cocoa.osx=org.mozilla.xulrunner.cocoa.macosx_${xulrunner.version}
+#xulrunner.carbon.osx removed; unavailable in 1.9.2
+#xulrunner.carbon.osx=org.mozilla.xulrunner.carbon.macosx.x86_${xulrunner.version}
+#xulrunner.carbon.osx.md5=e08e3a0a8392a7fa2e35f02c993c53be
+xulrunner.cocoa.osx=org.mozilla.xulrunner.cocoa.macosx.x86_${xulrunner.version}
 xulrunner.cocoa.osx.md5=89c2ce19cc8cfbddd56c331d2f4988ac
 
-# tweak manifest and rejar as 1.9.1.2a
-xpcom=org.mozilla.xpcom_${xulrunner.version}a
+xpcom=org.mozilla.xpcom_${xulrunner.version}
 xpcom.md5=7dd7a89b58810dae4ff750ff3e6de68d
Index: releng/org.jboss.ide.eclipse.releng/requirements/eclipse-linux-gtk-x86_64/buildRequirement.xml
===================================================================
--- releng/org.jboss.ide.eclipse.releng/requirements/eclipse-linux-gtk-x86_64/buildRequirement.xml	(revision 6564)
+++ releng/org.jboss.ide.eclipse.releng/requirements/eclipse-linux-gtk-x86_64/buildRequirement.xml	(working copy)
@@ -1,4 +1,4 @@
 <project name="Eclipse requirement download for linux-gtk-x86_64" default="build.requirement">
 	<!-- Load base eclipse properties to get build.uri and requirement name loaded -->
-	<import file="../eclipse-win32/buildRequirement.xml" />
+	<import file="../eclipse-win32-x86/buildRequirement.xml" />
 </project>
\ No newline at end of file
Index: releng/org.jboss.ide.eclipse.releng/requirements/eclipse/buildRequirement.xml
===================================================================
--- releng/org.jboss.ide.eclipse.releng/requirements/eclipse/buildRequirement.xml	(revision 6564)
+++ releng/org.jboss.ide.eclipse.releng/requirements/eclipse/buildRequirement.xml	(working copy)
@@ -9,7 +9,7 @@
 		<condition property="os1" value="linux-gtk" else="win32">
 			<os family="unix" />
 		</condition>
-		<condition property="os" value="macosx-carbon" else="${os1}">
+		<condition property="os" value="macosx-cocoa" else="${os1}">
 			<os family="mac" />
 		</condition>
 		<if>
Index: releng/org.jboss.ide.eclipse.releng/requirements/eclipse-linux-gtk/buildRequirement.xml
===================================================================
--- releng/org.jboss.ide.eclipse.releng/requirements/eclipse-linux-gtk/buildRequirement.xml	(revision 6564)
+++ releng/org.jboss.ide.eclipse.releng/requirements/eclipse-linux-gtk/buildRequirement.xml	(working copy)
@@ -1,4 +0,0 @@
-<project name="Eclipse requirement download for linux-gtk" default="build.requirement">
-	<!-- Load base eclipse properties to get build.uri and requirement name loaded -->
-	<import file="../eclipse-win32/buildRequirement.xml" />
-</project>
\ No newline at end of file
Index: releng/org.jboss.ide.eclipse.releng/requirements/eclipse-linux-gtk/build.properties
===================================================================
--- releng/org.jboss.ide.eclipse.releng/requirements/eclipse-linux-gtk/build.properties	(revision 6564)
+++ releng/org.jboss.ide.eclipse.releng/requirements/eclipse-linux-gtk/build.properties	(working copy)
@@ -1,4 +0,0 @@
-ext=tar.gz
-os=linux-gtk
-arch=x86
-md5=5f14c2de0dd9d9af614a0be53121a326
Index: releng/org.jboss.ide.eclipse.releng/requirements/eclipse-linux-gtk-x86/buildRequirement.xml
===================================================================
--- releng/org.jboss.ide.eclipse.releng/requirements/eclipse-linux-gtk-x86/buildRequirement.xml	(revision 6562)
+++ releng/org.jboss.ide.eclipse.releng/requirements/eclipse-linux-gtk-x86/buildRequirement.xml	(working copy)
@@ -1,4 +1,4 @@
 <project name="Eclipse requirement download for linux-gtk" default="build.requirement">
 	<!-- Load base eclipse properties to get build.uri and requirement name loaded -->
-	<import file="../eclipse-win32/buildRequirement.xml" />
+	<import file="../eclipse-win32-x86/buildRequirement.xml" />
 </project>
\ No newline at end of file
Index: releng/org.jboss.ide.eclipse.releng/requirements/eclipse-win32/build.properties
===================================================================
--- releng/org.jboss.ide.eclipse.releng/requirements/eclipse-win32/build.properties	(revision 6564)
+++ releng/org.jboss.ide.eclipse.releng/requirements/eclipse-win32/build.properties	(working copy)
@@ -1,4 +0,0 @@
-os=win32
-arch=x86
-ext=zip
-md5=63f8b3dcfa5fb27d726b7a3e14b81a9c
Index: releng/org.jboss.ide.eclipse.releng/requirements/eclipse-win32/buildRequirement.xml
===================================================================
--- releng/org.jboss.ide.eclipse.releng/requirements/eclipse-win32/buildRequirement.xml	(revision 6564)
+++ releng/org.jboss.ide.eclipse.releng/requirements/eclipse-win32/buildRequirement.xml	(working copy)
@@ -1,5 +0,0 @@
-<project name="Eclipse requirement download for win32" default="build.requirement">
-	<!-- Load base eclipse properties to get build.uri and requirement name loaded -->
-	<property file="../eclipse/build.properties" />
-	<import file="../eclipse/buildRequirement.xml" />
-</project>
\ No newline at end of file
Index: releng/org.jboss.ide.eclipse.releng/requirements/eclipse-macosx-cocoa/build.properties
===================================================================
--- releng/org.jboss.ide.eclipse.releng/requirements/eclipse-macosx-cocoa/build.properties	(revision 6564)
+++ releng/org.jboss.ide.eclipse.releng/requirements/eclipse-macosx-cocoa/build.properties	(working copy)
@@ -1,4 +0,0 @@
-ext=tar.gz
-os=macosx-cocoa
-arch=x86
-md5=0cee1ce234090349ac1f4fd04321aadd
Index: releng/org.jboss.ide.eclipse.releng/requirements/eclipse-macosx-cocoa/buildRequirement.xml
===================================================================
--- releng/org.jboss.ide.eclipse.releng/requirements/eclipse-macosx-cocoa/buildRequirement.xml	(revision 6564)
+++ releng/org.jboss.ide.eclipse.releng/requirements/eclipse-macosx-cocoa/buildRequirement.xml	(working copy)
@@ -1,4 +0,0 @@
-<project name="Eclipse requirement download for macosx-cocoa" default="build.requirement">
-	<!-- Load base eclipse properties to get build.uri and requirement name loaded -->
-	<import file="../eclipse-win32/buildRequirement.xml" />
-</project>
\ No newline at end of file
Index: releng/org.jboss.ide.eclipse.releng/requirements/eclipse-macosx/buildRequirement.xml
===================================================================
--- releng/org.jboss.ide.eclipse.releng/requirements/eclipse-macosx/buildRequirement.xml	(revision 6564)
+++ releng/org.jboss.ide.eclipse.releng/requirements/eclipse-macosx/buildRequirement.xml	(working copy)
@@ -1,4 +0,0 @@
-<project name="Eclipse requirement download for macosx-carbon" default="build.requirement">
-	<!-- Load base eclipse properties to get build.uri and requirement name loaded -->
-	<import file="../eclipse-win32/buildRequirement.xml" />
-</project>
\ No newline at end of file
Index: releng/org.jboss.ide.eclipse.releng/requirements/eclipse-macosx/build.properties
===================================================================
--- releng/org.jboss.ide.eclipse.releng/requirements/eclipse-macosx/build.properties	(revision 6564)
+++ releng/org.jboss.ide.eclipse.releng/requirements/eclipse-macosx/build.properties	(working copy)
@@ -1,4 +0,0 @@
-ext=tar.gz
-os=macosx-carbon
-arch=x86
-md5=bc92a43f6644bcc588b6bfdfeb7a6999
Index: releng/org.jboss.ide.eclipse.releng/requirements/eclipse-macosx-cocoa-x86/buildRequirement.xml
===================================================================
--- releng/org.jboss.ide.eclipse.releng/requirements/eclipse-macosx-cocoa-x86/buildRequirement.xml	(revision 6562)
+++ releng/org.jboss.ide.eclipse.releng/requirements/eclipse-macosx-cocoa-x86/buildRequirement.xml	(working copy)
@@ -1,4 +1,4 @@
 <project name="Eclipse requirement download for macosx-cocoa" default="build.requirement">
 	<!-- Load base eclipse properties to get build.uri and requirement name loaded -->
-	<import file="../eclipse-win32/buildRequirement.xml" />
+	<import file="../eclipse-win32-x86/buildRequirement.xml" />
 </project>
\ No newline at end of file
Index: releng/org.jboss.ide.eclipse.releng/requirements/eclipse-macosx-carbon-x86/buildRequirement.xml
===================================================================
--- releng/org.jboss.ide.eclipse.releng/requirements/eclipse-macosx-carbon-x86/buildRequirement.xml	(revision 6562)
+++ releng/org.jboss.ide.eclipse.releng/requirements/eclipse-macosx-carbon-x86/buildRequirement.xml	(working copy)
@@ -1,4 +1,4 @@
 <project name="Eclipse requirement download for macosx-carbon" default="build.requirement">
 	<!-- Load base eclipse properties to get build.uri and requirement name loaded -->
-	<import file="../eclipse-win32/buildRequirement.xml" />
+	<import file="../eclipse-win32-x86/buildRequirement.xml" />
 </project>
\ No newline at end of file
Index: devstudio-installer/build.xml
===================================================================
--- devstudio-installer/build.xml	(revision 6564)
+++ devstudio-installer/build.xml	(working copy)
@@ -163,7 +163,7 @@
 		<!-- This properties is intended to be overwritten by calling builders to point to specific locations -->
 		<property name="artifacts.dir" location="artifacts" />
 		<property name="artifacts.eclipse"
-		          location="/windows/download/eclipse-3.4.2/eclipse-SDK-M20090204-1400-macosx-carbon.tar.gz"
+		          location="/windows/download/eclipse-3.6.0/eclipse-SDK-3.6-win32.zip"
 		/>
 		<property name="artifacts.equinox.transforms.xslt"
 		          location="${artifacts.dir}/requirements/equinox/org.eclipse.equinox.transforms.xslt_${org.eclipse.equinox.transforms.xslt.version}.jar"
@@ -198,15 +198,15 @@
 	</target>
 
 
-	<target name="prepare-eclipse-unknown" depends="prepare-eclipse-win32">
+	<target name="prepare-eclipse-unknown" depends="prepare-eclipse-linux-gtk-x86">
 		<echo>falling back to unzip for unknown eclipse</echo>
 	</target>
 
-	<target name="prepare-eclipse-win32">
+	<target name="prepare-eclipse-win32-x86">
 		<unzip dest="${distribution.dir}" src="${artifacts.eclipse}" overwrite="false" />
 	</target>
 
-	<target name="prepare-eclipse-linux-gtk">
+	<target name="prepare-eclipse-linux-gtk-x86">
 		<untar dest="${distribution.dir}" src="${artifacts.eclipse}" overwrite="true" compression="gzip" />
 	</target>
 
@@ -214,16 +214,14 @@
 		<untar dest="${distribution.dir}" src="${artifacts.eclipse}" overwrite="true" compression="gzip" />
 	</target>
 
-	<target name="prepare-eclipse-macosx-carbon">
+	<!-- <target name="prepare-eclipse-macosx-carbon-x86">
 		<untar dest="${distribution.dir}" src="${artifacts.eclipse}" overwrite="true" compression="gzip" />
-	</target>
+	</target> -->
 
-	<target name="prepare-eclipse-macosx-cocoa">
+	<target name="prepare-eclipse-macosx-cocoa-x86">
 		<untar dest="${distribution.dir}" src="${artifacts.eclipse}" overwrite="true" compression="gzip" />
 	</target>
 
-	<!-- TODO: add osx cocoa 64, opensolaris, ... -->
-
 	<target name="prepare-eclipse" depends="prepare-distribution-properties" unless="test.build">
 		<delete includeemptydirs="true" defaultexcludes="false" failonerror="false">
 			<fileset dir="${distribution.dir}/eclipse" />
Index: devstudio-installer/version.properties
===================================================================
--- devstudio-installer/version.properties	(revision 6564)
+++ devstudio-installer/version.properties	(working copy)
@@ -30,7 +30,7 @@
 org.eclipse.equinox.launcher.gtk.linux.x86.version=1.0.200.v20090520
 org.eclipse.equinox.launcher.gtk.linux.x86_64.version=1.0.200.v20090519
 org.eclipse.equinox.launcher.win32.win32.x86.version=1.0.200.v20090519
-org.eclipse.equinox.launcher.carbon.macosx.version=1.0.200.v20090520-1835
+#org.eclipse.equinox.launcher.carbon.macosx.version=1.0.200.v20090520-1835
 org.eclipse.equinox.launcher.cocoa.macosx.version=1.0.1.R35x_v20090707
 
 # see devstudio-trunk/releng/org.jboss.ide.eclipse.releng/requirements/equinox/build.properties