Index: releng/org.jboss.ide.eclipse.releng/builders/bpel/README.txt
===================================================================
--- releng/org.jboss.ide.eclipse.releng/builders/bpel/README.txt	(revision 5827)
+++ releng/org.jboss.ide.eclipse.releng/builders/bpel/README.txt	(working copy)
@@ -1,2 +1,9 @@
 Moved to separate build job: http://hudson.qa.jboss.com/hudson/job/jbosstools-cbi-bpel/
-See also https://svn.jboss.org/repos/jbosstools/trunk/bpel/releng/
\ No newline at end of file
+See also https://svn.jboss.org/repos/jbosstools/trunk/bpel/releng/
+
+Also available as a separate build job: http://hudson.qa.jboss.com/hudson/job/jbosstools-cbi-bpel/
+See also https://svn.jboss.org/repos/jbosstools/trunk/bpel/releng/
+
+HOWEVER, since [something] depends on BPEL, cannot simply merge BPEL update site into all-in-one update site.
+
+TODO: integrate BPEL into build at an earlier stage
\ No newline at end of file
Index: releng/org.jboss.ide.eclipse.releng/builders/tests/build.properties
===================================================================
--- releng/org.jboss.ide.eclipse.releng/builders/tests/build.properties	(revision 5827)
+++ releng/org.jboss.ide.eclipse.releng/builders/tests/build.properties	(working copy)
@@ -3,6 +3,7 @@
 org.hibernate.eclipse.test.feature,\
 org.jboss.ide.eclipse.as.test.feature,\
 org.jboss.ide.eclipse.archives.test.feature,\
+org.jboss.tools.bpel.tests.feature,\
 org.jboss.tools.birt.test.feature,\
 org.jboss.tools.esb.test.feature,\
 org.jboss.ide.eclipse.freemarker.test.feature,\
@@ -85,7 +86,7 @@
 # test-type@pluginname=testclass
 # test-type@pluginname@configuration=testclass
 
-component@test=portlet,examples,smooks,esb,freemarker,birt,as,archives,hibernate-tools,common,jsf,jst,struts,seam,vpe,ws,drools-ide,jmx,jbpm-convert
+component@test=portlet,examples,smooks,esb,freemarker,birt,as,archives,hibernate-tools,common,jsf,jst,struts,seam,vpe,ws,drools-ide,jmx,jbpm-convert,bpel
 
 #************************************************
 # AS Tests
Index: releng/org.jboss.ide.eclipse.releng/builders/tests/tests.local.map
===================================================================
--- releng/org.jboss.ide.eclipse.releng/builders/tests/tests.local.map	(revision 5829)
+++ releng/org.jboss.ide.eclipse.releng/builders/tests/tests.local.map	(working copy)
@@ -75,9 +75,9 @@
 !*** see also org.jboss.ide.eclipse.releng/builders/drools-ide/drools-ide*.map
 plugin@org.drools.eclipse.test=COPY,%root%,drools-eclipse/org.drools.eclipse.test
 
-# bpel tests - moved to separate build job: http://hudson.qa.jboss.com/hudson/job/jbosstools-cbi-bpel/   
-!*** feature@org.jboss.tools.bpel.tests.feature=COPY,%root%,bpel/features/org.jboss.tools.bpel.tests.feature
-!*** plugin@org.eclipse.tools.bpel.ui.test=COPY,%root%,bpel/tests/org.eclipse.tools.bpel.ui.test
+# bpel tests - moving to separate build job: http://hudson.qa.jboss.com/hudson/job/jbosstools-cbi-bpel/   
+feature@org.jboss.tools.bpel.tests.feature=COPY,%root%,bpel/features/org.jboss.tools.bpel.tests.feature
+plugin@org.eclipse.tools.bpel.ui.test=COPY,%root%,bpel/tests/org.eclipse.tools.bpel.ui.test
 
 # birt tests
 feature@org.jboss.tools.birt.test.feature=COPY,%root%,birt/features/org.jboss.tools.birt.test.feature
