Index: releng/org.jboss.ide.eclipse.releng/requirements/jbpm3/buildRequirement.xml
===================================================================
--- releng/org.jboss.ide.eclipse.releng/requirements/jbpm3/buildRequirement.xml	(revision 6707)
+++ releng/org.jboss.ide.eclipse.releng/requirements/jbpm3/buildRequirement.xml	(working copy)
@@ -1,28 +0,0 @@
-<project default="build.requirement">
-
-	<import file="../generic/build.xml"  />
-	
-	<target name="unzip.archive" depends="download.archive,clean" >
-		<p2.repo2runnable>
-			<repository location="${driver.dest}/repo/eclipse" />
-			<source>
-				<repository location="${driver.dest}/${build.archive}" />
-			</source>
-		</p2.repo2runnable>
-		<!-- it creates zip instead of just copying it beacuse installer needs 
-		     reference to zip file -->
-		<zip destfile="${driver.dest}/${build.archive.runnable}">
-			<zipfileset dir="${driver.dest}/repo/eclipse" prefix="eclipse">
-				<exclude name="*.jar"/>
-			</zipfileset>
-		</zip>
-		<unzip src="${driver.dest}/${build.archive.runnable}" dest="${unzip.dest}" />
-	</target>
-
-	<target name="clean" >
-		<delete failonerror="no">
-			<fileset dir="${driver.dest}/repo"/>
-			<fileset dir="${driver.dest}/${build.archive.runnable}"/>
-		</delete>
-	</target>
-</project>
\ No newline at end of file
Index: releng/org.jboss.ide.eclipse.releng/requirements/jbpm3/build.properties
===================================================================
--- releng/org.jboss.ide.eclipse.releng/requirements/jbpm3/build.properties	(revision 6707)
+++ releng/org.jboss.ide.eclipse.releng/requirements/jbpm3/build.properties	(working copy)
@@ -1,8 +0,0 @@
-#http://www.eclipse.org/downloads/download.php?file=/birt/downloads/drops/S-R1-2_5_0-S20090617-200906170630/birt-report-framework-2_5_0-S20090617.zip&r=1
-#http://www.eclipse.org/downloads/download.php?file=/birt/downloads/drops/S-R1-2_5_0-S20090617-200906170630/birt-wtp-integration-sdk-2_5_0-S20090617.zip&r=1
-jbpm3.build.uri=http://hudson.qa.jboss.com/hudson/view/DevStudio_CBI/job/jbosstools-cbi-jbpm3/lastStableBuild/artifact/build/N-SNAPSHOT
-build.uri=${jbpm3.build.uri}
-build.archive=jbpm3-Update-N-SNAPSHOT.zip
-build.archive.runnable=jbpm3-N-SNAPSHOT.zip
-#this property is required to trigger failure to verify checksun and thus jbpm3 will be downloaded in each build
-md5=
\ No newline at end of file
Index: releng/org.jboss.ide.eclipse.releng/requirements/aggregateRepos/buildRequirement.xml
===================================================================
--- releng/org.jboss.ide.eclipse.releng/requirements/aggregateRepos/buildRequirement.xml	(revision 6680)
+++ releng/org.jboss.ide.eclipse.releng/requirements/aggregateRepos/buildRequirement.xml	(working copy)
@@ -1,28 +1,53 @@
 <project default="build.requirement">
 
