update near WTP SR2
diff --git a/org.eclipse.wtp.releng.webupdatesite/WebContent/site.xml b/org.eclipse.wtp.releng.webupdatesite/WebContent/site.xml
index 2b06f3b..36d2e27 100644
--- a/org.eclipse.wtp.releng.webupdatesite/WebContent/site.xml
+++ b/org.eclipse.wtp.releng.webupdatesite/WebContent/site.xml
@@ -1,15 +1,169 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site
-    digestURL="http://download.eclipse.org/webtools/updates/"
-    mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/webtools/updates/site.xml&amp;format=xml"
+    digestURL="http://download.eclipse.org/webtools/tempTestUpdates30x/"
+    mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/webtools/tempTestUpdates30x/site.xml&amp;format=xml"
     pack200="true">
     <description
-        url="http://download.eclipse.org/webtools/updates/index.html"> The update site contains the features of the of Eclipse Web
+        url="http://download.eclipse.org/webtools/tempTestUpdates30x/index.html"> The update site contains the features of the of Eclipse Web
         Tools Project (WTP)</description>
 
+    <!--  WTP 3.0.4 -->
+    <feature
+        id="org.eclipse.wst.xml_ui.feature"
+        url="features/org.eclipse.wst.xml_ui.feature_3.0.4.v200811211541-7F2ENnCwum8W79A1UYNgSjOcFVJg.jar"
+        version="3.0.4.v200811211541-7F2ENnCwum8W79A1UYNgSjOcFVJg">
+        <category
+            name="Web Tools Platform (WTP) 3.0.4"/>
+    </feature>
+    <feature
+        id="org.eclipse.wst.jsdt.feature"
+        url="features/org.eclipse.wst.jsdt.feature_1.0.4.v200812112112-6-E75BcMAAyDJGhFpNN.jar"
+        version="1.0.4.v200812112112-6-E75BcMAAyDJGhFpNN">
+        <category
+            name="Web Tools Platform (WTP) 3.0.4"/>
+    </feature>
+    <feature
+        id="org.eclipse.wst"
+        url="features/org.eclipse.wst_3.0.4.v200811190840-7A-8l8Qqcz0HyVgjXUE-iuOYZ9ai.jar"
+        version="3.0.4.v200811190840-7A-8l8Qqcz0HyVgjXUE-iuOYZ9ai">
+        <category
+            name="Web Tools Platform (WTP) 3.0.4"/>
+    </feature>
+    <feature
+        id="org.eclipse.jst"
+        url="features/org.eclipse.jst_3.0.4.v200811190840-7U1959LJIHM6ogLbhvbrAnWtxuyM.jar"
+        version="3.0.4.v200811190840-7U1959LJIHM6ogLbhvbrAnWtxuyM">
+        <category
+            name="Web Tools Platform (WTP) 3.0.4"/>
+    </feature>
+    <feature
+        id="org.eclipse.jpt.feature"
+        url="features/org.eclipse.jpt.feature_2.0.103.v200901160200-793DyCYQCD5FVHgCMCC.jar"
+        version="2.0.103.v200901160200-793DyCYQCD5FVHgCMCC">
+        <category
+            name="Web Tools Platform (WTP) 3.0.4"/>
+    </feature>
+    <feature
+        id="org.eclipse.jpt.eclipselink.feature"
+        url="features/org.eclipse.jpt.eclipselink.feature_2.0.0.v200806090000-3--8s733I3D683333.jar"
+        version="2.0.0.v200806090000-3--8s733I3D683333">
+        <category
+            name="Web Tools Platform (WTP) 3.0.4"/>
+    </feature>
+    <feature
+        id="org.eclipse.jst.webpageeditor.feature"
+        url="features/org.eclipse.jst.webpageeditor.feature_2.1.0.v20090128-3219oA55U5D7N2532.jar"
+        version="2.1.0.v20090128-3219oA55U5D7N2532">
+        <category
+            name="Web Tools Platform (WTP) 3.0.4"/>
+    </feature>
+    <feature
+        id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature"
+        url="features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature_2.1.0.v20090128-1-8Z7w311_1239.jar"
+        version="2.1.0.v20090128-1-8Z7w311_1239">
+        <category
+            name="Web Tools Platform (WTP) 3.0.4"/>
+    </feature>
+    <feature
+        id="org.eclipse.jst.ws.axis2tools.feature"
+        url="features/org.eclipse.jst.ws.axis2tools.feature_1.0.3.v200901220134-77-E_FCYQCD5EeNgKUUY.jar"
+        version="1.0.3.v200901220134-77-E_FCYQCD5EeNgKUUY">
+        <category
+            name="Web Tools Platform (WTP) 3.0.4"/>
+    </feature>
+    <feature
+        id="org.eclipse.wst.xsl.feature"
+        url="features/org.eclipse.wst.xsl.feature_0.5.0.v200808041223-6872EC3wSUIU7eJGVdY_1.jar"
+        version="0.5.0.v200808041223-6872EC3wSUIU7eJGVdY_1">
+        <category
+            name="Web Tools Platform (WTP) 3.0.4"/>
+    </feature>
+    <feature
+        id="org.eclipse.wst.jsdt_sdk.feature"
+        url="features/org.eclipse.wst.jsdt_sdk.feature_1.0.4.v200812112112-2-77834H_FFhQEG0HOIqI5XVCdNB.jar"
+        version="1.0.4.v200812112112-2-77834H_FFhQEG0HOIqI5XVCdNB">
+        <category
+            name="Web Tools Platform (WTP) 3.0.4"/>
+    </feature>
+    <feature
+        id="org.eclipse.wst.xml_sdk.feature"
+        url="features/org.eclipse.wst.xml_sdk.feature_3.0.4.v200811211541-79-7A8CV8Qm2AVE8A_Gfv2wboWck.jar"
+        version="3.0.4.v200811211541-79-7A8CV8Qm2AVE8A_Gfv2wboWck">
+        <category
+            name="Web Tools Platform (WTP) 3.0.4"/>
+    </feature>
+    <feature
+        id="org.eclipse.wst.sdk"
+        url="features/org.eclipse.wst.sdk_3.0.4.v200811190840-7D-8p8XkFmigm4jQp_cqdqM0dr6H.jar"
+        version="3.0.4.v200811190840-7D-8p8XkFmigm4jQp_cqdqM0dr6H">
+        <category
+            name="Web Tools Platform (WTP) 3.0.4"/>
+    </feature>
+    <feature
+        id="org.eclipse.jst.sdk"
+        url="features/org.eclipse.jst.sdk_3.0.4.v200811190840-7X1999RLz-ynoIpJ-LqlU6fxnS3G.jar"
+        version="3.0.4.v200811190840-7X1999RLz-ynoIpJ-LqlU6fxnS3G">
+        <category
+            name="Web Tools Platform (WTP) 3.0.4"/>
+    </feature>
+    <feature
+        id="org.eclipse.jpt_sdk.feature"
+        url="features/org.eclipse.jpt_sdk.feature_2.0.103.v200901160200-5-_C90H8JHHjYPIBKaJqOSUBDZRD.jar"
+        version="2.0.103.v200901160200-5-_C90H8JHHjYPIBKaJqOSUBDZRD">
+        <category
+            name="Web Tools Platform (WTP) 3.0.4"/>
+    </feature>
+    <feature
+        id="org.eclipse.jpt.eclipselink_sdk.feature"
+        url="features/org.eclipse.jpt.eclipselink_sdk.feature_2.0.0.v200805220000-4--8042B1_B6U6G9A59559t844J4.jar"
+        version="2.0.0.v200805220000-4--8042B1_B6U6G9A59559t844J4">
+        <category
+            name="Web Tools Platform (WTP) 3.0.4"/>
+    </feature>
+    <feature
+        id="org.eclipse.wst.common_ui.feature"
+        url="features/org.eclipse.wst.common_ui.feature_3.0.4.v200811200248-7C78ELhE8VrRVqtHp4iT8PuSwZ5W.jar"
+        version="3.0.4.v200811200248-7C78ELhE8VrRVqtHp4iT8PuSwZ5W">
+        <category
+            name="Enabling Features 3.0.4"/>
+    </feature>
+    <feature
+        id="org.eclipse.wst.common_sdk.feature"
+        url="features/org.eclipse.wst.common_sdk.feature_3.0.4.v200811201408-7917A_tTFGuW4SXiJkz-t1Xz-Ez0.jar"
+        version="3.0.4.v200811201408-7917A_tTFGuW4SXiJkz-t1Xz-Ez0">
+        <category
+            name="Enabling Features 3.0.4"/>
+    </feature>
+    <feature
+        id="org.eclipse.jst.webpageeditor_sdk.feature"
+        url="features/org.eclipse.jst.webpageeditor_sdk.feature_2.1.0.v20090128-41-8074Bz0D9_f7JBRDwG_6V6E8O.jar"
+        version="2.1.0.v20090128-41-8074Bz0D9_f7JBRDwG_6V6E8O">
+        <category
+            name="Web Tools Platform (WTP) 3.0.4"/>
+    </feature>
+    <feature
+        id="org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature"
+        url="features/org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature_2.1.0.v200902042324-41-7z4AcIz-76BB54Dl8x422A234.jar"
+        version="2.1.0.v200902042324-41-7z4AcIz-76BB54Dl8x422A234">
+        <category
+            name="Web Tools Platform (WTP) 3.0.4"/>
+    </feature>
+    <feature
+        id="org.eclipse.jst.ws.axis2tools_sdk.feature"
+        url="features/org.eclipse.jst.ws.axis2tools_sdk.feature_1.0.3.v200901220134-2-584B2HLIGdVFHALgXqMmhrDZRD.jar"
+        version="1.0.3.v200901220134-2-584B2HLIGdVFHALgXqMmhrDZRD">
+        <category
+            name="Web Tools Platform (WTP) 3.0.4"/>
+    </feature>
+    <feature
+        id="org.eclipse.wst.xsl_sdk.feature"
+        url="features/org.eclipse.wst.xsl_sdk.feature_0.5.0.v20080804-07949-GB7ZHO-jcQcGiURfiqP7xT.jar"
+        version="0.5.0.v20080804-07949-GB7ZHO-jcQcGiURfiqP7xT">
+        <category
+            name="Web Tools Platform (WTP) 3.0.4"/>
+    </feature>
+
     <!-- dali 2.1 -->
