231453 P2 doesn't install all features, compared to UpdateManager

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

@@ -27,7 +27,7 @@
    <includes
          id="org.eclipse.wst"
          version="0.0.0"/>
-         
+
    <includes
          id="org.eclipse.jst.common_core.feature"
          version="0.0.0"/>
@@ -60,12 +60,20 @@
          name="%optionalJSFToolsFeatureName"
          optional="true"/>
 
-   <includes 
+   <includes
          id="org.eclipse.jst.ws.axis2tools.feature"
          version="0.0.0"
          name="%optionalAxis2FeatureName"
          optional="true"/>
 
+   <requires>
+      <import feature="org.eclipse.platform" version="3.4.0"/>
+      <import feature="org.eclipse.jdt" version="3.4.0"/>
+      <import feature="org.eclipse.wst.jsdt.feature" version="1.0.0"/>
+      <import feature="org.eclipse.wst.xml_ui.feature" version="3.0.0"/>
+      <import feature="org.eclipse.wst.web_ui.feature" version="3.0.0"/>
+   </requires>
+
    <plugin
          id="org.eclipse.jst"
          download-size="0"

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

@@ -36,10 +36,6 @@
          id="org.eclipse.jst.server_adapters.sdk.feature"
          version="0.0.0"/>
 
-   <includes
-         id="org.eclipse.jst.web_sdk.feature"
-         version="0.0.0"/>
-
    <includes
          id="org.eclipse.jst.enterprise_sdk.feature"
          version="0.0.0"/>
@@ -58,20 +54,15 @@
          id="org.eclipse.jst.ws.axis2tools_sdk.feature"
          version="0.0.0"
          optional="true"/>
-
-	<!-- technically, this last org.eclipse.jst feature include could maybe be avoided, 
-	       but, easier for packaging, update manger etc., if it is there. 
-     -->
+         
    <includes
          id="org.eclipse.jst"
          version="0.0.0"/>
+
    <includes
-         id="org.eclipse.wst"
-         version="0.0.0"/>
-   <includes
-         id="org.eclipse.wst.sdk"
+         id="org.eclipse.wst.web_sdk.feature"
          version="0.0.0"/>
-         
+
    <plugin
          id="org.eclipse.jst"
          download-size="0"

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

@@ -25,23 +25,7 @@
    </url>
 
    <includes
-         id="org.eclipse.wst.ws_wsdl14.feature"
-         version="1.4.0.qualifier"/>
-
-   <includes
-         id="org.eclipse.wst.ws_wsdl15.feature"
-         version="1.5.1.qualifier"/>
-
-   <includes
-         id="org.eclipse.wst.common_ui.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.server_ui.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.server_adapters.feature"
+         id="org.eclipse.wst.jsdt.feature"
          version="0.0.0"/>
 
    <includes
@@ -49,15 +33,11 @@
          version="0.0.0"/>
 
    <includes
-         id="org.eclipse.wst.ws_ui.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.jsdt.feature"
+         id="org.eclipse.wst.web_ui.feature"
          version="0.0.0"/>
 
    <includes
-         id="org.eclipse.wst.web_ui.feature"
+         id="org.eclipse.wst.server_adapters.feature"
          version="0.0.0"/>
 
    <plugin

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

@@ -32,24 +32,10 @@
          id="org.eclipse.wst.xml_sdk.feature"
          version="0.0.0"/>
 
-   <includes
-         id="org.eclipse.wst.server_sdk.feature"
-         version="0.0.0"/>
-
-
-   <includes
-         id="org.eclipse.wst.ws_sdk.feature"
-         version="0.0.0"/>
-
    <includes
          id="org.eclipse.wst.web_sdk.feature"
          version="0.0.0"/>
 
-   <includes
-         id="org.eclipse.wst"
-         version="0.0.0"/>
-
-
    <plugin
          id="org.eclipse.wst"
          download-size="0"