304 with patches
diff --git a/org.eclipse.wtp.releng.webupdatesite/WebContent/site.xml b/org.eclipse.wtp.releng.webupdatesite/WebContent/site.xml
index 0600424..33de5a3 100644
--- a/org.eclipse.wtp.releng.webupdatesite/WebContent/site.xml
+++ b/org.eclipse.wtp.releng.webupdatesite/WebContent/site.xml
@@ -1,1112 +1,229 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<site
-    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">
+<site>
     <description
         url="http://download.eclipse.org/webtools/updates/index.html"> The update site contains the features of the of Eclipse Web
         Tools Project (WTP)</description>
-
-    <!-- dali 2.1.1 -->
     <feature
-        id="org.eclipse.jpt.feature"
         url="features/org.eclipse.jpt.feature_2.1.1.v200902200210-7A79BjDZRDE7GUMQDJGD.jar"
+        id="org.eclipse.jpt.feature"
         version="2.1.1.v200902200210-7A79BjDZRDE7GUMQDJGD">
         <category
             name="Dali 2.1.1"/>
     </feature>
     <feature
-        id="org.eclipse.jpt.eclipselink.feature"
         url="features/org.eclipse.jpt.eclipselink.feature_2.1.1.v200902200210-418a9oB55V6A985975.jar"
+        id="org.eclipse.jpt.eclipselink.feature"
         version="2.1.1.v200902200210-418a9oB55V6A985975">
         <category
             name="Dali 2.1.1"/>
     </feature>
     <feature
-        id="org.eclipse.jpt_sdk.feature"
         url="features/org.eclipse.jpt_sdk.feature_2.1.1.v200902200210-62190JCEXpMgXILDLWWcNVUz-E_S.jar"
+        id="org.eclipse.jpt_sdk.feature"
         version="2.1.1.v200902200210-62190JCEXpMgXILDLWWcNVUz-E_S">
         <category
             name="Dali 2.1.1"/>
     </feature>
     <feature
-        id="org.eclipse.jpt.eclipselink_sdk.feature"
         url="features/org.eclipse.jpt.eclipselink_sdk.feature_2.1.1.v200902200210-511816BdLrGA8YBECACDIiApC66W.jar"
+        id="org.eclipse.jpt.eclipselink_sdk.feature"
         version="2.1.1.v200902200210-511816BdLrGA8YBECACDIiApC66W">
         <category
             name="Dali 2.1.1"/>
     </feature>
-
-
-
-    
-    <!--  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"
+        id="org.eclipse.wst.xml_ui.feature"
         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"
+        id="org.eclipse.wst.jsdt.feature"
         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"
+        id="org.eclipse.wst"
         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"
+        id="org.eclipse.jst"
         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"
+        id="org.eclipse.jpt.feature"
         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"
+        id="org.eclipse.jpt.eclipselink.feature"
         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"
+        id="org.eclipse.jst.webpageeditor.feature"
         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"
+        id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature"
         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"
+        id="org.eclipse.jst.ws.axis2tools.feature"
         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"
+        id="org.eclipse.wst.xsl.feature"
         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"
+        id="org.eclipse.wst.jsdt_sdk.feature"
         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"
+        id="org.eclipse.wst.xml_sdk.feature"
         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"
+        id="org.eclipse.wst.sdk"
         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"
+        id="org.eclipse.jst.sdk"
         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"
+        id="org.eclipse.jpt_sdk.feature"
         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"
+        id="org.eclipse.jpt.eclipselink_sdk.feature"
         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"
+        id="org.eclipse.wst.common_ui.feature"
         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"
+        id="org.eclipse.wst.common_sdk.feature"
         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"
+        id="org.eclipse.jst.webpageeditor_sdk.feature"
         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"
+        id="org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature"
         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"
+        id="org.eclipse.jst.ws.axis2tools_sdk.feature"
         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"
+        id="org.eclipse.wst.xsl_sdk.feature"
         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"