-
-
     <feature
         id="org.eclipse.jpt.feature"
         url="features/org.eclipse.jpt.feature_2.1.0.v200812180210-7979AgCYQCD4IRJdCEDC.jar"
@@ -845,13 +999,10 @@
             name="Patch Features"/>
     </feature>
     <!--
-    <feature
-        id="org.eclipse.jst.web_core.feature.patch2"
+        <feature id="org.eclipse.jst.web_core.feature.patch2"
         url="features/org.eclipse.jst.web_core.feature.patch2_2.0.2.v200803241913-208i8s733I395D6BA7.jar"
-        version="2.0.2.v200803241913-208i8s733I395D6BA7">
-        <category
-            name="Patch Features"/>
-    </feature>
+        version="2.0.2.v200803241913-208i8s733I395D6BA7"> <category
+        name="Patch Features"/> </feature>
     -->
     <feature
         id="org.eclipse.jpt.patch"
@@ -861,22 +1012,33 @@
             name="Patch Features"/>
     </feature>
     <category-def
+        label="Enabling Features 3.0.4"
+        name="Enabling Features 3.0.4">
+        <description> These features provide functionality required by
+            one or more projects, but do not provide end-user
+            functionality by themselves.</description>
+    </category-def>
+    <category-def
+        label="Web Tools Platform (WTP) 3.0.4"
+        name="Web Tools Platform (WTP) 3.0.4">
+        <description
+            url="http://download.eclipse.org/webtools/updates/index.html"> This category contains the features of the Eclipse Web
+            Tools Project (WTP).</description>
+    </category-def>
+    <category-def
+        label="Dali 2.1"
+        name="Dali 2.1">
+        <description
+            url="http://download.eclipse.org/webtools/updates/index.html"> This category contains the features of an off cycle
+            release of Dali.</description>
+    </category-def>
+    <category-def
         label="Enabling Features 3.0.3"
         name="Enabling Features 3.0.3">
         <description> These features provide functionality required by
             one or more projects, but do not provide end-user
             functionality by themselves.</description>
     </category-def>