-	<import file="../generic/build.xml"  />
-	
-	<target name="unzip.archive" depends="download.archive,clean" >
-		<p2.repo2runnable>
-			<repository location="${driver.dest}/repo/eclipse" />
-			<source>
-				<repository location="${driver.dest}/${build.archive}" />
-			</source>
-		</p2.repo2runnable>
-		<!-- it creates zip instead of just copying it beacuse installer needs 
-		     reference to zip file -->
-		<zip destfile="${driver.dest}/${build.archive.runnable}">
-			<zipfileset dir="${driver.dest}/repo/eclipse" prefix="eclipse">
-				<exclude name="*.jar"/>
-			</zipfileset>
-		</zip>
-		<unzip src="${driver.dest}/${build.archive.runnable}" dest="${unzip.dest}" />
+	<import file="../generic/build.xml" />
+
+	<target name="download.archive">
+		<mkdir dir="${driver.dest}" />
+		<for list="${reposToAggregate}" param="repoToAggregate">
+			<sequential>
+				<echo>Get repo @{repoToAggregate}</echo>
+				<get taskname="download ${requirement}"
+				     src="${@{repoToAggregate}.uri}/${@{repoToAggregate}.archive}"
+				     dest="${driver.dest}/${@{repoToAggregate}.archive}" />
+			</sequential>
+		</for>
+		<antcall target="post.download.requirement" />
+	</target>
+
+	<target name="unzip.archive" depends="download.archive,clean">
+
+		<for list="${reposToAggregate}" param="repoToAggregate">
+			<sequential>
+				<echo>Repo2runnable for repo @{repoToAggregate}</echo>
+				<p2.repo2runnable>
+					<repository location="${driver.dest}/repo/eclipse" />
+					<source>
+						<repository location="${driver.dest}/${@{repoToAggregate}.archive}" />
+					</source>
+				</p2.repo2runnable>
+				<!-- Creates zip instead of just unpacking/copying because installer needs 
+		     reference to a runnable zip file -->
+				<zip destfile="${driver.dest}/${@{repoToAggregate}.archive.runnable}">
+					<zipfileset dir="${driver.dest}/repo/eclipse" prefix="eclipse">
+						<exclude name="*.jar" />
+					</zipfileset>
+				</zip>
+				<unzip src="${driver.dest}/${@{repoToAggregate}.archive.runnable}" dest="${unzip.dest}" />
+			</sequential>
+		</for>
 	</target>
 
-	<target name="clean" >
+	<target name="clean">
 		<delete failonerror="no">
-			<fileset dir="${driver.dest}/repo"/>
-			<fileset dir="${driver.dest}/${build.archive.runnable}"/>
+			<fileset dir="${driver.dest}/repo" />
 		</delete>
+		<for list="${reposToAggregate}" param="repoToAggregate">
+			<sequential>
+				<delete failonerror="no">
+					<fileset dir="${driver.dest}/${@{repoToAggregate}.archive.runnable}" />
+				</delete>
+			</sequential>
+		</for>
 	</target>
 </project>
\ No newline at end of file
Index: releng/org.jboss.ide.eclipse.releng/requirements/aggregateRepos/build.properties
===================================================================
--- releng/org.jboss.ide.eclipse.releng/requirements/aggregateRepos/build.properties	(revision 6680)
+++ releng/org.jboss.ide.eclipse.releng/requirements/aggregateRepos/build.properties	(working copy)
@@ -1,8 +1,16 @@
-#http://www.eclipse.org/downloads/download.php?file=/birt/downloads/drops/S-R1-2_5_0-S20090617-200906170630/birt-report-framework-2_5_0-S20090617.zip&r=1
-#http://www.eclipse.org/downloads/download.php?file=/birt/downloads/drops/S-R1-2_5_0-S20090617-200906170630/birt-wtp-integration-sdk-2_5_0-S20090617.zip&r=1
-jbpm3.build.uri=http://hudson.qa.jboss.com/hudson/view/DevStudio_CBI/job/jbosstools-cbi-jbpm3/lastStableBuild/artifact/build/N-SNAPSHOT
-build.uri=${jbpm3.build.uri}
-build.archive=jbpm3-Update-N-SNAPSHOT.zip
-build.archive.runnable=jbpm3-N-SNAPSHOT.zip
-#this property is required to trigger failure to verify checksun and thus jbpm3 will be downloaded in each build
-md5=
\ No newline at end of file
+reposToAggregate=jbpm3,drools,teiid
+
+jbpm3.uri=http://download.jboss.org/jbosstools/updates/JBossTools-JBPM/
+jbpm3.archive=jbosstools-jbpm-Update-3.2.0.M2.zip
+jbpm3.archive.runnable=jbosstools-jbpm-Runnable-3.2.0.M2.zip
+
+drools.uri=http://download.jboss.org/jbosstools/updates/JBossTools-Drools/
+drools.archive=jbosstools-drools-Update-5.1.zip
+drools.archive.runnable=jbosstools-drools-Runnable-5.1.zip
+
+teiid.uri=http://download.jboss.org/jbosstools/updates/JBossTools-TeiidDesigner/
+teiid.archive=jbosstools-teiid-designer-Update-7.1.zip
+teiid.archive.runnable=jbosstools-teiid-designer-Runnable-7.1.zip
+
+# forces a fresh download each time; set blank for SNAPSHOT URLs, or omit for release URLs
+#md5=
Index: releng/org.jboss.ide.eclipse.releng/builders/runtime/build.requires
===================================================================
--- releng/org.jboss.ide.eclipse.releng/builders/runtime/build.requires	(revision 6707)
+++ releng/org.jboss.ide.eclipse.releng/builders/runtime/build.requires	(working copy)
@@ -1,3 +1,3 @@
 # changed to allow jbpm to be injected in binary form rather than built from sources
