experiment with jsf features

assembly/features/org.eclipse.jst.feature/feature.xml

diff --git a/assembly/features/org.eclipse.jst.feature/feature.xml b/assembly/features/org.eclipse.jst.feature/feature.xml
index 2fa8c76..813f3da 100644
--- a/assembly/features/org.eclipse.jst.feature/feature.xml
+++ b/assembly/features/org.eclipse.jst.feature/feature.xml
@@ -46,13 +46,6 @@
          id="org.eclipse.jst.enterprise_ui.feature"
          version="0.0.0"/>
 
-   <includes
-         id="org.eclipse.jst.webpageeditor.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature"
-         version="0.0.0"/>
 
    <includes
          id="org.eclipse.jst.ws.axis2tools.feature"
@@ -62,6 +55,12 @@
          id="org.eclipse.jst.ws.jaxws.assembly.feature"
          version="0.0.0"/>
 
+   <includes
+         id="org.eclipse.jsf.assembly.feature"
+         version="0.0.0"/>
+
+
+
    <requires>
       <import feature="org.eclipse.jdt" version="3.5.0"/>
       <import feature="org.eclipse.wst.jsdt.feature" version="1.1"/>

assembly/features/org.eclipse.jst.sdk/feature.xml

diff --git a/assembly/features/org.eclipse.jst.sdk/feature.xml b/assembly/features/org.eclipse.jst.sdk/feature.xml
index 0944808..1201a82 100644
--- a/assembly/features/org.eclipse.jst.sdk/feature.xml
+++ b/assembly/features/org.eclipse.jst.sdk/feature.xml
@@ -47,14 +47,6 @@
          version="0.0.0"/>
 
    <includes
-         id="org.eclipse.jst.webpageeditor_sdk.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature"
-         version="0.0.0"/>
-
-   <includes
          id="org.eclipse.jst.ws.axis2tools_sdk.feature"
          version="0.0.0"/>
 
@@ -62,4 +54,8 @@
          id="org.eclipse.jst.ws.jaxws.assembly_sdk.feature"
          version="0.0.0"/>
 
+   <includes
+         id="org.eclipse.jsf_sdk.assembly.feature"
+         version="0.0.0"/>
+
 </feature>

releng.control/cc_config.xml

diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml
index dcdd7c1..472b4bb 100644
--- a/releng.control/cc_config.xml
+++ b/releng.control/cc_config.xml
@@ -862,13 +862,13 @@
                     value="R3.2.0"/>
                 <property
                     name="mapVersionTag"
-                    value="HEAD"/>
+                    value="david_williams_tempTest25"/>
                 <property
                     name="releng.dali-mapVersionTag"
-                    value="HEAD"/>
+                    value="david_williams_tempTest25"/>
                 <property
                     name="releng.jsf-mapVersionTag"
-                    value="HEAD"/>
+                    value="david_williams_tempTest25"/>
                 <property
                     name="build.distribution"
                     value="wtp"/>

releng.control/get-relengControl.sh

diff --git a/releng.control/get-relengControl.sh b/releng.control/get-relengControl.sh
index 34bc6aa..a63ba0e 100644
--- a/releng.control/get-relengControl.sh
+++ b/releng.control/get-relengControl.sh
@@ -56,8 +56,8 @@
 # This CONTROLTAG controls _only_ the version of releng.control that is fetched by build administrator
 # It may, for example, contain a version of cc_config.xml where it, in turn, specifies 
 # other branches to do non standard builds (HEAD is the standard, production value) 
-#CONTROLTAG=david_williams_tempTest2
-CONTROLTAG=HEAD
+CONTROLTAG=david_williams_tempTest25
+#CONTROLTAG=HEAD
 echo "    checking out $CONTROLTAG of ${RELENG_CONTROL} from cvs ..."
 cvs -Q -f -d :${BUILD_CVS_READ_PROTOCOL}:${BUILD_CVS_READ_USER}@dev.eclipse.org:/cvsroot/webtools  export -d ${RELENG_CONTROL} -r $CONTROLTAG webtools.releng/${RELENG_CONTROL}