231453 P2 doesn't install all features -- tempTests branch
diff --git a/features/org.eclipse.wst.xml_core.feature/feature.xml b/features/org.eclipse.wst.xml_core.feature/feature.xml
index 3b63326..a2d942d 100644
--- a/features/org.eclipse.wst.xml_core.feature/feature.xml
+++ b/features/org.eclipse.wst.xml_core.feature/feature.xml
@@ -21,27 +21,15 @@
<update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
</url>
+ <includes
+ id="org.eclipse.wst.common_core.feature"
+ version="0.0.0"/>
+
<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.xsd" version="2.4.0"/>
+ <import feature="org.eclipse.emf.common" version="2.4.0"/>
+ <import feature="org.eclipse.emf.ecore" version="2.4.0.v200806021643"/>
</requires>
<plugin
diff --git a/features/org.eclipse.wst.xml_sdk.feature/feature.xml b/features/org.eclipse.wst.xml_sdk.feature/feature.xml
index 6e14f59..657a461 100644
--- a/features/org.eclipse.wst.xml_sdk.feature/feature.xml
+++ b/features/org.eclipse.wst.xml_sdk.feature/feature.xml
@@ -21,12 +21,19 @@
<update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
</url>
- <includes
+ <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"/>
-
+ <includes
+ id="org.eclipse.wst.xml_core.feature"
+ version="0.0.0"/>
+ <includes
+ id="org.eclipse.wst.xml_core.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..a5e3a6e 100644
--- a/features/org.eclipse.wst.xml_ui.feature/feature.xml
+++ b/features/org.eclipse.wst.xml_ui.feature/feature.xml
@@ -31,48 +31,13 @@
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.xsd" version="2.4.0"/>
+ <import feature="org.eclipse.xsd.edit" version="2.4.0"/>
+ <import feature="org.eclipse.gef" version="3.4.0"/>
+ <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.edit" version="2.4.0"/>
+ <import feature="org.eclipse.emf.edit.ui" version="2.4.0"/>
</requires>
<plugin
