prep for update site
diff --git a/org.eclipse.wtp.releng.webupdatesite/site.xml b/org.eclipse.wtp.releng.webupdatesite/site.xml
new file mode 100644
index 0000000..06c24ad
--- /dev/null
+++ b/org.eclipse.wtp.releng.webupdatesite/site.xml
@@ -0,0 +1,299 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+    <description
+        name="Web Tools Platform Build Specific Repository"
+        url="http://build.eclipse.org/webtools//shared/webtools/projects/wtp-R3.1-S/workdir/updatesite/index.html"> The update site contains the features of the of Eclipse Web
+        Tools Platform (WTP)</description>
+    <feature
+        url="features/org.eclipse.wst.xml_ui.feature_3.1.0.v200905240756-7H6FMVDxtkM-5OgPGKK4xQocS5AL.jar"
+        id="org.eclipse.wst.xml_ui.feature"
+        version="3.1.0.v200905240756-7H6FMVDxtkM-5OgPGKK4xQocS5AL">
+        <category
+            name="Web Tools Platform (WTP) 3.1.0"/>
+    </feature>
+    <feature
+        url="features/org.eclipse.wst.jsdt.feature_1.1.1.v200906020459-77-FGBCcNBC-BeMcEeOm.jar"
+        id="org.eclipse.wst.jsdt.feature"
+        version="1.1.1.v200906020459-77-FGBCcNBC-BeMcEeOm">
+        <category
+            name="Web Tools Platform (WTP) 3.1.0"/>
+    </feature>
+    <feature
+        url="features/org.eclipse.wst.web_ui.feature_3.1.0.v200905242131-7R77FShEVw2xUGpF1LiNxdVAEK_p.jar"
+        id="org.eclipse.wst.web_ui.feature"
+        version="3.1.0.v200905242131-7R77FShEVw2xUGpF1LiNxdVAEK_p">
+        <category
+            name="Web Tools Platform (WTP) 3.1.0"/>
+    </feature>
+    <feature
+        url="features/org.eclipse.jst.enterprise_ui.feature_3.1.0.v200905242144-7_7EGr_FQRwRZSME08aqRiT1Skap.jar"
+        id="org.eclipse.jst.enterprise_ui.feature"
+        version="3.1.0.v200905242144-7_7EGr_FQRwRZSME08aqRiT1Skap">
+        <category
+            name="Web Tools Platform (WTP) 3.1.0"/>
+    </feature>
+    <feature
+        url="features/org.eclipse.jpt.feature_2.2.0.v200905310000-7L7OAFFBBoPR9QNdMUt_f.jar"
+        id="org.eclipse.jpt.feature"
+        version="2.2.0.v200905310000-7L7OAFFBBoPR9QNdMUt_f">
+        <category
+            name="Web Tools Platform (WTP) 3.1.0"/>
+    </feature>
+    <feature
+        url="features/org.eclipse.jpt.eclipselink.feature_2.2.0.v200905310000-65A7AkF77g7SGH7997.jar"
+        id="org.eclipse.jpt.eclipselink.feature"
+        version="2.2.0.v200905310000-65A7AkF77g7SGH7997">
+        <category
+            name="Web Tools Platform (WTP) 3.1.0"/>
+    </feature>
+    <feature
+        url="features/org.eclipse.jst.webpageeditor.feature_2.2.0.v20090310-4339oB55W5K6F.jar"
+        id="org.eclipse.jst.webpageeditor.feature"
+        version="2.2.0.v20090310-4339oB55W5K6F">
+        <category
+            name="Web Tools Platform (WTP) 3.1.0"/>
+    </feature>
+    <feature
+        url="features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature_2.2.0.v20090517-20-7w311A1636.jar"
+        id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature"
+        version="2.2.0.v20090517-20-7w311A1636">
+        <category
+            name="Web Tools Platform (WTP) 3.1.0"/>
+    </feature>
+    <feature
+        url="features/org.eclipse.jst.ws.axis2tools.feature_1.1.0.v200905242110-78-FBpDZRDE6FdPdLYYe.jar"
+        id="org.eclipse.jst.ws.axis2tools.feature"
+        version="1.1.0.v200905242110-78-FBpDZRDE6FdPdLYYe">
+        <category
+            name="Web Tools Platform (WTP) 3.1.0"/>
+    </feature>
+    <feature
+        url="features/org.eclipse.wst.xsl.feature_1.0.0.v200905242203-7R7T7IFIhIehWfz064pz0YX1.jar"
+        id="org.eclipse.wst.xsl.feature"
+        version="1.0.0.v200905242203-7R7T7IFIhIehWfz064pz0YX1">
+        <category
+            name="Web Tools Platform (WTP) 3.1.0"/>
+    </feature>
+    <feature
+        url="features/org.eclipse.wst.jsdt_sdk.feature_1.1.1.v200906020459-31184C2ISELfSEJ7NgWmGwgz0DdO.jar"
+        id="org.eclipse.wst.jsdt_sdk.feature"
+        version="1.1.1.v200906020459-31184C2ISELfSEJ7NgWmGwgz0DdO">
+        <category
+            name="Web Tools Platform SDK (WTP SDK) 3.1.0"/>
+    </feature>
+    <feature
+        url="features/org.eclipse.wst.xml_sdk.feature_3.1.0.v200808191955-7A2-8DXET8jJRDATUqGoFCGno0Od.jar"
+        id="org.eclipse.wst.xml_sdk.feature"
+        version="3.1.0.v200808191955-7A2-8DXET8jJRDATUqGoFCGno0Od">
+        <category
+            name="Web Tools Platform SDK (WTP SDK) 3.1.0"/>
+    </feature>
+    <feature
+        url="features/org.eclipse.wst.web_sdk.feature_3.1.0.v200809291500-7H508a3NfrJQjy6sE2ItisMF3y9d.jar"
+        id="org.eclipse.wst.web_sdk.feature"
+        version="3.1.0.v200809291500-7H508a3NfrJQjy6sE2ItisMF3y9d">
+        <category
+            name="Web Tools Platform SDK (WTP SDK) 3.1.0"/>
+    </feature>
+    <feature
+        url="features/org.eclipse.jst.enterprise_sdk.feature_3.1.0.v200809051357-771-84eAHSuhKXWz0YfUWqAPuj1z.jar"
+        id="org.eclipse.jst.enterprise_sdk.feature"
+        version="3.1.0.v200809051357-771-84eAHSuhKXWz0YfUWqAPuj1z">
+        <category
+            name="Web Tools Platform SDK (WTP SDK) 3.1.0"/>
+    </feature>
+    <feature
+        url="features/org.eclipse.jpt_sdk.feature_2.2.0.v200904200000-65-90UCTXKVJMtWYESY-Wv4rxCCp.jar"
+        id="org.eclipse.jpt_sdk.feature"
+        version="2.2.0.v200904200000-65-90UCTXKVJMtWYESY-Wv4rxCCp">
+        <category
+            name="Web Tools Platform SDK (WTP SDK) 3.1.0"/>
+    </feature>
+    <feature
+        url="features/org.eclipse.jpt.eclipselink_sdk.feature_2.2.0.v200904200000-53-83ADAMnNDBjAVJJGHMHBlG88h.jar"
+        id="org.eclipse.jpt.eclipselink_sdk.feature"
+        version="2.2.0.v200904200000-53-83ADAMnNDBjAVJJGHMHBlG88h">
+        <category
+            name="Web Tools Platform SDK (WTP SDK) 3.1.0"/>
+    </feature>
+    <feature
+        url="features/org.eclipse.jst.webpageeditor_sdk.feature_2.2.0.v20090310-53-8186Cz0EB9Z7RCLApC66X6L7G.jar"
+        id="org.eclipse.jst.webpageeditor_sdk.feature"
+        version="2.2.0.v20090310-53-8186Cz0EB9Z7RCLApC66X6L7G">
+        <category
+            name="Web Tools Platform SDK (WTP SDK) 3.1.0"/>
+    </feature>
+    <feature
+        url="features/org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature_2.2.0.v20090310-53-8-52B6695K3B688x422B2747.jar"
+        id="org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature"
+        version="2.2.0.v20090310-53-8-52B6695K3B688x422B2747">
+        <category
+            name="Web Tools Platform SDK (WTP SDK) 3.1.0"/>
+    </feature>
+    <feature
+        url="features/org.eclipse.jst.ws.axis2tools_sdk.feature_1.1.0.v200905242110-31-84D2INsLdYIIAIfZoNpmVE_SE.jar"
+        id="org.eclipse.jst.ws.axis2tools_sdk.feature"
+        version="1.1.0.v200905242110-31-84D2INsLdYIIAIfZoNpmVE_SE">
+        <category
+            name="Web Tools Platform SDK (WTP SDK) 3.1.0"/>
+    </feature>
+    <feature
+        url="features/org.eclipse.wst.xsl_sdk.feature_1.0.0.v200904240436-4--90_CYUNTRuPppji7UG_z0IItF.jar"
+        id="org.eclipse.wst.xsl_sdk.feature"
+        version="1.0.0.v200904240436-4--90_CYUNTRuPppji7UG_z0IItF">
+        <category
+            name="Web Tools Platform SDK (WTP SDK) 3.1.0"/>
+    </feature>
+    <feature
+        url="features/org.eclipse.jst.server_adapters.ext.feature_3.1.0.v20090311b-777HFDNCcNBBz-BcKW6EGF.jar"
+        id="org.eclipse.jst.server_adapters.ext.feature"
+        version="3.1.0.v20090311b-777HFDNCcNBBz-BcKW6EGF">
+        <category
+            name="Project Provided Components"/>
+    </feature>
+    <feature
+        url="features/org.eclipse.jst.server_adapters.ext.sdk.feature_3.1.0.v200903120314-771-84CAKRGTGh-DM79Vu_vLtfTC.jar"
+        id="org.eclipse.jst.server_adapters.ext.sdk.feature"
+        version="3.1.0.v200903120314-771-84CAKRGTGh-DM79Vu_vLtfTC">
+        <category
+            name="Project Provided Components"/>
+    </feature>
+    <feature
+        url="features/org.eclipse.wtp.releng.tests.feature_1.0.2.v200810301724-7H7W5F8NcJKeKxa5JsTz-6.jar"
+        id="org.eclipse.wtp.releng.tests.feature"
+        version="1.0.2.v200810301724-7H7W5F8NcJKeKxa5JsTz-6">
+        <category
+            name="Web Tools Platform Tests (WTP Tests) 3.1.0"/>
+    </feature>
+    <feature
+        url="features/org.eclipse.wst.common_tests.feature_3.1.0.v200901260254-7B7BEvEVVFGHGoPjLfQP.jar"
+        id="org.eclipse.wst.common_tests.feature"
+        version="3.1.0.v200901260254-7B7BEvEVVFGHGoPjLfQP">
+        <category
+            name="Web Tools Platform Tests (WTP Tests) 3.1.0"/>
+    </feature>
+    <feature
+        url="features/org.eclipse.wst.xml_tests.feature_3.1.0.v200901260254-7G-FtqFD3wTVTVNfQgd2P.jar"
+        id="org.eclipse.wst.xml_tests.feature"
+        version="3.1.0.v200901260254-7G-FtqFD3wTVTVNfQgd2P">
+        <category
+            name="Web Tools Platform Tests (WTP Tests) 3.1.0"/>
+    </feature>
+    <feature
+        url="features/org.eclipse.wst.server_tests.feature_3.1.0.v20090429-77-FPZCcNBBwC_HZ9ETY.jar"
+        id="org.eclipse.wst.server_tests.feature"
+        version="3.1.0.v20090429-77-FPZCcNBBwC_HZ9ETY">
+        <category
+            name="Web Tools Platform Tests (WTP Tests) 3.1.0"/>
+    </feature>
+    <feature
+        url="features/org.eclipse.wst.web_tests.feature_3.1.0.v200809291500-79-F_VEVVFGFJfMiHo_y.jar"
+        id="org.eclipse.wst.web_tests.feature"
+        version="3.1.0.v200809291500-79-F_VEVVFGFJfMiHo_y">
+        <category
+            name="Web Tools Platform Tests (WTP Tests) 3.1.0"/>
+    </feature>
+    <feature
+        url="features/org.eclipse.wst.ws_tests.feature_3.0.201.v200810012129-78-FDDAkF77e7KDLBIFL.jar"
+        id="org.eclipse.wst.ws_tests.feature"
+        version="3.0.201.v200810012129-78-FDDAkF77e7KDLBIFL">
+        <category
+            name="Web Tools Platform Tests (WTP Tests) 3.1.0"/>
+    </feature>
+    <feature
+        url="features/org.eclipse.wst.jsdt_tests.feature_1.1.1.v200906020459-3-DF8s733L3C595H95.jar"
+        id="org.eclipse.wst.jsdt_tests.feature"
+        version="1.1.1.v200906020459-3-DF8s733L3C595H95">
+        <category
+            name="Web Tools Platform Tests (WTP Tests) 3.1.0"/>
+    </feature>
+    <feature
+        url="features/org.eclipse.jst.server_tests.feature_3.1.0.v20090311c-4-FBY8s733K3B58e256.jar"
+        id="org.eclipse.jst.server_tests.feature"
+        version="3.1.0.v20090311c-4-FBY8s733K3B58e256">
+        <category
+            name="Web Tools Platform Tests (WTP Tests) 3.1.0"/>
+    </feature>
+    <feature
+        url="features/org.eclipse.jst.server_adapters.ext_tests.feature_3.1.0.v20090311b-4-FD39oB55T5K8H58HK.jar"
+        id="org.eclipse.jst.server_adapters.ext_tests.feature"
+        version="3.1.0.v20090311b-4-FD39oB55T5K8H58HK">
+        <category
+            name="Web Tools Platform Tests (WTP Tests) 3.1.0"/>
+    </feature>
+    <feature
+        url="features/org.eclipse.jst.web_tests.feature_3.1.0.v200809240655-794FXOEVVFGKFnMoGz-Xe.jar"
+        id="org.eclipse.jst.web_tests.feature"
+        version="3.1.0.v200809240655-794FXOEVVFGKFnMoGz-Xe">
+        <category
+            name="Web Tools Platform Tests (WTP Tests) 3.1.0"/>
+    </feature>
+    <feature
+        url="features/org.eclipse.jst.enterprise_tests.feature_3.1.0.v200901300500-783F8U9oB55V5F6P8EBE.jar"
+        id="org.eclipse.jst.enterprise_tests.feature"
+        version="3.1.0.v200901300500-783F8U9oB55V5F6P8EBE">
+        <category
+            name="Web Tools Platform Tests (WTP Tests) 3.1.0"/>
+    </feature>
+    <feature
+        url="features/org.eclipse.jst.jsf.tests.feature_2.1.2.v20090601-7E7ADTFBBoPR7R0Yl2753.jar"
+        id="org.eclipse.jst.jsf.tests.feature"
+        version="2.1.2.v20090601-7E7ADTFBBoPR7R0Yl2753">
+        <category
+            name="Web Tools Platform Tests (WTP Tests) 3.1.0"/>
+    </feature>
+    
+    <feature
+        url="features/org.eclipse.jst.ws.cxf_sdk.feature_${org.eclipse.jst.ws.cxf_sdk.feature}.jar"
+        id="org.eclipse.jst.ws.cxf_sdk.feature"
+        version="${org.eclipse.jst.ws.cxf_sdk.feature}">
+        <category
+            name="Web Tools Platform SDK (WTP SDK) 3.1.0"/>
+    </feature>
+    
+    <feature
+        url="features/org.eclipse.jst.ws.cxf.feature_${org.eclipse.jst.ws.cxf.feature}.jar"
+        id="org.eclipse.jst.ws.cxf.feature"
+        version="${org.eclipse.jst.ws.cxf.feature}">
+        <category
+            name="Web Tools Platform (WTP) 3.1.0"/>
+    </feature>
+    
+    <feature
+        url="features/org.eclipse.jst.ws.cxf_tests.feature_${org.eclipse.jst.ws.cxf_tests.feature}.jar"
+        id="org.eclipse.jst.ws.cxf_tests.feature"
+        version="${org.eclipse.jst.ws.cxf_tests.feature}">
+        <category
+            name="Web Tools Platform Tests (WTP Tests) 3.1.0"/>
+    </feature>
+    
+    
+    <category-def
+        name="Web Tools Platform (WTP) 3.1.0"
+        label="Web Tools Platform (WTP) 3.1.0">
+        <description> These features provide functionality with the
+            executable code only and are recommended for most users.
+        </description>
+    </category-def>
+    <category-def
+        name="Web Tools Platform SDK (WTP SDK) 3.1.0"
+        label="Web Tools Platform SDK (WTP SDK) 3.1.0">
+        <description> These features provide functionality with the
+            executable code and the source code and are recommended for
+            those extending or debugging WTP.</description>
+    </category-def>
+    <category-def
+        name="Web Tools Platform Tests (WTP Tests) 3.1.0"
+        label="Web Tools Platform Tests (WTP Tests) 3.1.0">
+        <description> These features provide Unit tests for WTP. WTP
+            Committers, or others testing WTP, will need these in at
+            least their PDE Targets.</description>
+    </category-def>
+    <category-def
+        name="Project Provided Components"
+        label="Project Provided Components">
+        <description> These features are components produced by WTP
+            Project, which are provided separately for special purposes.
+        </description>
+    </category-def>
+</site>
\ No newline at end of file
diff --git a/org.eclipse.wtp.releng.webupdatesite/webtools.build b/org.eclipse.wtp.releng.webupdatesite/webtools.build
index f2fb19c..b12cc0b 100644
--- a/org.eclipse.wtp.releng.webupdatesite/webtools.build
+++ b/org.eclipse.wtp.releng.webupdatesite/webtools.build
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <build:Contribution xmlns:build="http://www.eclipse.org/amalgam/2008/build" xmlns:xmi="http://www.omg.org/XMI" label="WebTools" xmi:version="2.0">
     <contacts email="david_williams@us.ibm.com" name="David Williams"/>