Index: releng/org.jboss.ide.eclipse.releng/builders/tests/tests.map
===================================================================
--- releng/org.jboss.ide.eclipse.releng/builders/tests/tests.map	(revision 5829)
+++ releng/org.jboss.ide.eclipse.releng/builders/tests/tests.map	(working copy)
@@ -75,9 +75,9 @@
 !*** see also org.jboss.ide.eclipse.releng/builders/drools-ide/drools-ide*.map
 plugin@org.drools.eclipse.test=SVN,anonymous,,%svnTag%,%svnURL%,,drools-eclipse/org.drools.eclipse.test
 
-# bpel tests - moved to separate build job: http://hudson.qa.jboss.com/hudson/job/jbosstools-cbi-bpel/
-!*** feature@org.jboss.tools.bpel.tests.feature=SVN,anonymous,,%svnTag%,%svnURL%,,bpel/features/org.jboss.tools.bpel.tests.feature
-!*** plugin@org.eclipse.tools.bpel.ui.test=SVN,anonymous,,%svnTag%,%svnURL%,,bpel/tests/org.eclipse.tools.bpel.ui.test
+# bpel tests - moving to separate build job: http://hudson.qa.jboss.com/hudson/job/jbosstools-cbi-bpel/
+feature@org.jboss.tools.bpel.tests.feature=SVN,anonymous,,%svnTag%,%svnURL%,,bpel/features/org.jboss.tools.bpel.tests.feature
+plugin@org.eclipse.tools.bpel.ui.test=SVN,anonymous,,%svnTag%,%svnURL%,,bpel/tests/org.eclipse.tools.bpel.ui.test
 
 #birt tests
 feature@org.jboss.tools.birt.test.feature=SVN,anonymous,,%svnTag%,%svnURL%,,birt/features/org.jboss.tools.birt.test.feature
Index: releng/org.jboss.ide.eclipse.releng/builders/tests/customTargets.xml
===================================================================
--- releng/org.jboss.ide.eclipse.releng/builders/tests/customTargets.xml	(revision 5827)
+++ releng/org.jboss.ide.eclipse.releng/builders/tests/customTargets.xml	(working copy)
@@ -89,6 +89,11 @@
 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}" />
 	</target>
 
+	<target name="assemble.org.jboss.tools.bpel.tests.feature">
+		<property name="archiveName" value="JBossBpelTools-Tests-${versionTag}.zip" />
+		<ant antfile="${assembleScriptName}" dir="${buildDirectory}" />
+	</target>
+
 	<target name="assemble.org.jboss.tools.birt.test.feature">
 		<property name="archiveName" value="JBossBirtTools-Tests-${versionTag}.zip" />
 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}" />
Index: releng/org.jboss.ide.eclipse.releng/builders/tests/build.requires
===================================================================
--- releng/org.jboss.ide.eclipse.releng/builders/tests/build.requires	(revision 5827)
+++ releng/org.jboss.ide.eclipse.releng/builders/tests/build.requires	(working copy)
@@ -1,6 +1,6 @@
 # specific build requirements
 builder.requires=swtbot
-builder.requiredBuilders=profiler,jmx,drools-ide,archives,xulrunner,richfaces,jbpm-convert,freemarker,hibernate-tools,struts,as,seam,maven,examples,esb,ws,birt,portlet,smooks,tptp
+builder.requiredBuilders=profiler,jmx,drools-ide,archives,xulrunner,richfaces,jbpm-convert,freemarker,hibernate-tools,struts,as,bpel,seam,maven,examples,esb,ws,birt,portlet,smooks,tptp
 
 
 # eclipse,webtools,tptp,testng,springide,gef,emf,dtp,birt - these dependencies come during building of builder required builders
Index: releng/org.jboss.ide.eclipse.releng/builders/product/buildResults/buildResults.html
===================================================================
--- releng/org.jboss.ide.eclipse.releng/builders/product/buildResults/buildResults.html	(revision 5827)
+++ releng/org.jboss.ide.eclipse.releng/builders/product/buildResults/buildResults.html	(working copy)
@@ -216,14 +216,14 @@
 		${jmx-file-size} MB</td>
 	</tr>
 	<!-- BPEL-->