-builder.requires=eclipse,emf,xsd,gef,dtp,webtools,jbpm3
+builder.requires=eclipse,emf,xsd,gef,dtp,webtools,aggregatedUpdates
 builder.requiredBuilders=as,seam,drools-ide
Index: releng/org.jboss.ide.eclipse.releng/builders/product/build.requires
===================================================================
--- releng/org.jboss.ide.eclipse.releng/builders/product/build.requires	(revision 6707)
+++ releng/org.jboss.ide.eclipse.releng/builders/product/build.requires	(working copy)
@@ -9,4 +9,4 @@
 equinox,\
 webtools,dtp,gef,emf,xsd,rse,\
 seamfp,jbeap-5.0.0,\
-springide,testng,jbpm3
\ No newline at end of file
+springide,testng,aggregateRepos
\ No newline at end of file
Index: releng/org.jboss.ide.eclipse.releng/builders/product/buildInstaller.xml
===================================================================
--- releng/org.jboss.ide.eclipse.releng/builders/product/buildInstaller.xml	(revision 6707)
+++ releng/org.jboss.ide.eclipse.releng/builders/product/buildInstaller.xml	(working copy)
@@ -31,67 +31,35 @@
 			<else>
 				<echo message="Fetch ${installer.svn.url} to ${product.build.directory}/installer" />
 				<svn username="${installer.svn.username}" password="${installer.svn.password}">
-					<export srcurl="${installer.svn.url}"
-					        destPath="${product.build.directory}/installer"
-					        force="true" />
+					<export srcurl="${installer.svn.url}" destPath="${product.build.directory}/installer" force="true" />
 				</svn>
 			</else>
 		</if>
 
-		<load.property file="${requirement.root}/emf/build.properties"
-		               property="build.archive"
-		               dest="emf.build.archive" />
-		<load.property file="${requirement.root}/xsd/build.properties"
-		               property="build.archive"
-		               dest="xsd.build.archive" />
-		<load.property file="${requirement.root}/gef/build.properties"
-		               property="build.archive"
-		               dest="gef.build.archive" />
-		<load.property file="${requirement.root}/gef/build.properties"
-		               property="build.archive.zest"
-		               dest="gef.build.archive.zest" />
-		<load.property file="${requirement.root}/dtp/build.properties"
-		               property="build.archive"
-		               dest="dtp.build.archive" />
-		<load.property file="${requirement.root}/rse/build.properties"
-		               property="build.archive"
-		               dest="rse.build.archive" />
-		<load.property file="${requirement.root}/webtools/build.properties"
-		               property="build.archive"
-		               dest="webtools.build.runtime.archive" />
+		<load.property file="${requirement.root}/emf/build.properties" property="build.archive" dest="emf.build.archive" />
+		<load.property file="${requirement.root}/xsd/build.properties" property="build.archive" dest="xsd.build.archive" />
+		<load.property file="${requirement.root}/gef/build.properties" property="build.archive" dest="gef.build.archive" />
+		<load.property file="${requirement.root}/gef/build.properties" property="build.archive.zest" dest="gef.build.archive.zest" />
+		<load.property file="${requirement.root}/dtp/build.properties" property="build.archive" dest="dtp.build.archive" />
+		<load.property file="${requirement.root}/rse/build.properties" property="build.archive" dest="rse.build.archive" />
+		<load.property file="${requirement.root}/webtools/build.properties" property="build.archive" dest="webtools.build.runtime.archive" />
 		<!-- JBDS-1207 :: obsolete by WTP3.2 -->
 		<!-- <load.property file="${requirement.root}/webtools/build.properties"    property="patch.archive.webtools"      dest="webtools.patch.runtime.archive" /> -->
