231453 P2 doesn't install all features, compared to UpdateManager
diff --git a/features/org.eclipse.wst.web_core.feature/feature.xml b/features/org.eclipse.wst.web_core.feature/feature.xml
index 77e29b4..d0c110d 100644
--- a/features/org.eclipse.wst.web_core.feature/feature.xml
+++ b/features/org.eclipse.wst.web_core.feature/feature.xml
@@ -21,28 +21,25 @@
<update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
</url>
+ <includes
+ id="org.eclipse.wst.ws_core.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.wst.xml_core.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.wst.common_core.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.wst.server_core.feature"
+ version="0.0.0"/>
+
<requires>
- <import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
- <import plugin="com.ibm.icu" version="3.4.4" match="compatible"/>
- <import plugin="org.eclipse.core.commands" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.wst.server.core" version="1.0.102" match="compatible"/>
- <import plugin="org.eclipse.jem.util" version="2.0.0" match="compatible"/>
- <import plugin="org.eclipse.emf.ecore" version="2.2.0" match="compatible"/>
- <import plugin="org.eclipse.wst.common.project.facet.core" version="1.1.0" match="compatible"/>
- <import plugin="org.apache.xerces" version="2.9.0" match="compatible"/>
- <import plugin="org.eclipse.wst.xml.core" version="1.1.300" match="equivalent"/>
- <import plugin="org.eclipse.wst.sse.core" version="1.1.300" match="equivalent"/>
- <import plugin="org.eclipse.core.runtime" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.core.resources" version="3.4.0" match="compatible"/>
- <import plugin="com.ibm.icu" version="3.8.1" match="compatible"/>
- <import plugin="org.eclipse.wst.common.uriresolver" version="1.1.301" match="equivalent"/>
- <import plugin="org.eclipse.wst.css.core" version="1.1.200" match="equivalent"/>
- <import plugin="org.eclipse.wst.common.frameworks" version="1.1.0" match="equivalent"/>
- <import plugin="org.eclipse.wst.validation" version="1.2.0" match="compatible"/>
- <import plugin="org.eclipse.wst.common.emfworkbench.integration" version="1.1.0" match="equivalent"/>
- <import plugin="org.eclipse.wst.common.modulecore" version="1.1.0" match="equivalent"/>
- <import plugin="org.eclipse.wst.common.environment" version="1.0.100" match="equivalent"/>
+ <import feature="org.eclipse.platform" version="3.4.0"/>
+ <import feature="org.eclipse.emf.ecore" version="2.4.0"/>
</requires>
<plugin
diff --git a/features/org.eclipse.wst.web_ui.feature/feature.xml b/features/org.eclipse.wst.web_ui.feature/feature.xml
index 10c4dac..0897c01 100644
--- a/features/org.eclipse.wst.web_ui.feature/feature.xml
+++ b/features/org.eclipse.wst.web_ui.feature/feature.xml
@@ -34,65 +34,8 @@
version="0.0.0"/>
<requires>
- <import plugin="com.ibm.icu" version="3.4.4" match="compatible"/>
- <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.core.filebuffers" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.wst.validation" version="1.1.0" match="compatible"/>
- <import plugin="org.eclipse.jface.text" version="3.2.0"/>
- <import plugin="org.eclipse.wst.jsdt.core"/>
- <import plugin="org.eclipse.wst.common.project.facet.core" version="1.1.0"/>
- <import plugin="org.eclipse.swt"/>
- <import plugin="org.eclipse.wst.common.modulecore" version="1.1.0"/>
- <import plugin="org.eclipse.ui.ide" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.jface.text" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.ui.workbench.texteditor" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.ui" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.wst.sse.ui" version="1.0.101"/>
- <import plugin="org.eclipse.debug.core" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.search" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.ltk.core.refactoring" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.wst.jsdt.ui"/>
- <import plugin="org.eclipse.wst.jsdt.manipulation"/>
- <import plugin="org.eclipse.debug.ui" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.ui.views" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.wst.common.project.facet.core" version="1.1.0" match="compatible"/>
- <import plugin="org.eclipse.wst.server.ui" version="1.0.102" match="compatible"/>
- <import plugin="org.eclipse.emf.ecore" version="2.2.0" match="compatible"/>
- <import plugin="org.eclipse.ui.console" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.wst.sse.core" version="1.1.0" match="equivalent"/>
- <import plugin="org.eclipse.wst.xml.core" version="1.1.0" match="equivalent"/>
- <import plugin="org.eclipse.wst.html.core" version="1.1.0" match="equivalent"/>
- <import plugin="org.eclipse.wst.xml.ui" version="1.0.100" match="equivalent"/>
- <import plugin="org.eclipse.wst.css.core" version="1.1.0" match="equivalent"/>
- <import plugin="org.eclipse.wst.common.uriresolver" version="1.1.0" match="equivalent"/>
- <import plugin="org.eclipse.ui.ide" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.ui.views" version="3.3.0" match="compatible"/>
- <import plugin="org.eclipse.jface.text" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.ui.workbench.texteditor" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.ui" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.wst.xml.ui" version="1.0.400" match="equivalent"/>
- <import plugin="org.eclipse.wst.sse.ui" version="1.1.0" match="equivalent"/>
- <import plugin="org.eclipse.wst.css.core" version="1.1.200" match="equivalent"/>
- <import plugin="org.eclipse.wst.sse.core" version="1.1.300" match="equivalent"/>
- <import plugin="org.eclipse.wst.html.core" version="1.1.200" match="equivalent"/>
- <import plugin="org.eclipse.wst.xml.core" version="1.1.300" match="equivalent"/>
- <import plugin="org.eclipse.core.resources" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.core.runtime" version="3.4.0" match="compatible"/>
- <import plugin="com.ibm.icu" version="3.8.1" match="compatible"/>
- <import plugin="org.eclipse.ui.forms" version="3.3.100" match="equivalent"/>
- <import plugin="org.eclipse.wst.css.ui" version="1.0.300" match="equivalent"/>
- <import plugin="org.eclipse.wst.validation" version="1.2.0" match="equivalent"/>
- <import plugin="org.eclipse.wst.javascript.core" version="1.0.0" match="equivalent"/>
- <import plugin="org.eclipse.wst.common.frameworks" version="1.1.0" match="equivalent"/>
- <import plugin="org.eclipse.wst.common.frameworks.ui" version="1.1.0" match="equivalent"/>
- <import plugin="org.eclipse.wst.web" version="1.1.0" match="equivalent"/>
- <import plugin="org.eclipse.wst.common.modulecore" version="1.1.0" match="equivalent"/>
- <import plugin="org.eclipse.wst.common.project.facet.ui" version="1.3.0" match="compatible"/>
- <import plugin="org.eclipse.wst.common.environment" version="1.0.100" match="equivalent"/>
- <import plugin="org.eclipse.wst.css.ui" version="1.0.0" match="equivalent"/>
- <import plugin="org.eclipse.wst.html.ui" version="1.0.0" match="equivalent"/>
- <import plugin="org.eclipse.wst.jsdt.ui" version="1.0.0" match="equivalent"/>
+ <import feature="org.eclipse.platform" version="3.4.0"/>
+ <import feature="org.eclipse.emf.ecore" version="2.4.0"/>
</requires>
<plugin
diff --git a/features/org.eclipse.wst.xml_core.feature/feature.xml b/features/org.eclipse.wst.xml_core.feature/feature.xml
index 3b63326..ecd7e9f 100644
--- a/features/org.eclipse.wst.xml_core.feature/feature.xml
+++ b/features/org.eclipse.wst.xml_core.feature/feature.xml
@@ -22,26 +22,10 @@
</url>
<requires>
- <import plugin="org.eclipse.osgi"/>
- <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.xsd" version="2.2.0" match="compatible"/>
- <import plugin="org.eclipse.wst.xml.core" version="1.1.0" match="equivalent"/>
- <import plugin="org.eclipse.wst.sse.core" version="1.1.0" match="equivalent"/>
- <import plugin="org.eclipse.core.runtime" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.core.resources" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.wst.common.uriresolver" version="1.1.301" match="equivalent"/>
- <import plugin="org.eclipse.wst.sse.core" version="1.1.300" match="equivalent"/>
- <import plugin="org.eclipse.wst.common.core" version="1.1.101" match="equivalent"/>
- <import plugin="com.ibm.icu" version="3.8.1" match="compatible"/>
- <import plugin="org.eclipse.emf.ecore" version="2.4.0" match="compatible"/>
- <import plugin="org.eclipse.jface.text" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.ui" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.wst.xml.core" version="1.1.300" match="equivalent"/>
- <import plugin="org.eclipse.wst.validation" version="1.2.0" match="equivalent"/>
- <import plugin="org.eclipse.wst.common.uriresolver" version="1.1.0" match="equivalent"/>
- <import plugin="org.eclipse.text" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.core.filebuffers" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.emf.common" version="2.4.0" match="compatible"/>
+ <import feature="org.eclipse.platform" version="3.4.0"/>
+ <import feature="org.eclipse.emf.common" version="2.4.0"/>
+ <import feature="org.eclipse.emf.ecore" version="2.4.0"/>
+ <import feature="org.eclipse.xsd" version="2.4.0"/>
</requires>
<plugin
diff --git a/features/org.eclipse.wst.xml_sdk.feature/build.properties b/features/org.eclipse.wst.xml_sdk.feature/build.properties
index a45b41a..724050e 100644
--- a/features/org.eclipse.wst.xml_sdk.feature/build.properties
+++ b/features/org.eclipse.wst.xml_sdk.feature/build.properties
@@ -3,5 +3,4 @@
epl-v10.html,\
eclipse_update_120.jpg,\
feature.properties
-
-generate.feature@org.eclipse.wst.xml_ui.feature.source=org.eclipse.wst.xml_ui.feature, feature@org.eclipse.wst.xml_core.feature.source
+generate.feature@org.eclipse.wst.xml_ui.feature.source=org.eclipse.wst.xml_ui.feature, feature@org.eclipse.wst.xml_core.feature.source
diff --git a/features/org.eclipse.wst.xml_sdk.feature/feature.xml b/features/org.eclipse.wst.xml_sdk.feature/feature.xml
index 6e14f59..92e0018 100644
--- a/features/org.eclipse.wst.xml_sdk.feature/feature.xml
+++ b/features/org.eclipse.wst.xml_sdk.feature/feature.xml
@@ -21,12 +21,16 @@
<update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
</url>
- <includes
+ <includes
+ id="org.eclipse.wst.common_sdk.feature"
+ version="0.0.0" />
+
+ <includes
id="org.eclipse.wst.xml_ui.feature"
version="0.0.0"/>
- <includes
+
+ <includes
id="org.eclipse.wst.xml_ui.feature.source"
version="0.0.0"/>
-
-
+
</feature>
diff --git a/features/org.eclipse.wst.xml_ui.feature/feature.xml b/features/org.eclipse.wst.xml_ui.feature/feature.xml
index 1be84c1..7f3ea57 100644
--- a/features/org.eclipse.wst.xml_ui.feature/feature.xml
+++ b/features/org.eclipse.wst.xml_ui.feature/feature.xml
@@ -23,6 +23,10 @@
</url>
<includes
+ id="org.eclipse.wst.common_ui.feature"
+ version="0.0.0"/>
+
+ <includes
id="org.eclipse.wst.xml_userdoc.feature"
version="0.0.0"/>
@@ -31,48 +35,12 @@
version="0.0.0"/>
<requires>
- <import plugin="org.eclipse.ui.views.properties.tabbed" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.jface.text" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.ui.workbench.texteditor" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.ui.ide" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.emf.ecore.edit" version="2.2.0" match="compatible"/>
- <import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.xsd.edit" version="2.2.0" match="compatible"/>
- <import plugin="org.eclipse.emf.edit.ui" version="2.2.0" match="compatible"/>
- <import plugin="org.eclipse.ltk.core.refactoring" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.ltk.ui.refactoring" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.search" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.core.resources" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.core.runtime" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.jface.text" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.ui.ide" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.ui.workbench.texteditor" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.wst.common.ui" version="1.1.301" match="equivalent"/>
- <import plugin="org.eclipse.wst.dtd.core" version="1.1.200" match="equivalent"/>
- <import plugin="org.eclipse.wst.sse.core" version="1.1.300" match="equivalent"/>
- <import plugin="org.eclipse.wst.sse.ui" version="1.1.0" match="equivalent"/>
- <import plugin="org.eclipse.wst.xml.core" version="1.1.300" match="equivalent"/>
- <import plugin="org.eclipse.wst.xml.ui" version="1.0.400" match="equivalent"/>
- <import plugin="org.eclipse.wst.common.uriresolver" version="1.1.301" match="equivalent"/>
- <import plugin="org.eclipse.ui.views.properties.tabbed" version="3.4.0" match="compatible"/>
- <import plugin="com.ibm.icu" version="3.8.1" match="compatible"/>
- <import plugin="org.eclipse.debug.ui" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.ui.editors" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.search" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.ui" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.ui.forms" version="3.3.100" match="equivalent"/>
- <import plugin="org.eclipse.ui.views" version="3.3.0" match="compatible"/>
- <import plugin="org.eclipse.wst.sse.core" version="1.1.0" match="equivalent"/>
- <import plugin="org.eclipse.wst.validation" version="1.2.0" match="equivalent"/>
- <import plugin="org.eclipse.emf.common" version="2.4.0" match="compatible"/>
- <import plugin="org.eclipse.core.expressions" version="3.3.0" match="compatible"/>
- <import plugin="org.eclipse.wst.common.uriresolver" version="1.1.0" match="equivalent"/>
- <import plugin="org.eclipse.wst.common.core" version="1.1.0" match="equivalent"/>
- <import plugin="org.eclipse.wst.common.ui" version="1.1.0" match="equivalent"/>
- <import plugin="org.eclipse.gef" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.wst.xsd.core" version="1.1.300" match="equivalent"/>
- <import plugin="org.eclipse.core.filesystem" version="1.2.0" match="compatible"/>
+ <import feature="org.eclipse.platform" version="3.4.0"/>
+ <import feature="org.eclipse.emf.common" version="2.4.0.v200806021643"/>
+ <import feature="org.eclipse.emf.ecore.edit" version="2.4.0.v200806021643"/>
+ <import feature="org.eclipse.emf.edit.ui" version="2.4.0.v200806021643"/>
+ <import feature="org.eclipse.gef" version="3.4.0.v20080115-677-8082A5696H2748"/>
+ <import feature="org.eclipse.xsd.edit" version="2.4.0.v200806021643"/>
</requires>
<plugin
diff --git a/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/build.properties
index 19b7468..dc737af 100644
--- a/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/build.properties
+++ b/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/build.properties
@@ -14,6 +14,5 @@
feature.xml,\
feature.properties,\
license.html
-
-generate.feature@org.eclipse.wst.xml_core.feature.source = org.eclipse.wst.xml_core.feature
+generate.feature@org.eclipse.wst.xml_core.feature.source=org.eclipse.wst.xml_core.feature