-	<!--  <tr>
+	<tr>
 		<td><img src="images/${jbds-bpel-status}-small.png" /></td>
 		<td class="downloadInfo"><a class="allLink-blue"
 			href="bpel/${jbds-bpel-filename}">${jbds-bpel-filename}</a><br />
 		&nbsp;&nbsp;&nbsp;&nbsp;<a class="md5"
 			href="bpel/${jbds-bpel-filename}.MD5">md5</a> | filesize:
 		${bpel-file-size} MB</td>
-	</tr> -->
+	</tr>
 	<tr>
 		<!-- Maven-->
 		<td><img src="images/${jbds-maven-status}-small.png" /></td>
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 5827)
+++ releng/org.jboss.ide.eclipse.releng/builders/product/buildResults/buildResults-internal.html	(working copy)
@@ -291,14 +291,14 @@
 		${jmx-file-size} MB</td>
 	</tr>
 	<!-- BPEL-->
-	<!-- <tr>
+	<tr>
 		<td><img src="images/${jbds-bpel-status}-small.png" /></td>
 		<td class="downloadInfo"><a class="pluginLink"
 			href="bpel/${jbds-bpel-filename}">${jbds-bpel-filename}</a><br />
 		&nbsp;&nbsp;&nbsp;&nbsp;<a class="md5"
 			href="bpel/${jbds-bpel-filename}.MD5">md5</a> | filesize:
 		${bpel-file-size} MB</td>
-	</tr> -->
+	</tr>
 	<tr>
 		<!-- Maven-->
 		<td><img src="images/${jbds-maven-status}-small.png" /></td>
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 5827)
+++ releng/org.jboss.ide.eclipse.releng/builders/product/buildResults/download-template.xml	(working copy)
@@ -13,10 +13,10 @@
  <download os="Mac OS X" url="${jbds-richfaces-macosx-carbon-filename}" size="${richfaces-macosx-carbon-file-size} MB"/>
 </project>
 
-<!--  <project name="BPEL Editor" version="${bpel.versionTag}">
+<project name="BPEL Editor" version="${bpel.versionTag}">
  <description>Business Process Execution Language (BPEL) Editor</description>
  <download os="All platforms" url="${jbds-bpel-filename}" size="${bpel-file-size} MB"/>
-</project> -->
+</project>
 
 <project name="Drools IDE" version="${drools-ide.versionTag}">
  <description>for Drools Rules and Drools Ruleflow</description>
Index: releng/org.jboss.ide.eclipse.releng/builders/product/build.properties
===================================================================
--- releng/org.jboss.ide.eclipse.releng/builders/product/build.properties	(revision 5827)
+++ releng/org.jboss.ide.eclipse.releng/builders/product/build.properties	(working copy)
@@ -10,9 +10,9 @@
 builder.build.path=${product.build.root}/eclipse
 builder.root=${build.root}/builders
 # See also /devstudio-trunk/releng/org.jboss.ide.eclipse.releng/configs/jbds/jbds-build.properties
-#builders=profiler,jmx,drools-ide,archives,xulrunner,richfaces,jbpm-convert,freemarker,hibernate-tools,struts,jbpm,jbpm4,as,seam,maven,examples,esb,ws,birt,portlet,smooks,tptp,tests
+#builders=profiler,jmx,drools-ide,archives,xulrunner,richfaces,jbpm-convert,freemarker,hibernate-tools,struts,jbpm,jbpm4,as,bpel,seam,maven,examples,esb,ws,birt,portlet,smooks,tptp,tests
 # profiler removed 20090828 for M3 release (it's broken, says Max)
-builders=jmx,drools-ide,archives,xulrunner,richfaces,jbpm-convert,freemarker,hibernate-tools,struts,as,seam,cdi,maven,examples,esb,ws,birt,portlet,smooks,tptp,tests
+builders=jmx,drools-ide,archives,xulrunner,richfaces,jbpm-convert,freemarker,hibernate-tools,struts,as,bpel,seam,cdi,maven,examples,esb,ws,birt,portlet,smooks,tptp,tests
 
 update.exclude.tests=yes
 build.results.exclude.tests=yes