-		<load.property file="${requirement.root}/swtpatch/build.properties"
-		               property="build.archive"
-		               dest="swtpatch.archive" />
-		<load.property file="${requirement.root}/equinox/build.properties"
-		               property="equinox-transforms-xslt-jar"
-		               dest="equinox.transforms.xslt.archive" />
-		<load.property file="${requirement.root}/equinox/build.properties"
-		               property="equinox-transforms-hook-jar"
-		               dest="equinox.transforms.hook.archive" />
-		<load.property file="${requirement.root}/eclipse/build.properties"
-		               property="eclipseBuildID"
-		               dest="eclipseBuildID" />
-		<load.property file="${requirement.root}/jbeap-5.0.0/build.properties"
-		               property="build.archive"
-		               dest="jbeap50.archive" />
+		<load.property file="${requirement.root}/swtpatch/build.properties" property="build.archive" dest="swtpatch.archive" />
+		<load.property file="${requirement.root}/equinox/build.properties" property="equinox-transforms-xslt-jar" dest="equinox.transforms.xslt.archive" />
+		<load.property file="${requirement.root}/equinox/build.properties" property="equinox-transforms-hook-jar" dest="equinox.transforms.hook.archive" />
+		<load.property file="${requirement.root}/eclipse/build.properties" property="eclipseBuildID" dest="eclipseBuildID" />
+		<load.property file="${requirement.root}/jbeap-5.0.0/build.properties" property="build.archive" dest="jbeap50.archive" />
 		<!-- DISABLED - probably not needed for EAP 5.1.0 <load.property file="${requirement.root}/jbeap-5.0.0/build.properties" property="build.archive.patch"         dest="jbeap50.archive.patch"/> -->
-		<load.property file="${requirement.root}/seamfp/build.properties"
-		               property="build.archive"
-		               dest="seamfp.archive" />
-		<load.property file="${requirement.root}/seamfp/build.properties"
-		               property="build.archive.patch"
-		               dest="seamfp.archive.patch" />
-		<load.property file="${requirement.root}/springide/build.properties"
-		               property="build.archive"
-		               dest="springide.archive" />
-		<load.property file="${requirement.root}/testng/build.properties"
-		               property="build.archive"
-		               dest="testng.archive" />
-		<load.property file="${requirement.root}/jbpm3/build.properties"
-		               property="build.archive.runnable"
-		               dest="jbpm3.archive" />
+		<load.property file="${requirement.root}/seamfp/build.properties" property="build.archive" dest="seamfp.archive" />
+		<load.property file="${requirement.root}/seamfp/build.properties" property="build.archive.patch" dest="seamfp.archive.patch" />
+		<load.property file="${requirement.root}/springide/build.properties" property="build.archive" dest="springide.archive" />
+		<load.property file="${requirement.root}/testng/build.properties" property="build.archive" dest="testng.archive" />
+
+		<!-- aggregated artifacts from jbpm, teiid, drools. See ../common/aggregateRepos.jbds.properties -->
+		<load.property file="${requirement.root}/aggregateRepos/build.properties" property="jbpm3.archive" dest="jbpm3.archive" />
+		<load.property file="${requirement.root}/aggregateRepos/build.properties" property="drools.archive" dest="drools.archive" />
+		<load.property file="${requirement.root}/aggregateRepos/build.properties" property="teiid.archive" dest="teiid.archive" />
 
 		<!-- JBDS-857: TODO: only one installer (would need to build w/ 4 platform runtime binaries, plus features/plugins for SDK) -->
 		<!-- not yet working; will experiment in workspace/nboldt/ instead of trunk/ -->
@@ -125,20 +93,14 @@
 		</condition>
 
 		<delete failonerror="false" includeemptydirs="true">
-			<fileset dir="${product.build.directory}/installer/build/distribution"
-			         includes="**/*"
-			         defaultexcludes="off" />
+			<fileset dir="${product.build.directory}/installer/build/distribution" includes="**/*" defaultexcludes="off" />
 		</delete>
 
 		<ant antfile="build.xml" dir="${product.build.directory}/installer">
-			<property name="artifacts.eclipse"
-			          location="${requirement.build.root}/eclipse/eclipse-SDK-${eclipseBuildID}-${platform}.${archive-extension}" />
-			<property name="artifacts.equinox.transforms.xslt"
-			          location="${requirement.build.root}/equinox/${equinox.transforms.xslt.archive}" />
-			<property name="artifacts.equinox.transforms.hook"
-			          location="${requirement.build.root}/equinox/${equinox.transforms.hook.archive}" />
-			<property name="artifacts.wtp"
-			          location="${requirement.build.root}/webtools/${webtools.build.runtime.archive}" />
+			<property name="artifacts.eclipse" location="${requirement.build.root}/eclipse/eclipse-SDK-${eclipseBuildID}-${platform}.${archive-extension}" />
+			<property name="artifacts.equinox.transforms.xslt" location="${requirement.build.root}/equinox/${equinox.transforms.xslt.archive}" />
+			<property name="artifacts.equinox.transforms.hook" location="${requirement.build.root}/equinox/${equinox.transforms.hook.archive}" />
+			<property name="artifacts.wtp" location="${requirement.build.root}/webtools/${webtools.build.runtime.archive}" />
 			<!-- JBDS-1207 :: obsolete by WTP3.2 -->
 			<!-- <property name="artifacts.wtp.patch"               location="${requirement.build.root}/webtools/${webtools.patch.runtime.archive}" /> -->
 			<property name="artifacts.dtp" location="${requirement.build.root}/dtp/${dtp.build.archive}" />