-    <features id="org.eclipse.wst.web_ui.feature" repo="//@repositories.0" version="3.1.0.v200905242131-7R77FShEVw2xUGpF1LiNwfbAEK_p">
+    <features id="org.eclipse.wst.web_ui.feature" repo="//@repositories.0" version="3.1.0.v200905242131-7R77FShEVw2xUGpF1LiNxdVAEK_p">
         <category href="galileo.build#//@categories.2"/>
     </features>
     <features id="org.eclipse.jst.enterprise_ui.feature" repo="//@repositories.0" version="3.1.0.v200905242144-7_7EGr_FQRwRZSME08aqRiT1Skap">
         <category href="galileo.build#//@categories.2"/>
     </features>
-    <features id="org.eclipse.jpt.feature" repo="//@repositories.0" version="2.2.0.v200905310000-7L7O8gFBBoPR9QLjAUpWf">
+    <features id="org.eclipse.jpt.feature" repo="//@repositories.0" version="2.2.0.v200905310000-7L7OAFFBBoPR9QNdMUt_f">
         <category href="galileo.build#//@categories.2"/>
     </features>
     <features id="org.eclipse.jst.ws.axis2tools.feature" repo="//@repositories.0" version="1.1.0.v200905242110-78-FBpDZRDE6FdPdLYYe">
         <category href="galileo.build#//@categories.2"/>
     </features>