-        version="2.1.0.v200812180210-7979AgCYQCD4IRJdCEDC">
-        <category
-            name="Dali 2.1"/>
-    </feature>
-    <feature
-        id="org.eclipse.jpt.eclipselink.feature"
-        url="features/org.eclipse.jpt.eclipselink.feature_2.1.0.v200812180210-318Y9oA55S8_795555.jar"
-        version="2.1.0.v200812180210-318Y9oA55S8_795555">
-        <category
-            name="Dali 2.1"/>
-    </feature>
-    <feature
-        id="org.eclipse.jpt_sdk.feature"
-        url="features/org.eclipse.jpt_sdk.feature_2.1.0.v200808210000-52-90HBDVnLfeHK_NTTpMQRwDZRD.jar"
-        version="2.1.0.v200808210000-52-90HBDVnLfeHK_NTTpMQRwDZRD">
-        <category
-            name="Dali 2.1"/>
-    </feature>
-    <feature
-        id="org.eclipse.jpt.eclipselink_sdk.feature"
-        url="features/org.eclipse.jpt.eclipselink_sdk.feature_2.1.0.v200808210000-41-806AbJsF9FVCD_AA9Fg_pB66T.jar"
-        version="2.1.0.v200808210000-41-806AbJsF9FVCD_AA9Fg_pB66T">
-        <category
-            name="Dali 2.1"/>
-    </feature>
-
-
-
-
-    <!--  3.0.3 -->
-    <feature
-        id="org.eclipse.wst.xml_ui.feature"
-        url="features/org.eclipse.wst.xml_ui.feature_3.0.3.v200809292000-7F2ENZCwum8U9-9yPhHnPkSb2VAc.jar"
-        version="3.0.3.v200809292000-7F2ENZCwum8U9-9yPhHnPkSb2VAc">
-        <category
-            name="Web Tools Platform (WTP) 3.0.3"/>
-    </feature>
-    <feature
-        id="org.eclipse.wst.jsdt.feature"
-        url="features/org.eclipse.wst.jsdt.feature_1.0.3.v200810020426-6-E73BcMAAwFIFUHpRJ.jar"
-        version="1.0.3.v200810020426-6-E73BcMAAwFIFUHpRJ">
-        <category
-            name="Web Tools Platform (WTP) 3.0.3"/>
-    </feature>
-    <feature
-        id="org.eclipse.wst"
-        url="features/org.eclipse.wst_3.0.3.v200809250443-7A-8i8Qqcz0FaVgjXSD6brFQN64Z.jar"
-        version="3.0.3.v200809250443-7A-8i8Qqcz0FaVgjXSD6brFQN64Z">
-        <category
-            name="Web Tools Platform (WTP) 3.0.3"/>
-    </feature>
-    <feature
-        id="org.eclipse.jst"
-        url="features/org.eclipse.jst_3.0.3.v200809250443-7U-9-9LJGGJebgG8HYgv5FBP0NUr.jar"
-        version="3.0.3.v200809250443-7U-9-9LJGGJebgG8HYgv5FBP0NUr">
-        <category
-            name="Web Tools Platform (WTP) 3.0.3"/>
-    </feature>
-    <feature
-        id="org.eclipse.jpt.feature"
-        url="features/org.eclipse.jpt.feature_2.0.102.v200810160200-793DxCYQCD4FdGcCMCC.jar"
-        version="2.0.102.v200810160200-793DxCYQCD4FdGcCMCC">
-        <category
-            name="Web Tools Platform (WTP) 3.0.3"/>
-    </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.3"/>
-    </feature>
-    <feature
-        id="org.eclipse.jst.webpageeditor.feature"
-        url="features/org.eclipse.jst.webpageeditor.feature_2.0.1.v20080811-32-9oA55S5M5J.jar"
-        version="2.0.1.v20080811-32-9oA55S5M5J">
-        <category
-            name="Web Tools Platform (WTP) 3.0.3"/>
-    </feature>
-    <feature
-        id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature"
-        url="features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature_2.0.1.v200808071446-1-8Y7w311919182557.jar"
-        version="2.0.1.v200808071446-1-8Y7w311919182557">
-        <category
-            name="Web Tools Platform (WTP) 3.0.3"/>
-    </feature>
-    <feature
-        id="org.eclipse.jst.ws.axis2tools.feature"
-        url="features/org.eclipse.jst.ws.axis2tools.feature_1.0.2.v200810151341-77-E_ECYQCD4FdMjLXVW.jar"
-        version="1.0.2.v200810151341-77-E_ECYQCD4FdMjLXVW">
-        <category
-            name="Web Tools Platform (WTP) 3.0.3"/>
-    </feature>
-
-    <feature
-        id="org.eclipse.wst.jsdt_sdk.feature"
-        url="features/org.eclipse.wst.jsdt_sdk.feature_1.0.3.v200810020426-2-5834H_DFfPFE1KRHdK5bPCdNBB.jar"
-        version="1.0.3.v200810020426-2-5834H_DFfPFE1KRHdK5bPCdNBB">
-        <category
-            name="Web Tools Platform (WTP) 3.0.3"/>
-    </feature>
-    <feature
-        id="org.eclipse.wst.xml_sdk.feature"
-        url="features/org.eclipse.wst.xml_sdk.feature_3.0.3.v200809292000-79-788CV8QipIVM954JWnz0nnhEl.jar"
-        version="3.0.3.v200809292000-79-788CV8QipIVM954JWnz0nnhEl">
-        <category
-            name="Web Tools Platform (WTP) 3.0.3"/>
-    </feature>
-    <feature
-        id="org.eclipse.wst.sdk"
-        url="features/org.eclipse.wst.sdk_3.0.3.v200809250443-7D-8l8XkDnRhz-ylP58ABwz-FP3f.jar"
-        version="3.0.3.v200809250443-7D-8l8XkDnRhz-ylP58ABwz-FP3f">
-        <category
-            name="Web Tools Platform (WTP) 3.0.3"/>
-    </feature>
-    <feature
-        id="org.eclipse.jst.sdk"
-        url="features/org.eclipse.jst.sdk_3.0.3.v200809250443-7X-929RHrz0KW_z0ncerPn5CQKNI.jar"
-        version="3.0.3.v200809250443-7X-929RHrz0KW_z0ncerPn5CQKNI">
-        <category
-            name="Web Tools Platform (WTP) 3.0.3"/>
-    </feature>
-    <feature
-        id="org.eclipse.jpt_sdk.feature"
-        url="features/org.eclipse.jpt_sdk.feature_2.0.102.v200810160200-5-_A90H8JFIiYPIAKiImOSUADZRD.jar"
-        version="2.0.102.v200810160200-5-_A90H8JFIiYPIAKiImOSUADZRD">
-        <category
-            name="Web Tools Platform (WTP) 3.0.3"/>
-    </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.3"/>
-    </feature>
-    <feature
-        id="org.eclipse.wst.common_ui.feature"
-        url="features/org.eclipse.wst.common_ui.feature_3.0.3.v200809301154-7C78ELcE8VrRVouGlyiT4DsUuV8Y.jar"
-        version="3.0.3.v200809301154-7C78ELcE8VrRVouGlyiT4DsUuV8Y">
-        <category
-            name="Enabling Features 3.0.3"/>
-    </feature>
-    <feature
-        id="org.eclipse.wst.common_sdk.feature"
-        url="features/org.eclipse.wst.common_sdk.feature_3.0.3.v200809301154-79178_tTFGtW6TRjFnxr2Ww7z0sj.jar"
-        version="3.0.3.v200809301154-79178_tTFGtW6TRjFnxr2Ww7z0sj">
-        <category
-            name="Enabling Features 3.0.3"/>
-    </feature>
-    <feature
-        id="org.eclipse.jst.webpageeditor_sdk.feature"
-        url="features/org.eclipse.jst.webpageeditor_sdk.feature_2.0.1.v20080811-4-18072Bz-DF9W7S_L_pB66T6N6K.jar"
-        version="2.0.1.v20080811-4-18072Bz-DF9W7S_L_pB66T6N6K">
-        <category
-            name="Web Tools Platform (WTP) 3.0.3"/>
-    </feature>
-    <feature
-        id="org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature"
-        url="features/org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature_2.0.1.v20080811-4-17z4AbHz-D4AC8F__67Fi8x422.jar"
-        version="2.0.1.v20080811-4-17z4AbHz-D4AC8F__67Fi8x422">
-        <category
-            name="Web Tools Platform (WTP) 3.0.3"/>
-    </feature>
-    <feature
-        id="org.eclipse.jst.ws.axis2tools_sdk.feature"
-        url="features/org.eclipse.jst.ws.axis2tools_sdk.feature_1.0.2.v200810151341-2-384B2HKIFcYGJAJfWtNpioDZRD.jar"
-        version="1.0.2.v200810151341-2-384B2HKIFcYGJAJfWtNpioDZRD">
-        <category
-            name="Web Tools Platform (WTP) 3.0.3"/>
-    </feature>
-
-    <!-- 3.0.2 -->
-    <feature
-        id="org.eclipse.wst.xml_ui.feature"
-        url="features/org.eclipse.wst.xml_ui.feature_3.0.2.v200809120241-7F2ENKCwum6y6I7yPZPz0PesY7SI.jar"
-        version="3.0.2.v200809120241-7F2ENKCwum6y6I7yPZPz0PesY7SI">
-        <category
-            name="Web Tools Platform (WTP) 3.0.2"/>
-    </feature>
-    <feature
-        id="org.eclipse.wst.jsdt.feature"
-        url="features/org.eclipse.wst.jsdt.feature_1.0.2.v200809102023-6-7SBcMAAwAyIPHRNV.jar"
-        version="1.0.2.v200809102023-6-7SBcMAAwAyIPHRNV">
-        <category
-            name="Web Tools Platform (WTP) 3.0.2"/>
-    </feature>
-    <feature
-        id="org.eclipse.wst"
-        url="features/org.eclipse.wst_3.0.2.v200808250510-7A-8f8QqVJLTFUkFahb1QIq2z0t8.jar"
-        version="3.0.2.v200808250510-7A-8f8QqVJLTFUkFahb1QIq2z0t8">
-        <category
-            name="Web Tools Platform (WTP) 3.0.2"/>
-    </feature>
-    <feature
-        id="org.eclipse.jst"
-        url="features/org.eclipse.jst_3.0.2.v200808250510-7U-8r9LJ9cNr7UGsQ02P0aZsUk1o.jar"
-        version="3.0.2.v200808250510-7U-8r9LJ9cNr7UGsQ02P0aZsUk1o">
-        <category
-            name="Web Tools Platform (WTP) 3.0.2"/>
-    </feature>
-    <feature
-        id="org.eclipse.jpt.feature"
-        url="features/org.eclipse.jpt.feature_2.0.101.v200809030200-793DuCYQCD4D2DUEKHL.jar"
-        version="2.0.101.v200809030200-793DuCYQCD4D2DUEKHL">
-        <category
-            name="Web Tools Platform (WTP) 3.0.2"/>
-    </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.2"/>
-    </feature>
-    <feature
-        id="org.eclipse.jst.webpageeditor.feature"
-        url="features/org.eclipse.jst.webpageeditor.feature_2.0.1.v20080811-32-9oA55S5M5J.jar"
-        version="2.0.1.v20080811-32-9oA55S5M5J">
-        <category
-            name="Web Tools Platform (WTP) 3.0.2"/>
-    </feature>
-    <feature
-        id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature"
-        url="features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature_2.0.1.v200808071446-1-8Y7w311919182557.jar"
-        version="2.0.1.v200808071446-1-8Y7w311919182557">
-        <category
-            name="Web Tools Platform (WTP) 3.0.2"/>
-    </feature>
-    <feature
-        id="org.eclipse.jst.ws.axis2tools.feature"
-        url="features/org.eclipse.jst.ws.axis2tools.feature_1.0.1.v200807092124-77-E_BCYQCD4CyNjOPRU.jar"
-        version="1.0.1.v200807092124-77-E_BCYQCD4CyNjOPRU">
-        <category
-            name="Web Tools Platform (WTP) 3.0.2"/>
-    </feature>
-
-    <feature
-        id="org.eclipse.wst.jsdt_sdk.feature"
-        url="features/org.eclipse.wst.jsdt_sdk.feature_1.0.2.v200809120237-2-3834_VMfYEE-E1ORQTY-CdNBBx.jar"
-        version="1.0.2.v200809120237-2-3834_VMfYEE-E1ORQTY-CdNBBx">
-        <category
-            name="Web Tools Platform (WTP) 3.0.2"/>
-    </feature>
-    <feature
-        id="org.eclipse.wst.xml_sdk.feature"
-        url="features/org.eclipse.wst.xml_sdk.feature_3.0.2.v200809120241-79-58CV8OlGvGGijBdr2XCjiLz0L.jar"
-        version="3.0.2.v200809120241-79-58CV8OlGvGGijBdr2XCjiLz0L">
-        <category
-            name="Web Tools Platform (WTP) 3.0.2"/>
-    </feature>
-    <feature
-        id="org.eclipse.wst.sdk"
-        url="features/org.eclipse.wst.sdk_3.0.2.v200808250510-7D-8h8XkBlIn7p4SmEurcz-R-HFk.jar"
-        version="3.0.2.v200808250510-7D-8h8XkBlIn7p4SmEurcz-R-HFk">
-        <category
-            name="Web Tools Platform (WTP) 3.0.2"/>
-    </feature>
-    <feature
-        id="org.eclipse.jst.sdk"
-        url="features/org.eclipse.jst.sdk_3.0.2.v200808250510-7X-8t9RHfw5bJr6Ui42nwRZQfHMh.jar"
-        version="3.0.2.v200808250510-7X-8t9RHfw5bJr6Ui42nwRZQfHMh">
-        <category
-            name="Web Tools Platform (WTP) 3.0.2"/>
-    </feature>
-    <feature
-        id="org.eclipse.jpt_sdk.feature"
-        url="features/org.eclipse.jpt_sdk.feature_2.0.101.v200809030200-5-_990H8JCHrXMIAI7FeQQZGDZRD.jar"
-        version="2.0.101.v200809030200-5-_990H8JCHrXMIAI7FeQQZGDZRD">
-        <category
-            name="Web Tools Platform (WTP) 3.0.2"/>
-    </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.2"/>
-    </feature>
-    <feature
-        id="org.eclipse.wst.common_ui.feature"
-        url="features/org.eclipse.wst.common_ui.feature_3.0.2.v200809102124-7C78ELYE8VrRVorQo1kX3DsOgXz0.jar"
-        version="3.0.2.v200809102124-7C78ELYE8VrRVorQo1kX3DsOgXz0">
-        <category
-            name="Enabling Features 3.0.2"/>
-    </feature>
-    <feature
-        id="org.eclipse.wst.common_sdk.feature"
-        url="features/org.eclipse.wst.common_sdk.feature_3.0.2.v200809111955-7915_tTFGtV7RTkFhrr-gyC0weW1.jar"
-        version="3.0.2.v200809111955-7915_tTFGtV7RTkFhrr-gyC0weW1">
-        <category
-            name="Enabling Features 3.0.2"/>
-    </feature>
-    <feature
-        id="org.eclipse.jst.webpageeditor_sdk.feature"
-        url="features/org.eclipse.jst.webpageeditor_sdk.feature_2.0.1.v20080811-4-18072Bz-DF9W7S_L_pB66T6N6K.jar"
-        version="2.0.1.v20080811-4-18072Bz-DF9W7S_L_pB66T6N6K">
-        <category
-            name="Web Tools Platform (WTP) 3.0.2"/>
-    </feature>
-    <feature
-        id="org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature"
-        url="features/org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature_2.0.1.v20080811-4-17z4AbHz-D4AC8F__67Fi8x422.jar"
-        version="2.0.1.v20080811-4-17z4AbHz-D4AC8F__67Fi8x422">
-        <category
-            name="Web Tools Platform (WTP) 3.0.2"/>
-    </feature>
-    <feature
-        id="org.eclipse.jst.ws.axis2tools_sdk.feature"
-        url="features/org.eclipse.jst.ws.axis2tools_sdk.feature_1.0.1.v200807220139-2-184B2HKEMbcHH9Jz0XtQhejDZR.jar"
-        version="1.0.1.v200807220139-2-184B2HKEMbcHH9Jz0XtQhejDZR">
-        <category
-            name="Web Tools Platform (WTP) 3.0.2"/>
-    </feature>
-
-
-    <!-- 3.0.1 -->
-    <feature
-        id="org.eclipse.wst.xml_ui.feature"
-        url="features/org.eclipse.wst.xml_ui.feature_3.0.1.v200807220139-7F2EN7Cwum5N6894QkL-QahXCXJY.jar"
-        version="3.0.1.v200807220139-7F2EN7Cwum5N6894QkL-QahXCXJY">
-        <category
-            name="Web Tools Platform (WTP) 3.0.1"/>
-    </feature>
-    <feature
-        id="org.eclipse.wst.jsdt.feature"
-        url="features/org.eclipse.wst.jsdt.feature_1.0.1.v200807220139-6-5BcMAAwArNMJWHI.jar"
-        version="1.0.1.v200807220139-6-5BcMAAwArNMJWHI">
-        <category
-            name="Web Tools Platform (WTP) 3.0.1"/>
-    </feature>
-    <feature
-        id="org.eclipse.wst"
-        url="features/org.eclipse.wst_3.0.1.v200807220139-7A-8c8QqT3lv4VSXAI28OHWz-I88.jar"
-        version="3.0.1.v200807220139-7A-8c8QqT3lv4VSXAI28OHWz-I88">
-        <category
-            name="Web Tools Platform (WTP) 3.0.1"/>
-    </feature>
-    <feature
-        id="org.eclipse.jst"
-        url="features/org.eclipse.jst_3.0.1.v200807220139-7U-8k9LJ7Lo2oV080cQz-eAPH2D_.jar"
-        version="3.0.1.v200807220139-7U-8k9LJ7Lo2oV080cQz-eAPH2D_">
-        <category
-            name="Web Tools Platform (WTP) 3.0.1"/>
-    </feature>
-    <feature
-        id="org.eclipse.jpt.feature"
-        url="features/org.eclipse.jpt.feature_2.0.100.v200807280200-793DqCYQCD4CwFhCICC.jar"
-        version="2.0.100.v200807280200-793DqCYQCD4CwFhCICC">
-        <category
-            name="Web Tools Platform (WTP) 3.0.1"/>
-    </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.1"/>
-    </feature>
-    <feature
-        id="org.eclipse.jst.webpageeditor.feature"
-        url="features/org.eclipse.jst.webpageeditor.feature_2.0.1.v20080811-32-9oA55S5M5J.jar"
-        version="2.0.1.v20080811-32-9oA55S5M5J">
-        <category
-            name="Web Tools Platform (WTP) 3.0.1"/>
-    </feature>
-    <feature
-        id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature"
-        url="features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature_2.0.1.v200808071446-1-8Y7w311919182557.jar"
-        version="2.0.1.v200808071446-1-8Y7w311919182557">
-        <category
-            name="Web Tools Platform (WTP) 3.0.1"/>
-    </feature>
-    <feature
-        id="org.eclipse.jst.ws.axis2tools.feature"
-        url="features/org.eclipse.jst.ws.axis2tools.feature_1.0.1.v200807092124-77-E_BCYQCD4CyNjOPRU.jar"
-        version="1.0.1.v200807092124-77-E_BCYQCD4CyNjOPRU">
-        <category
-            name="Web Tools Platform (WTP) 3.0.1"/>
-    </feature>
-
-    <feature
-        id="org.eclipse.wst.jsdt_sdk.feature"
-        url="features/org.eclipse.wst.jsdt_sdk.feature_1.0.1.v200807220139-2-18348EnPKG-DvTYLfJQCdNBBxB.jar"
-        version="1.0.1.v200807220139-2-18348EnPKG-DvTYLfJQCdNBBxB">
-        <category
-            name="Web Tools Platform (WTP) 3.0.1"/>
-    </feature>
-    <feature
-        id="org.eclipse.wst.xml_sdk.feature"
-        url="features/org.eclipse.wst.xml_sdk.feature_3.0.1.v200807220139-79-28CV8Ml3tHGigYmi1fEz-dAGZ.jar"
-        version="3.0.1.v200807220139-79-28CV8Ml3tHGigYmi1fEz-dAGZ">
-        <category
-            name="Web Tools Platform (WTP) 3.0.1"/>
-    </feature>
-    <feature
-        id="org.eclipse.wst.sdk"
-        url="features/org.eclipse.wst.sdk_3.0.1.v200807220700-7D-8d8Xk_gDAPsvAs2skPNyK4w1K.jar"
-        version="3.0.1.v200807220700-7D-8d8Xk_gDAPsvAs2skPNyK4w1K">
-        <category
-            name="Web Tools Platform (WTP) 3.0.1"/>
-    </feature>
-    <feature
-        id="org.eclipse.jst.sdk"
-        url="features/org.eclipse.jst.sdk_3.0.1.v200807220139-7X-8l9RHXoy-cuxCKhtdbouqIDpM.jar"
-        version="3.0.1.v200807220139-7X-8l9RHXoy-cuxCKhtdbouqIDpM">
-        <category
-            name="Web Tools Platform (WTP) 3.0.1"/>
-    </feature>
-    <feature
-        id="org.eclipse.jpt_sdk.feature"
-        url="features/org.eclipse.jpt_sdk.feature_2.0.100.v200807280200-5-_790H8J9HpZRIAI-HrOOU4DZRD.jar"
-        version="2.0.100.v200807280200-5-_790H8J9HpZRIAI-HrOOU4DZRD">
-        <category
-            name="Web Tools Platform (WTP) 3.0.1"/>
-    </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.1"/>
-    </feature>
-    <feature
-        id="org.eclipse.wst.common_ui.feature"
-        url="features/org.eclipse.wst.common_ui.feature_3.0.1.v200807220139-7C78ELWE8VrRVorIr-jb1AsOaXHW.jar"
-        version="3.0.1.v200807220139-7C78ELWE8VrRVorIr-jb1AsOaXHW">
-        <category
-            name="Enabling Features 3.0.1"/>
-    </feature>
-    <feature
-        id="org.eclipse.wst.common_sdk.feature"
-        url="features/org.eclipse.wst.common_sdk.feature_3.0.1.v200807220139-7913_tTFGtV3SViFiwr-Z-A-z0aT.jar"
-        version="3.0.1.v200807220139-7913_tTFGtV3SViFiwr-Z-A-z0aT">
-        <category
-            name="Enabling Features 3.0.1"/>
-    </feature>
-    <feature
-        id="org.eclipse.jst.webpageeditor_sdk.feature"
-        url="features/org.eclipse.jst.webpageeditor_sdk.feature_2.0.1.v20080811-4-18072Bz-DF9W7S_L_pB66T6N6K.jar"
-        version="2.0.1.v20080811-4-18072Bz-DF9W7S_L_pB66T6N6K">
-        <category
-            name="Web Tools Platform (WTP) 3.0.1"/>
-    </feature>
-    <feature
-        id="org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature"
-        url="features/org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature_2.0.1.v20080811-4-17z4AbHz-D4AC8F__67Fi8x422.jar"
-        version="2.0.1.v20080811-4-17z4AbHz-D4AC8F__67Fi8x422">
-        <category
-            name="Web Tools Platform (WTP) 3.0.1"/>
-    </feature>
-    <feature
-        id="org.eclipse.jst.ws.axis2tools_sdk.feature"
-        url="features/org.eclipse.jst.ws.axis2tools_sdk.feature_1.0.1.v200807220139-2-184B2HKEMbcHH9Jz0XtQhejDZR.jar"
-        version="1.0.1.v200807220139-2-184B2HKEMbcHH9Jz0XtQhejDZR">
-        <category
-            name="Web Tools Platform (WTP) 3.0.1"/>
-    </feature>
-
-    <feature
-        id="org.eclipse.wst.xml_ui.feature"
-        url="features/org.eclipse.wst.xml_ui.feature_3.0.0.v200806092130-7F2EN0Cwum5M5u64RsGoSUMYCSXS.jar"
-        version="3.0.0.v200806092130-7F2EN0Cwum5M5u64RsGoSUMYCSXS">
-        <category
-            name="Web Tools Platform (WTP) 3.0.0"/>
-    </feature>
-    <feature
-        id="org.eclipse.wst.jsdt.feature"
-        url="features/org.eclipse.wst.jsdt.feature_1.0.0.v200806092130-6--BcMAAwAbQRLQLo.jar"
-        version="1.0.0.v200806092130-6--BcMAAwAbQRLQLo">
-        <category
-            name="Web Tools Platform (WTP) 3.0.0"/>
-    </feature>
-    <feature
-        id="org.eclipse.wst"
-        url="features/org.eclipse.wst_3.0.0.v200806092130-7A-8Y8QqN2lf4VSWrI2ek5Pf4k7s.jar"
-        version="3.0.0.v200806092130-7A-8Y8QqN2lf4VSWrI2ek5Pf4k7s">
-        <category
-            name="Web Tools Platform (WTP) 3.0.0"/>
-    </feature>
-    <feature
-        id="org.eclipse.jst"
-        url="features/org.eclipse.jst_3.0.0.v200806111800-7U-8Y9LIrwYBUV7sHGjhtz0LTrMd.jar"
-        version="3.0.0.v200806111800-7U-8Y9LIrwYBUV7sHGjhtz0LTrMd">
-        <category
-            name="Web Tools Platform (WTP) 3.0.0"/>
-    </feature>
-    <feature
-        id="org.eclipse.jpt.feature"
-        url="features/org.eclipse.jpt.feature_2.0.0.v200806090000-7938aCYQCD4CmHbCCCC.jar"
-        version="2.0.0.v200806090000-7938aCYQCD4CmHbCCCC">
-        <category
-            name="Web Tools Platform (WTP) 3.0.0"/>
-    </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.0"/>
-    </feature>
-    <feature
-        id="org.eclipse.jst.webpageeditor.feature"
-        url="features/org.eclipse.jst.webpageeditor.feature_2.0.0.v200805191452-32-9oA55S5M5J.jar"
-        version="2.0.0.v200805191452-32-9oA55S5M5J">
-        <category
-            name="Web Tools Platform (WTP) 3.0.0"/>
-    </feature>
-    <feature
-        id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature"
-        url="features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature_2.0.0.v20080605-1--7w31191716.jar"
-        version="2.0.0.v20080605-1--7w31191716">
-        <category
-            name="Web Tools Platform (WTP) 3.0.0"/>
-    </feature>
-    <feature
-        id="org.eclipse.jst.ws.axis2tools.feature"
-        url="features/org.eclipse.jst.ws.axis2tools.feature_1.0.0.v200805191452-77-E_5CYQCD4ClWDK1Wj.jar"
-        version="1.0.0.v200805191452-77-E_5CYQCD4ClWDK1Wj">
-        <category
-            name="Web Tools Platform (WTP) 3.0.0"/>
-    </feature>
-
-    <feature
-        id="org.eclipse.wst.jsdt_sdk.feature"
-        url="features/org.eclipse.wst.jsdt_sdk.feature_1.0.0.v200806040130-2--8342EnPJE6FfWUNZNqCdNBBxB.jar"
-        version="1.0.0.v200806040130-2--8342EnPJE6FfWUNZNqCdNBBxB">
-        <category
-            name="Web Tools Platform (WTP) 3.0.0"/>
-    </feature>
-    <feature
-        id="org.eclipse.wst.xml_sdk.feature"
-        url="features/org.eclipse.wst.xml_sdk.feature_3.0.0.v200806092130-79--8CV8IkysFNkgPdQ0aB-Yt6RK.jar"
-        version="3.0.0.v200806092130-79--8CV8IkysFNkgPdQ0aB-Yt6RK">
-        <category
-            name="Web Tools Platform (WTP) 3.0.0"/>
-    </feature>
-    <feature
-        id="org.eclipse.wst.sdk"
-        url="features/org.eclipse.wst.sdk_3.0.0.v200806110645-7A-8Y8Pj5N752THM_Pk62dwkDiRH.jar"
-        version="3.0.0.v200806110645-7A-8Y8Pj5N752THM_Pk62dwkDiRH">
-        <category
-            name="Web Tools Platform (WTP) 3.0.0"/>
-    </feature>
-    <feature
-        id="org.eclipse.jst.sdk"
-        url="features/org.eclipse.jst.sdk_3.0.0.v200806111800-7X-8Y9RHFdm-LOHlz0MFwKFbZAK7.jar"
-        version="3.0.0.v200806111800-7X-8Y9RHFdm-LOHlz0MFwKFbZAK7">
-        <category
-            name="Web Tools Platform (WTP) 3.0.0"/>
-    </feature>
-    <feature
-        id="org.eclipse.jpt_sdk.feature"
-        url="features/org.eclipse.jpt_sdk.feature_2.0.0.v200805060000-5--90H8CvHoXSI9HrJlOINqDZRDE.jar"
-        version="2.0.0.v200805060000-5--90H8CvHoXSI9HrJlOINqDZRDE">
-        <category
-            name="Web Tools Platform (WTP) 3.0.0"/>
-    </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.0"/>
-    </feature>
-    <feature
-        id="org.eclipse.wst.common_ui.feature"
-        url="features/org.eclipse.wst.common_ui.feature_3.0.0.v200806092130-7C78ELSE8VrRVor6q2hez07sOLYD.jar"
-        version="3.0.0.v200806092130-7C78ELSE8VrRVor6q2hez07sOLYD">
-        <category
-            name="Enabling Features 3.0.0"/>
-    </feature>
-    <feature
-        id="org.eclipse.wst.common_sdk.feature"
-        url="features/org.eclipse.wst.common_sdk.feature_3.0.0.v200806092130-791-_tTFGtUxSTkAdqr-Lz0Cz02S.jar"
-        version="3.0.0.v200806092130-791-_tTFGtUxSTkAdqr-Lz0Cz02S">
-        <category
-            name="Enabling Features 3.0.0"/>
-    </feature>
-    <feature
-        id="org.eclipse.jst.webpageeditor_sdk.feature"
-        url="features/org.eclipse.jst.webpageeditor_sdk.feature_2.0.0.v200805230650-4--8072Bz-DC9e9TCO0430_pB66T.jar"
-        version="2.0.0.v200805230650-4--8072Bz-DC9e9TCO0430_pB66T">
-        <category
-            name="Web Tools Platform (WTP) 3.0.0"/>
-    </feature>
-    <feature
-        id="org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature"
-        url="features/org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature_2.0.0.v20080602-4--7z42A56_4G3A388x422_2827.jar"
-        version="2.0.0.v20080602-4--7z42A56_4G3A388x422_2827">
-        <category
-            name="Web Tools Platform (WTP) 3.0.0"/>
-    </feature>
-    <feature
-        id="org.eclipse.jst.ws.axis2tools_sdk.feature"
-        url="features/org.eclipse.jst.ws.axis2tools_sdk.feature_1.0.0.v200805191452-2--84B2HK8KccGKBHngNMIjrDZRD.jar"
-        version="1.0.0.v200805191452-2--84B2HK8KccGKBHngNMIjrDZRD">
-        <category
-            name="Web Tools Platform (WTP) 3.0.0"/>
-    </feature>
-
-
-
-    <!-- 203 update site -->
-    <feature
-        id="org.eclipse.wst.xml_ui.feature"
-        url="features/org.eclipse.wst.xml_ui.feature_2.0.2.v200802150100-7A1ECMCnbcl1bVs9uNm_Zkieb7Qe.jar"
-        version="2.0.2.v200802150100-7A1ECMCnbcl1bVs9uNm_Zkieb7Qe">
-        <category
-            name="Web Tools Platform (WTP) 2.0.3"/>
-    </feature>
-    <feature
-        id="org.eclipse.wst"
-        url="features/org.eclipse.wst_2.0.3.v200806252211-7C-7E8k0JWS393WFMOOObjNnnqho.jar"
-        version="2.0.3.v200806252211-7C-7E8k0JWS393WFMOOObjNnnqho">
-        <category
-            name="Web Tools Platform (WTP) 2.0.3"/>
-    </feature>
-    <feature
-        id="org.eclipse.jst"
-        url="features/org.eclipse.jst_2.0.3.v200806252211-7B-7A8dDTP3YMr8VaC7iPTrpMx15.jar"
-        version="2.0.3.v200806252211-7B-7A8dDTP3YMr8VaC7iPTrpMx15">
-        <category
-            name="Web Tools Platform (WTP) 2.0.3"/>
-    </feature>
-    <feature
-        id="org.eclipse.jpt.feature"
-        url="features/org.eclipse.jpt.feature_1.0.3.v200806230000-77-7ACYQCD2CbLWCHCD.jar"
-        version="1.0.3.v200806230000-77-7ACYQCD2CbLWCHCD">
-        <category
-            name="Web Tools Platform (WTP) 2.0.3"/>
-    </feature>
-    <feature
-        id="org.eclipse.wst.xml_sdk.feature"
-        url="features/org.eclipse.wst.xml_sdk.feature_2.0.2.v200802150100-4-384F4HNPHrjfp4eY0Myg0ZqZLI.jar"
-        version="2.0.2.v200802150100-4-384F4HNPHrjfp4eY0Myg0ZqZLI">
-        <category
-            name="Web Tools Platform (WTP) 2.0.3"/>
-    </feature>
-    <feature
-        id="org.eclipse.wst.sdk"
-        url="features/org.eclipse.wst.sdk_2.0.3.v200806252211-7E-7H8aNik1SRfsl-PsVkkEZKdiU.jar"
-        version="2.0.3.v200806252211-7E-7H8aNik1SRfsl-PsVkkEZKdiU">
-        <category
-            name="Web Tools Platform (WTP) 2.0.3"/>
-    </feature>
-    <feature
-        id="org.eclipse.jst.sdk"
-        url="features/org.eclipse.jst.sdk_2.0.3.v200806252211-7F-7F8fNgrqqc2fTJwNjJ8_FLTqo.jar"
-        version="2.0.3.v200806252211-7F-7F8fNgrqqc2fTJwNjJ8_FLTqo">
-        <category
-            name="Web Tools Platform (WTP) 2.0.3"/>
-    </feature>
-    <feature
-        id="org.eclipse.jpt_sdk.feature"
-        url="features/org.eclipse.jpt_sdk.feature_1.0.3.v200806230000-2-584B2_LFhVIG5FeNgMJMRDZRDE.jar"
-        version="1.0.3.v200806230000-2-584B2_LFhVIG5FeNgMJMRDZRDE">
-        <category
-            name="Web Tools Platform (WTP) 2.0.3"/>
-    </feature>
-    <feature
-        id="org.eclipse.wst.common_ui.feature"
-        url="features/org.eclipse.wst.common_ui.feature_2.0.2.v200802150100-7C5EH3E9RvTVnirrspVz0bmP7g8d.jar"
-        version="2.0.2.v200802150100-7C5EH3E9RvTVnirrspVz0bmP7g8d">
-        <category
-            name="Enabling Features 2.0.3"/>
-    </feature>
-    <feature
-        id="org.eclipse.wst.common_sdk.feature"
-        url="features/org.eclipse.wst.common_sdk.feature_2.0.2.v200802150100-4-384H8HS6JCZyXYql06-5r3HoFL.jar"
-        version="2.0.2.v200802150100-4-384H8HS6JCZyXYql06-5r3HoFL">
-        <category
-            name="Enabling Features 2.0.3"/>
-    </feature>
-
-
-    <!-- 303 patches -->
-    <feature
-        id="org.eclipse.jst.enterprise_ui.feature.patch"
-        url="features/org.eclipse.jst.enterprise_ui.feature.patch_3.0.3.v200811171815-10_B7w311922282926.jar"
-        version="3.0.3.v200811171815-10_B7w311922282926">
-        <category
-            name="Patch Features"/>
-    </feature>
-
-
-    <!-- 202 update site with patches -->
-    <feature
-        id="org.eclipse.wst.xml_ui.feature"
-        url="features/org.eclipse.wst.xml_ui.feature_2.0.2.v200802150100-7A1ECMCnbcl1bVs9uNm_Zkieb7Qe.jar"
-        version="2.0.2.v200802150100-7A1ECMCnbcl1bVs9uNm_Zkieb7Qe">
-        <category
-            name="Web Tools Platform (WTP) 2.0.2"/>
-    </feature>
-    <feature
-        id="org.eclipse.wst"
-        url="features/org.eclipse.wst_2.0.2.v200802150100-7C-7C8k0JWR293WFMOOObjNnnqho.jar"
-        version="2.0.2.v200802150100-7C-7C8k0JWR293WFMOOObjNnnqho">
-        <category
-            name="Web Tools Platform (WTP) 2.0.2"/>
-    </feature>
-    <feature
-        id="org.eclipse.jst"
-        url="features/org.eclipse.jst_2.0.2.v200802150100-7B-7_8dDTOvmuz0di_U5vgUfz0em.jar"
-        version="2.0.2.v200802150100-7B-7_8dDTOvmuz0di_U5vgUfz0em">
-        <category
-            name="Web Tools Platform (WTP) 2.0.2"/>
-    </feature>
-    <feature
-        id="org.eclipse.jpt.feature"
-        url="features/org.eclipse.jpt.feature_1.0.2.v200802140100-77-7_CYQCD2CaLYCHCD.jar"
-        version="1.0.2.v200802140100-77-7_CYQCD2CaLYCHCD">
-        <category
-            name="Web Tools Platform (WTP) 2.0.2"/>
-    </feature>
-    <feature
-        id="org.eclipse.wst.xml_sdk.feature"
-        url="features/org.eclipse.wst.xml_sdk.feature_2.0.2.v200802150100-4-384F4HNPHrjfp4eY0Myg0ZqZLI.jar"
-        version="2.0.2.v200802150100-4-384F4HNPHrjfp4eY0Myg0ZqZLI">
-        <category
-            name="Web Tools Platform (WTP) 2.0.2"/>
-    </feature>
-    <feature
-        id="org.eclipse.wst.sdk"
-        url="features/org.eclipse.wst.sdk_2.0.2.v200802150100-7E-7E8aNek-SRfrjr6TqAZAYKdiU.jar"
-        version="2.0.2.v200802150100-7E-7E8aNek-SRfrjr6TqAZAYKdiU">
-        <category
-            name="Web Tools Platform (WTP) 2.0.2"/>
-    </feature>
-    <feature
-        id="org.eclipse.jst.sdk"
-        url="features/org.eclipse.jst.sdk_2.0.2.v200802150100-7F-7D8fNerpqc2VheGP-mWEPz-u9.jar"
-        version="2.0.2.v200802150100-7F-7D8fNerpqc2VheGP-mWEPz-u9">
-        <category
-            name="Web Tools Platform (WTP) 2.0.2"/>
-    </feature>
-    <feature
-        id="org.eclipse.jpt_sdk.feature"
-        url="features/org.eclipse.jpt_sdk.feature_1.0.2.v200802140100-2-384B2_KFdUJG6FdNiMJMQDZRDE.jar"
-        version="1.0.2.v200802140100-2-384B2_KFdUJG6FdNiMJMQDZRDE">
-        <category
-            name="Web Tools Platform (WTP) 2.0.2"/>
-    </feature>
-    <feature
-        id="org.eclipse.wst.common_ui.feature"
-        url="features/org.eclipse.wst.common_ui.feature_2.0.2.v200802150100-7C5EH3E9RvTVnirrspVz0bmP7g8d.jar"
-        version="2.0.2.v200802150100-7C5EH3E9RvTVnirrspVz0bmP7g8d">
-        <category
-            name="Enabling Features 2.0.2"/>
-    </feature>
-    <feature
-        id="org.eclipse.wst.common_sdk.feature"
-        url="features/org.eclipse.wst.common_sdk.feature_2.0.2.v200802150100-4-384H8HS6JCZyXYql06-5r3HoFL.jar"
-        version="2.0.2.v200802150100-4-384H8HS6JCZyXYql06-5r3HoFL">
-        <category
-            name="Enabling Features 2.0.2"/>
-    </feature>
-    <feature
-        id="org.eclipse.wst.server_core.feature.patch"
-        url="features/org.eclipse.wst.server_core.feature.patch_2.0.2.v200803130320-1-_D7w311914191948.jar"
-        version="2.0.2.v200803130320-1-_D7w311914191948">
-        <category
-            name="Patch Features"/>
-    </feature>
-    <feature
+        url="features/org.eclipse.jst.web_core.feature.patch_3.0.4.v200904080413-118u7w311_13381619.jar"
         id="org.eclipse.jst.web_core.feature.patch"