-
-    <category-def
-        label="Dali 2.1"
-        name="Dali 2.1">
-        <description
-            url="http://download.eclipse.org/webtools/updates/index.html"> This category contains the features of an off cycle release of Dali.</description>
-    </category-def>
-
-
-
     <category-def
         label="Web Tools Platform (WTP) 3.0.3"
         name="Web Tools Platform (WTP) 3.0.3">
@@ -884,7 +1046,6 @@
             url="http://download.eclipse.org/webtools/updates/index.html"> This category contains the features of the Eclipse Web
             Tools Project (WTP).</description>
     </category-def>
-
     <category-def
         label="Enabling Features 3.0.2"
         name="Enabling Features 3.0.2">
@@ -961,4 +1122,4 @@
         <description> These features provide fixes to particularly bad
             bugs in released code.</description>
     </category-def>
-</site>
+</site>
\ No newline at end of file
diff --git a/org.eclipse.wtp.releng.webupdatesite/WebContent/site304.xml b/org.eclipse.wtp.releng.webupdatesite/WebContent/site304.xml
new file mode 100644
index 0000000..9b23cb0
--- /dev/null
+++ b/org.eclipse.wtp.releng.webupdatesite/WebContent/site304.xml
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site
+    digestURL="http://download.eclipse.org/webtools/tempTestUpdates/"
+    mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/webtools/tempTestUpdates/site.xml&amp;format=xml"
+    pack200="true">
+    <description
+        url="http://download.eclipse.org/webtools/tempTestUpdates/index.html"> The update site contains the features of the of Eclipse Web
+        Tools Project (WTP)</description>
+    <feature
+        id="org.eclipse.wst.xml_ui.feature"
+        url="features/org.eclipse.wst.xml_ui.feature_3.0.4.v200811211541-7F2ENnCwum8W79A1UYNgSjOcFVJg.jar"
+        version="3.0.4.v200811211541-7F2ENnCwum8W79A1UYNgSjOcFVJg">
+        <category
+            name="Web Tools Platform (WTP)"/>
+    </feature>
+    <feature
+        id="org.eclipse.wst.jsdt.feature"
+        url="features/org.eclipse.wst.jsdt.feature_1.0.4.v200812112112-6-E75BcMAAyDJGhFpNN.jar"
+        version="1.0.4.v200812112112-6-E75BcMAAyDJGhFpNN">
+        <category
+            name="Web Tools Platform (WTP)"/>
+    </feature>
+    <feature
+        id="org.eclipse.wst"
+        url="features/org.eclipse.wst_3.0.4.v200811190840-7A-8l8Qqcz0HyVgjXUE-iuOYZ9ai.jar"
+        version="3.0.4.v200811190840-7A-8l8Qqcz0HyVgjXUE-iuOYZ9ai">
+        <category
+            name="Web Tools Platform (WTP)"/>
+    </feature>
+    <feature
+        id="org.eclipse.jst"
+        url="features/org.eclipse.jst_3.0.4.v200811190840-7U1959LJIHM6ogLbhvbrAnWtxuyM.jar"
+        version="3.0.4.v200811190840-7U1959LJIHM6ogLbhvbrAnWtxuyM">
+        <category
+            name="Web Tools Platform (WTP)"/>
+    </feature>
+    <feature
+        id="org.eclipse.jpt.feature"
+        url="features/org.eclipse.jpt.feature_2.0.103.v200901160200-793DyCYQCD5FVHgCMCC.jar"
+        version="2.0.103.v200901160200-793DyCYQCD5FVHgCMCC">
+        <category
+            name="Web Tools Platform (WTP)"/>
+    </feature>
+    <feature
+        id="org.eclipse.jpt.eclipselink.feature"
+        url="features/org.eclipse.jpt.eclipselink.feature_2.0.0.v200806090000-3--8s733I3D683333.jar"
+        version="2.0.0.v200806090000-3--8s733I3D683333">
+        <category
+            name="Web Tools Platform (WTP)"/>
+    </feature>
+    <feature
+        id="org.eclipse.jst.webpageeditor.feature"
+        url="features/org.eclipse.jst.webpageeditor.feature_2.1.0.v20090128-3219oA55U5D7N2532.jar"
+        version="2.1.0.v20090128-3219oA55U5D7N2532">
+        <category
+            name="Web Tools Platform (WTP)"/>
+    </feature>
+    <feature
+        id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature"
+        url="features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature_2.1.0.v20090128-1-8Z7w311_1239.jar"
+        version="2.1.0.v20090128-1-8Z7w311_1239">
+        <category
+            name="Web Tools Platform (WTP)"/>
+    </feature>
+    <feature
+        id="org.eclipse.jst.ws.axis2tools.feature"
+        url="features/org.eclipse.jst.ws.axis2tools.feature_1.0.3.v200901220134-77-E_FCYQCD5EeNgKUUY.jar"
+        version="1.0.3.v200901220134-77-E_FCYQCD5EeNgKUUY">
+        <category
+            name="Web Tools Platform (WTP)"/>
+    </feature>
+    <feature
+        id="org.eclipse.wst.xsl.feature"
+        url="features/org.eclipse.wst.xsl.feature_0.5.0.v200808041223-6872EC3wSUIU7eJGVdY_1.jar"
+        version="0.5.0.v200808041223-6872EC3wSUIU7eJGVdY_1">
+        <category
+            name="Web Tools Platform (WTP)"/>
+    </feature>
+    <feature
+        id="org.eclipse.wst.jsdt_sdk.feature"
+        url="features/org.eclipse.wst.jsdt_sdk.feature_1.0.4.v200812112112-2-77834H_FFhQEG0HOIqI5XVCdNB.jar"
+        version="1.0.4.v200812112112-2-77834H_FFhQEG0HOIqI5XVCdNB">
+        <category
+            name="Web Tools Platform (WTP)"/>
+    </feature>
+    <feature
+        id="org.eclipse.wst.xml_sdk.feature"
+        url="features/org.eclipse.wst.xml_sdk.feature_3.0.4.v200811211541-79-7A8CV8Qm2AVE8A_Gfv2wboWck.jar"
+        version="3.0.4.v200811211541-79-7A8CV8Qm2AVE8A_Gfv2wboWck">
+        <category
+            name="Web Tools Platform (WTP)"/>
+    </feature>
+    <feature
+        id="org.eclipse.wst.sdk"
+        url="features/org.eclipse.wst.sdk_3.0.4.v200811190840-7D-8p8XkFmigm4jQp_cqdqM0dr6H.jar"
+        version="3.0.4.v200811190840-7D-8p8XkFmigm4jQp_cqdqM0dr6H">
+        <category
+            name="Web Tools Platform (WTP)"/>
+    </feature>
+    <feature
+        id="org.eclipse.jst.sdk"
+        url="features/org.eclipse.jst.sdk_3.0.4.v200811190840-7X1999RLz-ynoIpJ-LqlU6fxnS3G.jar"
+        version="3.0.4.v200811190840-7X1999RLz-ynoIpJ-LqlU6fxnS3G">
+        <category
+            name="Web Tools Platform (WTP)"/>
+    </feature>
+    <feature
+        id="org.eclipse.jpt_sdk.feature"
+        url="features/org.eclipse.jpt_sdk.feature_2.0.103.v200901160200-5-_C90H8JHHjYPIBKaJqOSUBDZRD.jar"
+        version="2.0.103.v200901160200-5-_C90H8JHHjYPIBKaJqOSUBDZRD">
+        <category
+            name="Web Tools Platform (WTP)"/>
+    </feature>
+    <feature
+        id="org.eclipse.jpt.eclipselink_sdk.feature"
+        url="features/org.eclipse.jpt.eclipselink_sdk.feature_2.0.0.v200805220000-4--8042B1_B6U6G9A59559t844J4.jar"
+        version="2.0.0.v200805220000-4--8042B1_B6U6G9A59559t844J4">
+        <category
+            name="Web Tools Platform (WTP)"/>
+    </feature>
+    <feature
+        id="org.eclipse.wst.common_ui.feature"
+        url="features/org.eclipse.wst.common_ui.feature_3.0.4.v200811200248-7C78ELhE8VrRVqtHp4iT8PuSwZ5W.jar"
+        version="3.0.4.v200811200248-7C78ELhE8VrRVqtHp4iT8PuSwZ5W">
+        <category
+            name="Enabling Features"/>
+    </feature>
+    <feature
+        id="org.eclipse.wst.common_sdk.feature"
+        url="features/org.eclipse.wst.common_sdk.feature_3.0.4.v200811201408-7917A_tTFGuW4SXiJkz-t1Xz-Ez0.jar"
+        version="3.0.4.v200811201408-7917A_tTFGuW4SXiJkz-t1Xz-Ez0">
+        <category
+            name="Enabling Features"/>
+    </feature>
+    <feature
+        id="org.eclipse.jst.webpageeditor_sdk.feature"
+        url="features/org.eclipse.jst.webpageeditor_sdk.feature_2.1.0.v20090128-41-8074Bz0D9_f7JBRDwG_6V6E8O.jar"
+        version="2.1.0.v20090128-41-8074Bz0D9_f7JBRDwG_6V6E8O">
+        <category
+            name="Web Tools Platform (WTP)"/>
+    </feature>
+    <feature
+        id="org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature"
+        url="features/org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature_2.1.0.v200902042324-41-7z4AcIz-76BB54Dl8x422A234.jar"
+        version="2.1.0.v200902042324-41-7z4AcIz-76BB54Dl8x422A234">
+        <category
+            name="Web Tools Platform (WTP)"/>
+    </feature>
+    <feature
+        id="org.eclipse.jst.ws.axis2tools_sdk.feature"
+        url="features/org.eclipse.jst.ws.axis2tools_sdk.feature_1.0.3.v200901220134-2-584B2HLIGdVFHALgXqMmhrDZRD.jar"
+        version="1.0.3.v200901220134-2-584B2HLIGdVFHALgXqMmhrDZRD">
+        <category
+            name="Web Tools Platform (WTP)"/>
+    </feature>
+    <feature
+        id="org.eclipse.wst.xsl_sdk.feature"
+        url="features/org.eclipse.wst.xsl_sdk.feature_0.5.0.v20080804-07949-GB7ZHO-jcQcGiURfiqP7xT.jar"
+        version="0.5.0.v20080804-07949-GB7ZHO-jcQcGiURfiqP7xT">
+        <category
+            name="Web Tools Platform (WTP)"/>
+    </feature>
+    <category-def
+        label="Enabling Features"
+        name="Enabling Features">
+        <description> These features provide functionality required by
+            one or more projects, but do not provide end-user
+            functionality by themselves.</description>
+    </category-def>
+    <category-def
+        label="Web Tools Platform (WTP)"
+        name="Web Tools Platform (WTP)">
+        <description
+            url="http://download.eclipse.org/webtools/updates/index.html"> This category contains the features of the Eclipse Web
+            Tools Project (WTP).</description>
+    </category-def>
+</site>
\ No newline at end of file