@@ -149,16 +111,18 @@
 			<property name="artifacts.xsd" location="${requirement.build.root}/xsd/${xsd.build.archive}" />
 			<!-- not yet working; will experiment in workspace/nboldt/ instead of trunk/ -->
 			<!-- JBDS-857: use ${product.name}-Update-${product.versionTag}.zip instead of ${product.name}-ALL-${platform}-${product.versionTag}.zip -->
-			<property name="artifacts.jbds"
-			          location="${product.build.directory}/all/${product.name}-ALL-${platform}-${product.versionTag}.zip" />
+			<property name="artifacts.jbds" location="${product.build.directory}/all/${product.name}-ALL-${platform}-${product.versionTag}.zip" />
 			<property name="artifacts.jbosseap" location="${requirement.build.root}/jbeap-5.0.0/${jbeap50.archive}" />
 			<!-- OBSOLETED by JBEAP 5.1  <property name="artifacts.jbosseap.patch"         location="${requirement.build.root}/jbeap-5.0.0/${jbeap50.archive.patch}" /> -->
 			<property name="artifacts.springide" location="${requirement.build.root}/springide/${springide.archive}" />
 			<property name="artifacts.testng" location="${requirement.build.root}/testng/${testng.archive}" />
 			<property name="artifacts.seamfp" location="${requirement.build.root}/seamfp/${seamfp.archive}" />
-			<property name="artifacts.seamfp.patch"
-			          location="${requirement.build.root}/seamfp/${seamfp.archive.patch}" />
-			<property name="artifacts.jbpm3" location="${requirement.build.root}/jbpm3/${jbpm3.archive}" />
+			<property name="artifacts.seamfp.patch" location="${requirement.build.root}/seamfp/${seamfp.archive.patch}" />
+
+			<!-- aggregated artifacts from jbpm, teiid, drools. See ../common/aggregateRepos.jbds.properties -->
+			<property name="artifacts.jbpm3" location="${requirement.build.root}/aggregateRepos/${jbpm3.archive}" />
+			<property name="artifacts.drools" location="${requirement.build.root}/aggregateRepos/${drools.archive}" />
+			<property name="artifacts.teiid" location="${requirement.build.root}/aggregateRepos/${teiid.archive}" />
 
 			<property name="destination.dir" value="${product.build.directory}/installer" />
 			<property name="platform.name" value="${platform}" />
Index: releng/org.jboss.ide.eclipse.releng/builders/product/buildSite.xml
===================================================================
--- releng/org.jboss.ide.eclipse.releng/builders/product/buildSite.xml	(revision 6707)
+++ releng/org.jboss.ide.eclipse.releng/builders/product/buildSite.xml	(working copy)
@@ -457,7 +457,7 @@
 						<echo>Use b3aggr to mix in jbpm3/4, pi4soa, bpel into ${release.product}'s ${updateZip}</echo>
 					</then>
 					<else>
-						<echo>Use b3aggr to mix in jbpm3 into ${release.product}'s ${updateZip}</echo>
+						<echo>Use b3aggr to mix in jbpm3, drools, teiid into ${release.product}'s ${updateZip}</echo>
 					</else>
 				</if>
 				<!-- https://jira.jboss.org/jira/browse/JBIDE-4703 -->
Index: devstudio-installer/build.xml
===================================================================
--- devstudio-installer/build.xml	(revision 6707)
+++ devstudio-installer/build.xml	(working copy)
@@ -92,9 +92,7 @@
 
 		<mkdir dir="${build.installer.dir}/bin/panels" />
 
-		<jar destfile="${build.installer.dir}/bin/panels/CreateLinkPanel.jar"
-		     basedir="${build.dir}/classes"
-		     includes="**/CreateLinkPanel.class" />
+		<jar destfile="${build.installer.dir}/bin/panels/CreateLinkPanel.jar" basedir="${build.dir}/classes" includes="**/CreateLinkPanel.class" />
 
 		<jar destfile="${build.installer.dir}/bin/panels/JBossAsSelectPanel.jar">
 			<fileset dir="${build.dir}/classes">
@@ -109,13 +107,9 @@
 			</fileset>
 		</jar>
 