-    <features id="org.eclipse.jpt.eclipselink.feature" repo="//@repositories.0" version="2.2.0.v200905310000-658ZAkF77g7RJB7777">
+    <features id="org.eclipse.jpt.eclipselink.feature" repo="//@repositories.0" version="2.2.0.v200905310000-65A7AkF77g7SGH7997">
         <category href="galileo.build#//@categories.2"/>
     </features>
-    <features id="org.eclipse.jst.webpageeditor.feature" repo="//@repositories.0" version="2.2.0.v20090310-4339oB55W5J7H">
+    <features id="org.eclipse.jst.webpageeditor.feature" repo="//@repositories.0" version="2.2.0.v20090310-4339oB55W5K6F">
         <category href="galileo.build#//@categories.2"/>
     </features>
     <features id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature" repo="//@repositories.0" version="2.2.0.v20090517-20-7w311A1636">
@@ -28,9 +28,9 @@
     <features id="org.eclipse.wst.jsdt.feature" repo="//@repositories.0" version="1.1.1.v200906020459-77-FGBCcNBC-BeMcEeOm">
         <category href="galileo.build#//@categories.2"/>
     </features>
-      <features id="org.eclipse.wtp.capabilities" repo="//@repositories.0" version="1.0.0.v200905221827-5--AkF77g7RF77ZJR"/>
+      <features id="org.eclipse.wtp.capabilities" repo="//@repositories.0" version="1.0.0.v200905221827-5--AkF77g7V7ZFJ77"/>
 
-    <features id="org.eclipse.wst.common.fproj" repo="//@repositories.0" version="3.1.0.v200906020515-377-8s733L3D77397J">
+    <features id="org.eclipse.wst.common.fproj" repo="//@repositories.0" version="3.1.0.v200906080522-377-8s733L3F3J3DAB">
         <category href="galileo.build#//@categories.2"/>
     </features>
     <features id="org.eclipse.wst.server_adapters.feature" repo="//@repositories.0" version="3.1.0.v200906020451-51DFAkF77g7GCNc">
@@ -40,7 +40,7 @@
         <category href="galileo.build#//@categories.2"/>
     </features>
 
-    <features id="org.eclipse.jst.common.fproj.enablement.jdt" repo="//@repositories.0" version="3.1.0.v200905220328-377-8s733L3D794CCD">
+    <features id="org.eclipse.jst.common.fproj.enablement.jdt" repo="//@repositories.0" version="3.1.0.v200905220328-377-8s733L3F3J3D33">
         <category href="galileo.build#//@categories.2"/>
     </features>
     <features id="org.eclipse.jst.server_ui.feature" repo="//@repositories.0" version="3.1.0.v20080930-7A2FB_9xFaFovXGKcCTNM2355">