[136103] Add JSF Tools Project distribution to the WTP build
diff --git a/releng.wtpbuilder/components/jsf.tests/customTargets.xml b/releng.wtpbuilder/components/jsf.tests/customTargets.xml
index 3b17759..0027721 100644
--- a/releng.wtpbuilder/components/jsf.tests/customTargets.xml
+++ b/releng.wtpbuilder/components/jsf.tests/customTargets.xml
@@ -83,7 +83,7 @@
     <echo message="component.dir: ${component.dir}" />
 
     <ant antfile="${component.dir}/dependency.xml" target="get">
-        <property name="dependency.properties" value="${buildDirectory}/maps/releng-jsf/maps/dependencies.properties" />
+        <property name="dependency.properties" value="${buildDirectory}/maps/releng/maps/dependencies.properties" />
         <property name="base.install.dir" value="${buildRoot}" />
     </ant>
     <!--fetch the additional pieces to build JSF tests -->
diff --git a/releng.wtpbuilder/components/jsf/customTargets.xml b/releng.wtpbuilder/components/jsf/customTargets.xml
index 5f0ffcc..3148be0 100644
--- a/releng.wtpbuilder/components/jsf/customTargets.xml
+++ b/releng.wtpbuilder/components/jsf/customTargets.xml
@@ -78,7 +78,7 @@
 	<target name="postSetup">
 		<dirname file="${ant.file}" property="component.dir" />
 		<ant antfile="${component.dir}/dependency.xml" target="get">
-			<property name="dependency.properties" value="${buildDirectory}/maps/releng-jsf/maps/dependencies.properties" />
+			<property name="dependency.properties" value="${buildDirectory}/maps/releng/maps/dependencies.properties" />
 			<property name="base.install.dir" value="${buildRoot}" />
 		</ant>
 		<!--fetch the additional pieces to build wst tests -->
diff --git a/releng.wtpbuilder/distribution/wtp.build/build.xml b/releng.wtpbuilder/distribution/wtp.build/build.xml
index fdf24a7..0c6b1f7 100644
--- a/releng.wtpbuilder/distribution/wtp.build/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.build/build.xml
@@ -26,7 +26,14 @@
 		<ant antfile="${buildTargets}" >
 			<property name="component" value="jst.tests" />
 		</ant>
-		 
+		
+		<ant antfile="${buildTargets}" >
+			<property name="component" value="jsf" />
+		</ant> 
+		<ant antfile="${buildTargets}" >
+			<property name="component" value="jsf.tests" />
+		</ant>
+		
 
 		<ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
 		<property name="monitorTargets" value="${wtp.builder.home}/scripts/monitoring/build.xml" />
diff --git a/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template b/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template
index e427fd8..facd8aa 100644
--- a/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template
+++ b/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template
@@ -171,5 +171,34 @@
 </table>
 <table border=0 cellspacing=5 cellpadding=2 width="100%" ><tr><td colspan="2">&nbsp;</td></tr></table>
 
+<!-- ***********  JSF downloads **************  -->
+<table border=0 cellspacing=5 cellpadding=2 width="100%" ><tr>
+    <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"> <b><font face="Arial,Helvetica" color="#FFFFFF"> 
+      JSF Runtime </font></b></td>
+  </tr>
+
+<TR>
+    <TD align="LEFT" valign="TOP" colspan="3"> This module includes the complete 
+      set of plug-in to run JSF. </TD>
+  </TR></table>
+
+<table border=0 cellspacing=2 cellpadding=0 width="100%" bordercolor="#999999" >
+<tr><td align=RIGHT valign=TOP width="7%">
+<div align="left"><b>Status</b></div></td>
+<td width="34%"><b>Platform</b></td>
+<td width="59%"><b>Download</b></td></tr>
+%jsf-runtime% 
+</table>
+<table border=0 cellspacing=5 cellpadding=2 width="100%" ><tr><td colspan="2">&nbsp;</td></tr></table>
+
+<table border=0 cellspacing=2 cellpadding=0 width="100%" bordercolor="#999999" >
+<tr><td align=RIGHT valign=TOP width="7%">
+<div align="left"><b>Status</b></div></td>
+<td width="34%"><b>Platform</b></td>
+<td width="59%"><b>Download</b></td></tr>
+%jsf-tests% 
+</table>
+<table border=0 cellspacing=5 cellpadding=2 width="100%" ><tr><td colspan="2">&nbsp;</td></tr></table>
+
 </body>
 </html>