-		<jar destfile="${build.installer.dir}/bin/panels/UpdatePacksPanel.jar"
-		     basedir="${build.dir}/classes"
-		     includes="**/UpdatePacksPanel.class" />
+		<jar destfile="${build.installer.dir}/bin/panels/UpdatePacksPanel.jar" basedir="${build.dir}/classes" includes="**/UpdatePacksPanel.class" />
 
-		<jar destfile="${build.installer.dir}/bin/panels/DiskSpaceCheckPanel.jar"
-		     basedir="${build.dir}/classes"
-		     includes="**/DiskSpaceCheckPanel.class" />
+		<jar destfile="${build.installer.dir}/bin/panels/DiskSpaceCheckPanel.jar" basedir="${build.dir}/classes" includes="**/DiskSpaceCheckPanel.class" />
 
 		<jar destfile="${build.installer.dir}/bin/panels/JREPathPanel.jar">
 			<fileset dir="${build.dir}/classes">
@@ -163,8 +157,7 @@
 		          location="${artifacts.dir}/requirements/equinox/org.eclipse.equinox.transforms.xslt_${org.eclipse.equinox.transforms.xslt.version}.jar" />
 		<property name="artifacts.equinox.transforms.hook"
 		          location="${artifacts.dir}/requirements/equinox/org.eclipse.equinox.transforms.hook_${org.eclipse.equinox.transforms.hook.version}.jar" />
-		<property name="artifacts.wtp"
-		          location="${artifacts.dir}/requirements/webtools/wtp-R-3.1.2-20100211202452.zip" />
+		<property name="artifacts.wtp" location="${artifacts.dir}/requirements/webtools/wtp-R-3.1.2-20100211202452.zip" />
 		<!-- JBDS-1207 :: obsolete by WTP3.2 -->
 		<!-- <property name="artifacts.wtp.patch" location="${artifacts.dir}/requirements/webtools/wtp-patches312-P-3.1.2-20100423061036.zip" /> -->
 		<property name="artifacts.dtp" location="${artifacts.dir}/requirements/dtp/dtp-sdk_1.5.2.zip" />
@@ -173,16 +166,14 @@
 		<property name="artifacts.gef.zest" location="${artifacts.dir}/requirements/gef/GEF-zest-3.5.1.zip" />
 		<property name="artifacts.emf" location="${artifacts.dir}/requirements/emf/emf-runtime-2.4.0M7.zip" />
 		<property name="artifacts.xsd" location="${artifacts.dir}/requirements/xsd/xsd-runtime-2.4.0M7.zip" />
-		<property name="artifacts.jbds"
-		          location="${artifacts.dir}/200704181631-nightly/all/RedHatDevStudio-200704181631-nightly-ALL-linux-gtk.zip" />
+		<property name="artifacts.jbds" location="${artifacts.dir}/200704181631-nightly/all/RedHatDevStudio-200704181631-nightly-ALL-linux-gtk.zip" />
 		<property name="artifacts.jbosseap" location="${artifacts.dir}/jboss-eap-noauth-5.0.1.GA.zip" />
 		<!-- OBSOLETED by JBEAP 5.1 <property name="artifacts.jbosseap.patch" location="${artifacts.dir}/jboss-eap-5.0_JBPAPP-4385.zip" /> -->
 		<property name="artifacts.seamfp" location="${artifacts.dir}/jboss-eap-fp-4.3.0.FP.zip" />
 		<property name="artifacts.seamfp.patch" location="${artifacts.dir}/jbds-seamfp-patch.zip" />
 		<property name="artifacts.springide" location="${artifacts.dir}/springide_updatesite_1.3.6.zip" />
 		<property name="artifacts.testng" location="${artifacts.dir}/testng-eclipse-5.6.0.0.zip" />
-		<property name="artifacts.swtpatch"
-		          location="${artifacts.dir}/org.eclipse.swt.gtk.linux.x86.3.3.2-207206patch.zip" />
+		<property name="artifacts.swtpatch" location="${artifacts.dir}/org.eclipse.swt.gtk.linux.x86.3.3.2-207206patch.zip" />
 
 		<mkdir dir="${distribution.dir}" />
 	</target>
@@ -230,12 +221,8 @@
 		<unzip dest="${distribution.dir}" src="${artifacts.wtp}" overwrite="false" />
 		<!-- JBDS-1207 :: obsolete by WTP3.2 -->
 		<!-- <unzip dest="${distribution.dir}/eclipse" src="${artifacts.wtp.patch}" overwrite="true" /> -->