-        url="features/org.eclipse.jst.web_core.feature.patch_2.0.2.v200803130320-108f7w311914182_41.jar"
-        version="2.0.2.v200803130320-108f7w311914182_41">
+        version="3.0.4.v200904080413-118u7w311_13381619">
         <category
             name="Patch Features"/>
     </feature>
     <feature
-        id="org.eclipse.jst.web_core.feature.patch"
-        url="features/org.eclipse.jst.web_core.feature.patch_2.0.2.v200803241913-208i8s733I395D6BA7.jar"
-        version="2.0.2.v200803241913-208i8s733I395D6BA7">
-        <category
-            name="Patch Features"/>
-    </feature>
-    <!--
-        <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>
-    -->
-    <feature
-        id="org.eclipse.jpt.patch"
-        url="features/org.eclipse.jpt.patch_1.0.2.v200803130100-1-27w311914231211.jar"
-        version="1.0.2.v200803130100-1-27w311914231211">
+        url="features/org.eclipse.wst.web_ui.feature.patch_3.0.4.v200904162000-1-8d7w311_15131415.jar"
+        id="org.eclipse.wst.web_ui.feature.patch"
+        version="3.0.4.v200904162000-1-8d7w311_15131415">
         <category
             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.1"
-        name="Dali 2.1.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="Dali 2.1"
-        name="Dali 2.1">
+        name="Dali 2.1.1"
+        label="Dali 2.1.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">
+        name="Enabling Features 3.0.4"
+        label="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.3"
-        name="Web Tools Platform (WTP) 3.0.3">
-        <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="Enabling Features 3.0.2"
-        name="Enabling Features 3.0.2">
-        <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.2"
-        name="Web Tools Platform (WTP) 3.0.2">
-        <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="Enabling Features 3.0.1"
-        name="Enabling Features 3.0.1">
-        <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.1"
-        name="Web Tools Platform (WTP) 3.0.1">
-        <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="Enabling Features 3.0.0"
-        name="Enabling Features 3.0.0">
-        <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.0"
-        name="Web Tools Platform (WTP) 3.0.0">
-        <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="Enabling Features 2.0.3"
-        name="Enabling Features 2.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="Web Tools Platform (WTP) 2.0.3"
-        name="Web Tools Platform (WTP) 2.0.3">
-        <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="Enabling Features 2.0.2"
-        name="Enabling Features 2.0.2">
-        <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) 2.0.2"
-        name="Web Tools Platform (WTP) 2.0.2">
-        <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="Patch Features"
-        name="Patch Features">
+        name="Patch Features"
+        label="Patch Features">
         <description> These features provide fixes to particularly bad
             bugs in released code.</description>
     </category-def>
