186506
Reintroduce features pre-reqing bundles
diff --git a/features/org.eclipse.wst.web_core.feature/feature.xml b/features/org.eclipse.wst.web_core.feature/feature.xml
index 23f52e9..1c0ac30 100644
--- a/features/org.eclipse.wst.web_core.feature/feature.xml
+++ b/features/org.eclipse.wst.web_core.feature/feature.xml
@@ -22,10 +22,26 @@
</url>
<requires>
- <import feature="org.eclipse.emf.ecore" version="2.3.0" match="compatible"/>
+ <import plugin="org.apache.xerces" version="2.8.0" match="equivalent"/>
+ <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.2.0" match="compatible"/>
+ <import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible"/>
+ <import plugin="com.ibm.icu" version="3.4.4" match="compatible"/>
+ <import plugin="org.eclipse.wst.common.uriresolver" version="1.1.0" match="equivalent"/>
+ <import plugin="org.eclipse.wst.css.core" version="1.1.0" match="equivalent"/>
+ <import plugin="org.eclipse.wst.common.frameworks" version="1.1.0" match="equivalent"/>
+ <import plugin="org.eclipse.core.commands" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.wst.validation" version="1.1.0" match="equivalent"/>
+ <import plugin="org.eclipse.wst.common.emfworkbench.integration" version="1.1.0" match="equivalent"/>
+ <import plugin="org.eclipse.wst.server.core" version="1.0.102" match="equivalent"/>
+ <import plugin="org.eclipse.jem.util" version="2.0.0" match="compatible"/>
+ <import plugin="org.eclipse.wst.common.modulecore" version="1.1.0" match="equivalent"/>
+ <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.eclipse.wst.common.environment" version="1.0.100" match="equivalent"/>
</requires>
-
<plugin
id="org.eclipse.wst.css.core"
download-size="0"
diff --git a/features/org.eclipse.wst.web_ui.feature/feature.xml b/features/org.eclipse.wst.web_ui.feature/feature.xml
index c332ea0..1b5855f 100644
--- a/features/org.eclipse.wst.web_ui.feature/feature.xml
+++ b/features/org.eclipse.wst.web_ui.feature/feature.xml
@@ -29,6 +29,36 @@
id="org.eclipse.wst.web_core.feature"
version="0.0.0"/>
+ <requires>
+ <import plugin="org.eclipse.ui.ide" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.ui.views" 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.xml.ui" version="1.0.100" match="equivalent"/>
+ <import plugin="org.eclipse.wst.sse.ui" version="1.0.101" match="equivalent"/>
+ <import plugin="org.eclipse.wst.css.core" version="1.1.0" match="equivalent"/>
+ <import plugin="org.eclipse.wst.sse.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.core" version="1.1.0" match="equivalent"/>
+ <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="org.eclipse.wst.common.project.facet.core" version="1.1.0" match="compatible"/>
+ <import plugin="org.eclipse.wst.common.modulecore" version="1.1.0" match="equivalent"/>
+ <import plugin="com.ibm.icu" version="3.4.4" match="compatible"/>
+ <import plugin="org.eclipse.wst.css.ui" version="1.0.100" match="equivalent"/>
+ <import plugin="org.eclipse.wst.validation" version="1.1.0" match="equivalent"/>
+ <import plugin="org.eclipse.wst.javascript.ui" version="1.0.0" match="equivalent"/>
+ <import plugin="org.eclipse.debug.ui" version="3.2.0" match="compatible"/>
+ <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.project.facet.ui" version="1.1.0" match="compatible"/>
+ <import plugin="org.eclipse.wst.server.ui" version="1.0.102" match="equivalent"/>
+ <import plugin="org.eclipse.wst.common.environment" version="1.0.100" match="equivalent"/>
+ <import plugin="org.eclipse.emf.ecore" version="2.2.0" match="compatible"/>
+ </requires>
<plugin
id="org.eclipse.wst.html.ui.infopop"
diff --git a/features/org.eclipse.wst.xml_core.feature/feature.xml b/features/org.eclipse.wst.xml_core.feature/feature.xml
index be601af..6437c7d 100644
--- a/features/org.eclipse.wst.xml_core.feature/feature.xml
+++ b/features/org.eclipse.wst.xml_core.feature/feature.xml
@@ -22,9 +22,25 @@
</url>
<requires>
- <import feature="org.eclipse.emf.ecore" version="2.3.0" match="compatible"/>
- <import feature="org.eclipse.emf.common" version="2.3.0" match="compatible"/>
- <import feature="org.eclipse.xsd" version="2.3.0" match="compatible"/>
+ <import plugin="org.eclipse.osgi"/>
+ <import plugin="org.w3c.dom"/>
+ <import plugin="org.apache.xml.resolver"/>
+ <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.apache.xerces" version="2.8.0" 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.wst.common.uriresolver" version="1.1.0" match="equivalent"/>
+ <import plugin="org.eclipse.wst.validation" version="1.1.0" match="equivalent"/>
+ <import plugin="org.eclipse.wst.common.core" version="1.1.0" match="equivalent"/>
+ <import plugin="com.ibm.icu" version="3.4.4" match="compatible"/>
+ <import plugin="org.eclipse.emf.ecore" version="2.2.0" match="compatible"/>
+ <import plugin="org.eclipse.jface.text" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.ui" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.xsd" version="2.2.0" match="compatible"/>
+ <import plugin="org.eclipse.text" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.core.filebuffers" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.emf.common" version="2.2.0" match="compatible"/>
</requires>
<plugin
diff --git a/features/org.eclipse.wst.xml_ui.feature/feature.xml b/features/org.eclipse.wst.xml_ui.feature/feature.xml
index 415c835..06828c2 100644
--- a/features/org.eclipse.wst.xml_ui.feature/feature.xml
+++ b/features/org.eclipse.wst.xml_ui.feature/feature.xml
@@ -30,8 +30,35 @@
version="0.0.0"/>
<requires>
- <import feature="org.eclipse.gef" version="3.3.0" match="compatible"/>
- <import feature="org.eclipse.emf.edit.ui" version="2.3.0" match="compatible"/>
+ <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="org.eclipse.jface.text" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.ui.ide" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.ui.workbench.texteditor" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.wst.common.ui" version="1.1.0" match="equivalent"/>
+ <import plugin="org.eclipse.wst.dtd.core" version="1.1.0" match="equivalent"/>
+ <import plugin="org.eclipse.wst.sse.core" version="1.1.0" match="equivalent"/>
+ <import plugin="org.eclipse.wst.sse.ui" version="1.0.101" match="equivalent"/>
+ <import plugin="org.eclipse.wst.xml.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.common.uriresolver" version="1.1.0" match="equivalent"/>
+ <import plugin="org.eclipse.ui.views.properties.tabbed" version="3.2.0" match="compatible"/>
+ <import plugin="com.ibm.icu" version="3.4.4" match="compatible"/>
+ <import plugin="org.eclipse.debug.ui" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.ui.editors" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.search" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.ui" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.ui.views" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.wst.validation" version="1.1.0" match="equivalent"/>
+ <import plugin="org.eclipse.emf.common" version="2.2.0" match="compatible"/>
+ <import plugin="org.eclipse.wst.common.core" version="1.1.0" match="equivalent"/>
+ <import plugin="org.eclipse.gef" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.emf.ecore.edit" version="2.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.wst.xsd.core" version="1.1.0" match="equivalent"/>
</requires>
<plugin