-		<copy todir="${distribution.dir}/eclipse/plugins"
-		      file="${artifacts.equinox.transforms.xslt}"
-		      overwrite="true" />
-		<copy todir="${distribution.dir}/eclipse/plugins"
-		      file="${artifacts.equinox.transforms.hook}"
-		      overwrite="true" />
+		<copy todir="${distribution.dir}/eclipse/plugins" file="${artifacts.equinox.transforms.xslt}" overwrite="true" />
+		<copy todir="${distribution.dir}/eclipse/plugins" file="${artifacts.equinox.transforms.hook}" overwrite="true" />
 	</target>
 
 	<target name="prepare-jbosseap" depends="prepare-distribution-properties" unless="test.build">
@@ -268,6 +255,8 @@
 			/>
 		</antcall>-->
 		<unzip dest="${distribution.dir}/studio" src="${artifacts.jbpm3}" overwrite="true" />
+		<unzip dest="${distribution.dir}/studio" src="${artifacts.drools}" overwrite="true" />
+		<unzip dest="${distribution.dir}/studio" src="${artifacts.teiid}" overwrite="true" />
 	</target>
 
 	<target name="find.feature.groups">
@@ -303,12 +292,7 @@
 			</sequential>
 		</for>
 		<!-- trim prefix "," -->
-		<propertyregex property="install"
-		               input="${install}"
-		               defaultvalue="${install}"
-		               regexp=",(.+)"
-		               replace="\1"
-		               override="true" />
+		<propertyregex property="install" input="${install}" defaultvalue="${install}" regexp=",(.+)" replace="\1" override="true" />
 		<delete dir="${temp.dir}" />
 	</target>
 
@@ -328,11 +312,7 @@
 
 		<mkdir dir="${p2.director.install.path}" />
 		<chmod perm="ugo+rwx" file="${p2.director.exec.path}/eclipse" />
-		<exec executable="${p2.director.exec.path}/eclipse"
-		      failonerror="true"
-		      dir="${p2.director.exec.path}"
-		      timeout="900000"
-		      taskname="p2.dir">
+		<exec executable="${p2.director.exec.path}/eclipse" failonerror="true" dir="${p2.director.exec.path}" timeout="900000" taskname="p2.dir">
 			<!-- <arg line=" -vm ${java.home}/bin/java" /> -->
 			<!-- deprecated application for Eclipse 3.4: org.eclipse.equinox.p2.director.app.application -->
 			<arg line=" -application org.eclipse.equinox.p2.director" />
@@ -391,9 +371,7 @@
 				<echo file="${distribution.dir}/eclipse/eclipse.ini" append="true">-Dosgi.bundles=${osgi.bundles},org.eclipse.equinox.transforms.xslt@1:start,org.jboss.tools.equinox.transforms.xslt@1:start
 </echo>
 				<!-- JBDS-533 remove -clean from replace="" per Snjeza -->
-				<replaceregexp file="${distribution.dir}/eclipse/eclipse.ini"
-				               match="\-showsplash[\n\r]*org.eclipse.platform[\n\r]"
-				               replace="" />
+				<replaceregexp file="${distribution.dir}/eclipse/eclipse.ini" match="\-showsplash[\n\r]*org.eclipse.platform[\n\r]" replace="" />
 				<replaceregexp file="${distribution.dir}/eclipse/eclipse.ini" match="\-Xms40m" replace="-Xms256m" />
 				<replaceregexp file="${distribution.dir}/eclipse/eclipse.ini" match="\-Xmx256m" replace="-Xmx1024m" />
 			</then>
@@ -407,12 +385,8 @@
 				<replaceregexp file="${distribution.dir}/eclipse/Eclipse.app/Contents/MacOS/eclipse.ini"
 				               match="\-showsplash[\n\r]*org.eclipse.platform[\n\r]"
 				               replace="" />
-				<replaceregexp file="${distribution.dir}/eclipse/Eclipse.app/Contents/MacOS/eclipse.ini"
-				               match="\-Xms40m"
-				               replace="-Xms256m" />
-				<replaceregexp file="${distribution.dir}/eclipse/Eclipse.app/Contents/MacOS/eclipse.ini"
-				               match="\-Xmx256m"
-				               replace="-Xmx1024m" />
+				<replaceregexp file="${distribution.dir}/eclipse/Eclipse.app/Contents/MacOS/eclipse.ini" match="\-Xms40m" replace="-Xms256m" />
+				<replaceregexp file="${distribution.dir}/eclipse/Eclipse.app/Contents/MacOS/eclipse.ini" match="\-Xmx256m" replace="-Xmx1024m" />
 			</then>
 		</if>
 