-</site>
+    <category-def
+        name="Web Tools Platform (WTP) 3.0.4"
+        label="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>
+</site>
\ No newline at end of file
diff --git a/org.eclipse.wtp.releng.webupdatesite/WebContent/site304PlusPatches.xml b/org.eclipse.wtp.releng.webupdatesite/WebContent/site304PlusPatches.xml
index 311eb25..33de5a3 100644
--- a/org.eclipse.wtp.releng.webupdatesite/WebContent/site304PlusPatches.xml
+++ b/org.eclipse.wtp.releng.webupdatesite/WebContent/site304PlusPatches.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<site
-    mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/webtools/tempTestUpdates30x/site.xml&amp;format=xml">
+<site>
     <description
         url="http://download.eclipse.org/webtools/updates/index.html"> The update site contains the features of the of Eclipse Web
         Tools Project (WTP)</description>
@@ -187,76 +186,6 @@
             name="Web Tools Platform (WTP) 3.0.4"/>
     </feature>
     <feature
-        url="features/org.eclipse.wst.xml_ui.feature_2.0.2.v200802150100-7A1ECMCnbcl1bVs9uNm_Zkieb7Qe.jar"
-        id="org.eclipse.wst.xml_ui.feature"
-        version="2.0.2.v200802150100-7A1ECMCnbcl1bVs9uNm_Zkieb7Qe">
-        <category
-            name="Web Tools Platform (WTP) 2.0.3"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.wst_2.0.3.v200806252211-7C-7E8k0JWS393WFMOOObjNnnqho.jar"
-        id="org.eclipse.wst"
-        version="2.0.3.v200806252211-7C-7E8k0JWS393WFMOOObjNnnqho">
-        <category
-            name="Web Tools Platform (WTP) 2.0.3"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jst_2.0.3.v200806252211-7B-7A8dDTP3YMr8VaC7iPTrpMx15.jar"
-        id="org.eclipse.jst"
-        version="2.0.3.v200806252211-7B-7A8dDTP3YMr8VaC7iPTrpMx15">
-        <category
-            name="Web Tools Platform (WTP) 2.0.3"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jpt.feature_1.0.3.v200806230000-77-7ACYQCD2CbLWCHCD.jar"
-        id="org.eclipse.jpt.feature"
-        version="1.0.3.v200806230000-77-7ACYQCD2CbLWCHCD">
-        <category
-            name="Web Tools Platform (WTP) 2.0.3"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.wst.xml_sdk.feature_2.0.2.v200802150100-4-384F4HNPHrjfp4eY0Myg0ZqZLI.jar"
-        id="org.eclipse.wst.xml_sdk.feature"
-        version="2.0.2.v200802150100-4-384F4HNPHrjfp4eY0Myg0ZqZLI">
-        <category
-            name="Web Tools Platform (WTP) 2.0.3"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.wst.sdk_2.0.3.v200806252211-7E-7H8aNik1SRfsl-PsVkkEZKdiU.jar"
-        id="org.eclipse.wst.sdk"
-        version="2.0.3.v200806252211-7E-7H8aNik1SRfsl-PsVkkEZKdiU">
-        <category
-            name="Web Tools Platform (WTP) 2.0.3"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jst.sdk_2.0.3.v200806252211-7F-7F8fNgrqqc2fTJwNjJ8_FLTqo.jar"
-        id="org.eclipse.jst.sdk"
-        version="2.0.3.v200806252211-7F-7F8fNgrqqc2fTJwNjJ8_FLTqo">
-        <category
-            name="Web Tools Platform (WTP) 2.0.3"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.jpt_sdk.feature_1.0.3.v200806230000-2-584B2_LFhVIG5FeNgMJMRDZRDE.jar"
-        id="org.eclipse.jpt_sdk.feature"
-        version="1.0.3.v200806230000-2-584B2_LFhVIG5FeNgMJMRDZRDE">
-        <category
-            name="Web Tools Platform (WTP) 2.0.3"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.wst.common_ui.feature_2.0.2.v200802150100-7C5EH3E9RvTVnirrspVz0bmP7g8d.jar"
-        id="org.eclipse.wst.common_ui.feature"
-        version="2.0.2.v200802150100-7C5EH3E9RvTVnirrspVz0bmP7g8d">
-        <category
-            name="Enabling Features 2.0.3"/>
-    </feature>
-    <feature
-        url="features/org.eclipse.wst.common_sdk.feature_2.0.2.v200802150100-4-384H8HS6JCZyXYql06-5r3HoFL.jar"
-        id="org.eclipse.wst.common_sdk.feature"
-        version="2.0.2.v200802150100-4-384H8HS6JCZyXYql06-5r3HoFL">
-        <category
-            name="Enabling Features 2.0.3"/>
-    </feature>
-    <feature
         url="features/org.eclipse.jst.web_core.feature.patch_3.0.4.v200904080413-118u7w311_13381619.jar"
         id="org.eclipse.jst.web_core.feature.patch"
         version="3.0.4.v200904080413-118u7w311_13381619">