Index: releng/org.jboss.ide.eclipse.releng/builders/product/versionTags/jbds/3.0.0.RC1.tags
===================================================================
--- releng/org.jboss.ide.eclipse.releng/builders/product/versionTags/jbds/3.0.0.RC1.tags	(revision 5827)
+++ releng/org.jboss.ide.eclipse.releng/builders/product/versionTags/jbds/3.0.0.RC1.tags	(working copy)
@@ -23,6 +23,7 @@
 drools-ide=5.1.0.trunk
 examples=1.1.0.RC1
 jmx=1.1.0.RC1
+bpel=1.0.0.RC1
 maven=1.0.0.RC1
 xulrunner=1.1.0.GA
 profiler=1.0.0.RC1
@@ -31,7 +32,6 @@
 # moved to external build jobs
 #jbpm=3.2.0.RC1
 #jbpm4=4.0.0.RC1
-#bpel=1.0.0.RC1
 
 # component versions, JBDS
 equinox-transforms=1.0.0.GA
@@ -56,6 +56,7 @@
 examples.svn=trunk
 jbpm-convert.svn=trunk
 jmx.svn=trunk
+bpel.svn=trunk
 maven.svn=trunk
 xulrunner.svn=trunk
 profiler.svn=trunk
@@ -68,4 +69,4 @@
 # moved to external build jobs
 #jbpm.svn=trunk
 #jbpm4.svn=trunk
-#bpel.svn=trunk
+
Index: releng/org.jboss.ide.eclipse.releng/builders/product/versionTags/jbosstools/3.1.0.RC1.tags
===================================================================
--- releng/org.jboss.ide.eclipse.releng/builders/product/versionTags/jbosstools/3.1.0.RC1.tags	(revision 5827)
+++ releng/org.jboss.ide.eclipse.releng/builders/product/versionTags/jbosstools/3.1.0.RC1.tags	(working copy)
@@ -23,6 +23,7 @@
 drools-ide=5.1.0.trunk
 examples=1.1.0.RC1
 jmx=1.1.0.RC1
+bpel=1.0.0.RC1
 maven=1.0.0.RC1
 xulrunner=1.1.0.GA
 profiler=1.0.0.RC1
@@ -31,7 +32,6 @@
 # moved to external build jobs
 #jbpm=3.2.0.RC1
 #jbpm4=4.0.0.RC1
-#bpel=1.0.0.RC1
 
 # component versions, JBDS
 equinox-transforms=1.0.0.GA
@@ -56,6 +56,7 @@
 examples.svn=trunk
 jbpm-convert.svn=trunk
 jmx.svn=trunk
+bpel.svn=trunk
 maven.svn=trunk
 xulrunner.svn=trunk
 profiler.svn=trunk
@@ -68,4 +69,4 @@
 # moved to external build jobs
 #jbpm.svn=trunk
 #jbpm4.svn=trunk
-#bpel.svn=trunk
+
Index: releng/org.jboss.ide.eclipse.releng/configs/jbds/build.properties
===================================================================
--- releng/org.jboss.ide.eclipse.releng/configs/jbds/build.properties	(revision 5827)
+++ releng/org.jboss.ide.eclipse.releng/configs/jbds/build.properties	(working copy)
@@ -10,7 +10,7 @@
 
 #See also /devstudio-trunk/releng/org.jboss.ide.eclipse.releng/builders/product/build.properties
 # [JBDS-604] Smooks should be excluded from JBDS 2
-builders=jmx,drools-ide,archives,xulrunner,richfaces,jbpm-convert,freemarker,hibernate-tools,struts,as,seam,maven,examples,esb,ws,birt,portlet,smooks,tptp,runtime,tests
+builders=jmx,drools-ide,archives,xulrunner,richfaces,jbpm-convert,freemarker,hibernate-tools,struts,as,bpel,seam,maven,examples,esb,ws,birt,portlet,smooks,tptp,runtime,tests
 
 # new for M4 - can link output of jbt/jbds builds and other child builds; csv list of zips will be added into the update site.
 third.party.zips=http://hudson.qa.jboss.com/hudson/view/DevStudio/job/jbosstools-cbi-pi4soa/lastStableBuild/artifact/build/N-SNAPSHOT/pi4soa-Update-N-SNAPSHOT.zip