@@ -432,11 +406,7 @@
 				</fileset>
 			</path>
 			<sequential>
-				<propertyregex property="transforms.hook"
-				               input="@{file}"
-				               replace=""
-				               regexp="${distribution.dir}/eclipse/plugins/"
-				               override="true" />
+				<propertyregex property="transforms.hook" input="@{file}" replace="" regexp="${distribution.dir}/eclipse/plugins/" override="true" />
 				<echo>${transforms.hook}</echo>
 			</sequential>
 		</for>
@@ -465,8 +435,7 @@
 		               regexp="([0-9]+)\.([0-9]+)\.([0-9]+)\.([^\.\-]+)"
 		               replace="\1.\2.\3.${product.buildQualifier}${product.buildQualifierSuffix}-\4"
 		               override="true" />
-		<echo file="${distribution.dir}/eclipse/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info"
-		      append="true">org.eclipse.equinox.transforms.hook,${org.eclipse.equinox.transforms.hook.version},file:plugins/org.eclipse.equinox.transforms.hook_${org.eclipse.equinox.transforms.hook.version}.jar,4,false
+		<echo file="${distribution.dir}/eclipse/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info" append="true">org.eclipse.equinox.transforms.hook,${org.eclipse.equinox.transforms.hook.version},file:plugins/org.eclipse.equinox.transforms.hook_${org.eclipse.equinox.transforms.hook.version}.jar,4,false
 org.eclipse.equinox.transforms.xslt,${org.eclipse.equinox.transforms.xslt.version},file:plugins/org.eclipse.equinox.transforms.xslt_${org.eclipse.equinox.transforms.xslt.version}.jar,1,true
 org.jboss.tools.equinox.transforms.xslt,${versionTags.richfaces.qualified},file:plugins/org.jboss.tools.equinox.transforms.xslt_${versionTags.richfaces.qualified}.jar,1,true
 com.jboss.jbds.product,${versionTags.richfaces.qualified},file:plugins/com.jboss.jbds.product_${versionTags.richfaces.qualified}.jar,4,false
@@ -516,9 +485,7 @@
 	        depends="prepare-distribution-properties, prepare-eclipse, prepare-jbosseap, prepare-jbds, prepare-springide, prepare-testng, prepare-branding, prepare-transforms, remove-optional"
 	        description="Copies the needed files into the distribution dir as needed by install.xml">
 
-		<condition property="nightly_build_qualifier"
-		           value=""
-		           else="-${product.buildQualifier}${product.buildQualifierSuffix}">
+		<condition property="nightly_build_qualifier" value="" else="-${product.buildQualifier}${product.buildQualifierSuffix}">
 			<or>
 				<equals arg1="${product.buildType}" arg2="R" />
 				<equals arg1="${product.buildType}" arg2="M" />
@@ -569,8 +536,7 @@
 	</target>
 
 	<target name="installer-test">
-		<property name="artifacts.eclipse"
-		          location="/home/eskimo/jbosstools-jbdevstudio-REQUIREMENTS/eclipse/eclipse-SDK-3.5.1-linux-gtk.tar.gz" />
+		<property name="artifacts.eclipse" location="/home/eskimo/jbosstools-jbdevstudio-REQUIREMENTS/eclipse/eclipse-SDK-3.5.1-linux-gtk.tar.gz" />
 		<property name="test.build" value="yes" />
 		<property name="destination.dir" value="build" />
 		<delete dir="${distribution.dir}" />
@@ -657,9 +623,7 @@
 	<target name="check.inhibit.downloads">
 		<condition property="inhibit.downloads">
 			<or>
-				<uptodate property="dependencies.current"
-				          srcfile="build-thirdparty.xml"
-				          targetfile="../thirdparty/libraries.ent" />
+				<uptodate property="dependencies.current" srcfile="build-thirdparty.xml" targetfile="../thirdparty/libraries.ent" />
 				<istrue value="${nodownload}" />
 			</or>
 		</condition>
@@ -703,10 +667,7 @@
 	<!-- set proxy settings using auth -->
 	<target name="set.proxy.auth" if="hasproxyauth" depends="check.proxy">
 		<echo>Auth Proxy is set to ${proxy.host}:${proxy.port} username=[${proxy.username}]</echo>
-		<setproxy proxyhost="${proxy.host}"
-		          proxyport="${proxy.port}"
-		          proxyuser="${proxy.username}"
-		          proxypassword="${proxy.password}" />
+		<setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" proxyuser="${proxy.username}" proxypassword="${proxy.password}" />
 	</target>
 
 	<target name="clean">