@@ -264,27 +193,13 @@
             name="Patch Features"/>
     </feature>
     <feature
-        url="features/org.eclipse.wst.jsdt.feature.patch_3.0.4.v200904020304-1-8d7w311_15131415.jar"
-        id="org.eclipse.wst.jsdt.feature.patch"
-        version="3.0.4.v200904020304-1-8d7w311_15131415">
+        url="features/org.eclipse.wst.web_ui.feature.patch_3.0.4.v200904162000-1-8d7w311_15131415.jar"
+        id="org.eclipse.wst.web_ui.feature.patch"
+        version="3.0.4.v200904162000-1-8d7w311_15131415">
         <category
             name="Patch Features"/>
     </feature>
     <category-def
-        name="Enabling Features 3.0.4"
-        label="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
-        name="Web Tools Platform (WTP) 3.0.4"
-        label="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
         name="Dali 2.1.1"
         label="Dali 2.1.1">
         <description
@@ -292,23 +207,23 @@
             release of Dali.</description>
     </category-def>
     <category-def
-        name="Enabling Features 2.0.3"
-        label="Enabling Features 2.0.3">
+        name="Enabling Features 3.0.4"
+        label="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
-        name="Web Tools Platform (WTP) 2.0.3"
-        label="Web Tools Platform (WTP) 2.0.3">
-        <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
         name="Patch Features"
         label="Patch Features">
         <description> These features provide fixes to particularly bad
             bugs in released code.</description>
     </category-def>
+    <category-def
+        name="Web Tools Platform (WTP) 3.0.4"
+        label="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>
 </site>
\ No newline at end of file