diff --git a/releng.wtpbuilder/distribution/wtp.site/testManifest.xml b/releng.wtpbuilder/distribution/wtp.site/testManifest.xml
index df61491..dacf09c 100644
--- a/releng.wtpbuilder/distribution/wtp.site/testManifest.xml
+++ b/releng.wtpbuilder/distribution/wtp.site/testManifest.xml
@@ -57,6 +57,20 @@
 				fileName='&lt;a href="@mirror@wtp-jst-perf-Tests-@build@.zip"&gt;wtp-jst-perf-Tests-@build@.zip&lt;/a&gt; (&lt;a href="checksum/wtp-jst-perf-Tests-@build@.zip.md5"&gt;md5&lt;/a&gt;) &lt;font size="2"&gt;&lt;/font&gt;'>
 			</platform>
 		</zipType>
+		<zipType name="jsf-runtime">
+			<platform 
+				id="JSF-RUNTIME" 
+				name="All" 
+				fileName='&lt;a href="@mirror@wtp-jsf-@build@.zip"&gt;wtp-jsf-@build@.zip&lt;/a&gt; (&lt;a href="checksum/wtp-jsf-@build@.zip.md5"&gt;md5&lt;/a&gt;) &lt;font size="2"&gt;&lt;/font&gt;'>
+			</platform>
+		</zipType>
+		<zipType name="jsf-tests">
+			<platform 
+				id="JSF-TESTS" 
+				name="All" 
+				fileName='&lt;a href="@mirror@wtp-jsf-Automated-Tests-@build@.zip"&gt;wtp-jsf-Automated-Tests-@build@.zip&lt;/a&gt; (&lt;a href="checksum/wtp-jst-Automated-Tests-@build@.zip.md5"&gt;md5&lt;/a&gt;) &lt;font size="2"&gt;&lt;/font&gt;'>
+			</platform>
+		</zipType>
 		
 	</zipTypes>
 
diff --git a/releng.wtpbuilder/distribution/wtp.tests/build.xml b/releng.wtpbuilder/distribution/wtp.tests/build.xml
index 099051f..810796f 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/build.xml
@@ -38,6 +38,9 @@
 		<unzip dest="${testRoot}" src="${postingDirectory}/${buildLabel}/wtp-wst-Automated-Tests-${buildLabel}.zip" overwrite="true" />
 		<unzip dest="${testRoot}" src="${postingDirectory}/${buildLabel}/wtp-jst-Automated-Tests-${buildLabel}.zip" overwrite="true" />
 
+		<unzip dest="${testRoot}" src="${postingDirectory}/${buildLabel}/wtp-jsf-${buildLabel}.zip" overwrite="true" />
+		<unzip dest="${testRoot}" src="${postingDirectory}/${buildLabel}/wtp-jsf-Automated-Tests-${buildLabel}.zip" overwrite="true" />
+
 		<antcall target="runTestEclipse">
 			<param name="testTarget" value="all" />
 		</antcall>
diff --git a/releng.wtpbuilder/distribution/wtp.tests/testScripts/test.properties b/releng.wtpbuilder/distribution/wtp.tests/testScripts/test.properties
index d5963f7..6227fb8 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/testScripts/test.properties
+++ b/releng.wtpbuilder/distribution/wtp.tests/testScripts/test.properties
@@ -69,6 +69,11 @@
 
 org.eclipse.jst.j2ee.core.tests.performance=org.eclipse.jst.j2ee.core.tests.performance_1.0.0
 
+# JSF Tests
+org.eclipse.jst.jsf.core.tests=org.eclipse.jst.jsf.core.tests_0.5.0
+org.eclipse.jst.jsf.ui.tests=org.eclipse.jst.jsf.ui.tests_0.5.0
+
+
 # Tomcat dirs
 tomcat50Dir=jakarta-tomcat-5.0.28
 
diff --git a/releng.wtpbuilder/distribution/wtp.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/wtp.tests/testScripts/test.xml
index ef5e077..2741956 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/testScripts/test.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/testScripts/test.xml
@@ -409,6 +409,18 @@
 		</antcall>
 	</target>
 
+	<!-- JSF TESTS -->
+	<target name="jsf-tests" description="Runs test.xml for org.eclipse.jst.jsf.core.tests, org.eclipse.jst.jsf.ui.tests">
+		<antcall target="runtests">
+			<param name="testPlugin" value="${org.eclipse.jst.jsf.core.tests}" />
+			<param name="report" value="org.eclipse.jst.jsf.core.tests" />
+		</antcall>
+		<antcall target="runtests">
+			<param name="testPlugin" value="${org.eclipse.jst.jsf.ui.tests}" />
+			<param name="report" value="org.eclipse.jst.jsf.ui.tests" />
+		</antcall>		
+	</target>
+
 	<!-- WS TESTS -->
 
 	<target name="wst-ws-tests" description="Runs the org.eclipse.wst.ws.tests test.xml">
@@ -541,6 +553,10 @@
 		<antcall target="jst-ws-tests" />
 
 		<echo message="Ended WTP Unit Tests"/>	
+
+		<echo message="Starting JSF Tests"/>		
+		<antcall target="jsf-tests" />
+
 	</target>
 
 	<target name="setupPerformance">